Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Marketplace] Orders line items refund #2590

Merged
merged 174 commits into from
Sep 6, 2017

Commits on Apr 17, 2017

  1. Configuration menu
    Copy the full SHA
    b9a5237 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6917f5c View commit details
    Browse the repository at this point in the history
  3. Add missing imports

    brent-hoover committed Apr 17, 2017
    Configuration menu
    Copy the full SHA
    cca678a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    433bef6 View commit details
    Browse the repository at this point in the history
  5. Capture and parse errors

    brent-hoover committed Apr 17, 2017
    Configuration menu
    Copy the full SHA
    5b64575 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2017

  1. Configuration menu
    Copy the full SHA
    564dfdf View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2017

  1. Configuration menu
    Copy the full SHA
    7f7a02a View commit details
    Browse the repository at this point in the history
  2. Removing "debug" HTML

    brent-hoover committed Apr 21, 2017
    Configuration menu
    Copy the full SHA
    9a56646 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    28db441 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f5c7c9e View commit details
    Browse the repository at this point in the history
  5. Remove console.log

    brent-hoover committed Apr 21, 2017
    Configuration menu
    Copy the full SHA
    c5c79a4 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2017

  1. Configuration menu
    Copy the full SHA
    540c24e View commit details
    Browse the repository at this point in the history
  2. Fix missing import

    brent-hoover committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    9393e16 View commit details
    Browse the repository at this point in the history
  3. Fix import error

    brent-hoover committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    9218f31 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    4ac11b2 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    9f8da99 View commit details
    Browse the repository at this point in the history
  6. Tweak styling

    brent-hoover committed Apr 25, 2017
    Configuration menu
    Copy the full SHA
    3d972d0 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2017

  1. Configuration menu
    Copy the full SHA
    5ce8394 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2017

  1. Configuration menu
    Copy the full SHA
    de48f0b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7e330d9 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2017

  1. Configuration menu
    Copy the full SHA
    4729320 View commit details
    Browse the repository at this point in the history
  2. Create proper behaviors

    brent-hoover committed May 25, 2017
    Configuration menu
    Copy the full SHA
    31c0349 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    62b9c45 View commit details
    Browse the repository at this point in the history
  4. Fix bad evaluation

    brent-hoover committed May 25, 2017
    Configuration menu
    Copy the full SHA
    1de63a3 View commit details
    Browse the repository at this point in the history
  5. Fix import order

    brent-hoover committed May 25, 2017
    Configuration menu
    Copy the full SHA
    e263769 View commit details
    Browse the repository at this point in the history
  6. Add i18n

    brent-hoover committed May 25, 2017
    Configuration menu
    Copy the full SHA
    239680d View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    c72247a View commit details
    Browse the repository at this point in the history

Commits on May 26, 2017

  1. Configuration menu
    Copy the full SHA
    0d069d7 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2017

  1. Adding the license description with link on README (#2365)

    rafaelstz authored and Aaron Judd committed May 30, 2017
    Configuration menu
    Copy the full SHA
    c1c4b3f View commit details
    Browse the repository at this point in the history

Commits on May 31, 2017

  1. added Nigerian Naira to currency list in (#2366)

    private/data/Shops.json
    casoetan authored and Aaron Judd committed May 31, 2017
    1 Configuration menu
    Copy the full SHA
    df6739d View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2017

  1. CollectionFS cfs:tempstore and cfs:worker to fix concurrency issues w…

    …ith GridFS uploads (#2096)
    
    * added cfs tempstore and worker to fix concurrency issues
    
    * linting
    lcampanis authored and brent-hoover committed Jun 4, 2017
    Configuration menu
    Copy the full SHA
    5b446c7 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2017

  1. Configuration menu
    Copy the full SHA
    eef7f18 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2017

  1. [WIP] Meteor 1.5 (#2371)

    * Meteor 1.5
    
    - include Buffer polyfill
    - replaces abernix:standard-minifier-js with standard-minifier-js
    - properly pins job-collections to 1.4.0
    
    * Updated to 1.5.0 base image
    
    * Pin react-meteor-data to 0.2.9
    
    * Remove unused vars
    
    Cherry pick
    b36709c19
    e47b25049f90643739df4bcf5210d64
    
    * update to reactioncommerce/base:v2.0.0
    
    * transliteration 1.6.2 (#2389)
    
    - Related to #2090 and #2091
    - Reduces minified footprint by315k
    - updates client import
    
    * Meteor1.5 and docker updates (#2390)
    
    * fix error handling in CI deploy script
    
    * fix CI build script
    
    * add docker-compose.yml for CircleCI
    
    * install Docker Compose in CI
    
    * set docker/docker-compose versions in CI env
    
    * fix missing curl issue in CI test
    
    * Updated 1.5 packages
    Aaron Judd authored and jshimko committed Jun 7, 2017
    Configuration menu
    Copy the full SHA
    9cfe6e8 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2017

  1. Declare variable (#2401)

    brent-hoover authored and mikemurray committed Jun 8, 2017
    Configuration menu
    Copy the full SHA
    6d88f3c View commit details
    Browse the repository at this point in the history
  2. Implement missing router functions (#2393)

    * Implement missing router functions
    
    - Implement `Router.setQueryParam()`
    - Fix `Router.getRouteName()`
    
    * Fix function name for `setQueryParams`
    
    * Fixes and tests
    
    - Added jest config to package.json
    - Added some jest unit tests for Router
    - Added mocks for some dependencies
    - Fixed route matching in Router.isActiveClassName method
    
    * fix package.json to run tests (#2396)
    
    * Removed comment
    
    * Remove duplicated setQueryParams function
    
    Fixed variable
    mikemurray authored and brent-hoover committed Jun 8, 2017
    Configuration menu
    Copy the full SHA
    133e764 View commit details
    Browse the repository at this point in the history
  3. 2332 Fix Improper Cart Merge (#2387)

    * add test suite to replicate #2332
    
    * fix improper cart merge when user cart has items in anonymous cart already
    
    * update anonymous cart `variants._id` to equal user cart `variants_id`
    
    * fix console error when merging into newly logged in user cart
    
    * implement review
    abdulsemiu-atanda authored and brent-hoover committed Jun 8, 2017
    Configuration menu
    Copy the full SHA
    ea5aa34 View commit details
    Browse the repository at this point in the history
  4. Change line width to match GH PR review width (#2407)

    brent-hoover authored and Aaron Judd committed Jun 8, 2017
    Configuration menu
    Copy the full SHA
    278756a View commit details
    Browse the repository at this point in the history
  5. Orders updates (#2400)

    * add expandable header to summary
    
    * i18n - move keys into local package
    
    * new npm package
    
    * new Badge component
    
    * i18n updates
    
    * badge style updates
    
    * add Badge and clicktocopy to components
    
    * clickToCopy component
    
    * badge component
    
    * i18n updates
    
    * badge and ClicktoCopy components
    
    * add card to summary section of orders
    
    * Merge branch 'ek-orders' into ek-orders-summaryPanel
    
    # Conflicts:
    #	package.json
    
    * update orderSummary fields
    
    * fix imports
    
    * ordersList react-ivize
    
    * fix prop validation
    
    * validation fixes for Badge component
    
    * remove no longer used files
    
    * comment out old blaze templates
    
    leaving them here for a bit just to make sure no errors occur
    
    * remove blaze templates
    
    * orders panel LESS
    
    * update workflow loop to remove extra headers
    
    * removed errant test text
    
    * fix translations
    
    * update shrinkwrap
    
    * tests
    
    * simpleschema
    
    * comment killing
    
    * New test for <ClickToCopy />
    
    * lint fixes
    
    * fix
    
    * add more props to Badge test
    
    * refund button coming in phase2
    
    * fix import / console error
    
    * Update random.js
    
    * lint fixes
    kieckhafer authored and mikemurray committed Jun 8, 2017
    Configuration menu
    Copy the full SHA
    bcd7d1d View commit details
    Browse the repository at this point in the history
  6. use route permissions in register.js files (#2388)

    Kolawole Michael Alade authored and mikemurray committed Jun 8, 2017
    Configuration menu
    Copy the full SHA
    f3ca0d4 View commit details
    Browse the repository at this point in the history
  7. Milestone 54 / Convert Navbar to React (#2306)

    * Navbar dropdowns conversion to React (#2230)
    
    * Implement currencies using Dropdown Menu Component
    
    * Add active prop on list item in Dropdown menu
    
    * Resolve reactivity for currency drop down
    
    * Add language dropdown implementation
    
    * Add select on current selected language
    
    * Remove extra code
    
    * Have language icon div be larger
    
    * Fix pop over arrangement
    
    * Fix spacing, add caret on language dropdown
    
    * Deal with display when switches are pff
    
    * Fix overflow issues on dropdown-menu
    
    * Fix linting
    
    * Close dropdown on menu item click
    
    * Add import for Match
    
    * Convert login views to React (#2250)
    
    * Initial component/container setup for sign in page
    
    * Replicate look of sign in form
    
    * Replicate look of sign up form
    
    * Use composeWithTracker in signInContainer
    
    * Replicate look of forgot password form
    
    * Create parent login container to hold general login for views
    
    * Add switching between views logic
    
    * Set up sign in form submission
    
    * Set up sign up form submission
    
    * Set up forgot password form submission
    
    * Handle sign in action and error message display
    
    * Remove template methods
    
    * Remove template methods and alert message template
    
    * Rewrite renderPasswordErrors method
    
    * Render social buttons on login
    
    * Add social login functionality
    
    * Remove unnecessary blaze templates
    
    * Move functions to React
    
    * Implement sign up functionality
    
    * Merge signin and signup containers
    
    * Put back helper methods needed by other templates
    
    * Abstract loginFormMessaged into react container
    
    * Add forgot password functionality (part1)
    
    * Remove unnecessary component in helper
    
    * Remove forgot password template
    
    * Clean up folder structure
    
    * Solve invariant violation browser error
    
    * updatepasswordOverlay react component/container
    
    * completed updayePasswordOverlay functionality
    
    * Remove stopPropagation function
    
    * Capitalize social login name
    
    * Show loading spinner while processing button clicks
    
    * Solve onClick not working by removing 'event.stopPropagation()' on parent template
    
    * Remove JQuery and use lodash
    
    * Using 'event' instead of 'e' to reference event handlers
    
    * Add validation for no email input on forgot password
    
    * Add error message on social login
    
    * Move capitalize function to helper file
    
    * Move capitalize function to helper file
    
    * [WIP]Main navbar container conversion to React (#2277)
    
    Main navbar container conversion to React
    
    * Convert to react: Tag navigation (#2251)
    
    * Test tagnav component
    
    * Use existing tag component
    
    * Update component setup
    
    * Use existing tagsList container
    
    * Remove debugging
    
    * Edit button
    
    * Use tagItem loop to match styles instead of existing
    
    * Base tagTree init
    
    * Fix structure
    
    * Fix dropdown mouseover event
    
    * Edit conditional
    
    * Base tag editatble
    
    * Button switch fix
    
    * On edit fix
    
    * Selectable button icon
    
    * Enable drop of tagtree by icon
    
    * Init edit mode for tagTree
    
    * Tagtree second level new tag
    
    * Typo fix
    
    * Fix top level width and classes
    
    * Show Base tagList
    
    * Lint clean up
    
    * Remove commented code
    
    * Style fix and show new tag on edit
    
    * i18n
    
    * Init saving top level tags
    
    * Saving tags - cont
    
    * New tag save fix
    
    * Switching to Taglist custom
    
    * Saving top level
    
    * Enable new tag option
    
    * Move class names to base comp
    
    * Style on create new tag item
    
    * Fix Hover back
    
    * Move file
    
    * Tag select prop
    
    * Rename files
    
    * Fix save and delete
    
    * Reorder element wrapper
    
    * Init passing the functions down
    
    * Init editing new tag item on tree
    
    * Separate the two new tagItems
    
    * Adding new tags on tree + refactor 🎉
    
    * Fix delete on subtags
    
    * Reset form after save and prevent saving empty tags
    
    * Prevent close of tree after save
    
    * Restructure tree state to fix input
    
    * Init refactor on tagTree
    
    * Props setup after refactor
    
    * Reposition button
    
    * Autocompletion fixing
    
    * Add componentWillReceiveProps to fix re-render and reset
    
    * Refactor into container comp
    
    * Remove debugs
    
    * Use composewithTracker
    
    * Remove props with spread
    
    * Update props list
    
    * Fix logic breaking new tag style
    
    * Tag sort order after drag
    
    * Clean un-used vars
    
    * Add react tagNav to main navbar container
    
    * Fix lint issue
    
    * Init toggle visibility
    
    * Close tags with overlay
    
    * Remove JQuery references(part 1)
    
    * Add router.go for tag click
    
    * Mobile fixes and remove blaze files
    
    * Fix click on mobile
    
    * Remove jquery
    
    * Remove jquery .closest
    
    * UI tagnav classes update
    
    * Fixes
    
    * Fix undefined refs after merge with development
    
    * Remove unused vars
    
    * Editing should turn off on toggle
    
    * Use Translation component over data-i18n
    
    * Fix Brand name glitch
    
    * Prefer standalone PropTypes import over React.PropTypes
    
    * Inport i18next and Reaction in same line
    
    * Space at end of self-closing tag
    
    * One-lining imports
    
    * Place '&nbsp' inside span for less random-looking code
    
    * Add comment about style
    
    * Use Divider component as separator
    brent-hoover authored Jun 8, 2017
    Configuration menu
    Copy the full SHA
    1e4d7fc View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    6e45ad6 View commit details
    Browse the repository at this point in the history
  9. import order

    kieckhafer authored Jun 8, 2017
    Configuration menu
    Copy the full SHA
    a0b44da View commit details
    Browse the repository at this point in the history
  10. Merge pull request #2162 from reactioncommerce/brent-fix-issue-2104

    Address review workflow
    kieckhafer authored Jun 8, 2017
    Configuration menu
    Copy the full SHA
    d202a0a View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2017

  1. Configuration menu
    Copy the full SHA
    18d45a2 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #2415 from reactioncommerce/fix-duplicate-packages

    Remove duplicate babel packages from package.json
    kieckhafer authored Jun 9, 2017
    Configuration menu
    Copy the full SHA
    42ffc56 View commit details
    Browse the repository at this point in the history
  3. Updated yarn.lock and removed npm-shrinkwrap.json

    I’ll try to add back in the release branch, but something funky is
    going on with shrink-wrap
    aaronjudd committed Jun 9, 2017
    Configuration menu
    Copy the full SHA
    73274c9 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2017

  1. Admin should be able to invite a user with the same name (#2386)

    * turn the user name to lowercase
    
    * turn the user name to a lowercase string with a random number e.g michael-alade49
    
    * add custom name field to users and accounts schema
    
    * create new env var for setting default admin’s name
    
    * publish new name field for users
    
    * remove unnecessary typeof check for Reaction var
    
    * switch priority for user’s displayName source
    
    * remove redundant email update and only add user’s name if exists
    Kolawole Michael Alade authored and brent-hoover committed Jun 12, 2017
    Configuration menu
    Copy the full SHA
    da41bc0 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into development

    aaronjudd committed Jun 12, 2017
    Configuration menu
    Copy the full SHA
    754e66b View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2017

  1. Update version

    aaronjudd committed Jun 13, 2017
    Configuration menu
    Copy the full SHA
    c8409ff View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9858361 View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2017

  1. Added module aliases (#2436)

    * Added module aliases
    
    - Added module alias for `core/ui`
    - Added module alias for `core/router`
    
    * Revert jest module name mapper
    
    * fix tests
    
    - Fixed duplicated mocks warning
    - added some new mocks
    - fix translaton component test
    mikemurray authored Jun 15, 2017
    Configuration menu
    Copy the full SHA
    4512d75 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2017

  1. LingoHub Update 🚀 (#2420)

    Manual push by LingoHub User: Aaron Judd.
    Project: reaction
    
    Made with ❤️ by https://lingohub.com
    Aaron Judd authored Jun 16, 2017
    Configuration menu
    Copy the full SHA
    352c98d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    43e0a60 View commit details
    Browse the repository at this point in the history
  3. Remove acceptance tests (#2430)

    * Remove non-working tests
    
    * Remove unneeded dependencies
    brent-hoover authored and Aaron Judd committed Jun 16, 2017
    Configuration menu
    Copy the full SHA
    b2b8e7f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    5d0fc79 View commit details
    Browse the repository at this point in the history
  5. finished up the popover

    michael-alade committed Jun 16, 2017
    Configuration menu
    Copy the full SHA
    9a623be View commit details
    Browse the repository at this point in the history
  6. Add closeOnClick option to DropDownMenu component (#2418)

    * Add closeOnClick option to DropDownMenu component
    
    * Fix lint issue - move handleDropdownToggle after componentWillReceiveProps
    spencern authored and mikemurray committed Jun 16, 2017
    Configuration menu
    Copy the full SHA
    e4bade3 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2017

  1. add missing "orders not found" text (#2424)

    kieckhafer authored and Aaron Judd committed Jun 17, 2017
    Configuration menu
    Copy the full SHA
    6d50cea View commit details
    Browse the repository at this point in the history
  2. Merge branch 'development' into Release-1.3.0

    aaronjudd committed Jun 17, 2017
    Configuration menu
    Copy the full SHA
    c5ee98a View commit details
    Browse the repository at this point in the history
  3. Updated chai package

    - tested with reaction test, tests seemed to work normal
    aaronjudd committed Jun 17, 2017
    Configuration menu
    Copy the full SHA
    f7aa04b View commit details
    Browse the repository at this point in the history
  4. Merge branch 'Release-1.3.0' into development

    aaronjudd committed Jun 17, 2017
    Configuration menu
    Copy the full SHA
    4efb14e View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2017

  1. Bunyan and Loggly updates (#2425)

    * switch to official Loggly lib for Node and write new Bunyan connector for it
    
    * update bunyan to 2.0.0
    
    * add REACTION_LOG_FORMAT config option
    
    * add extra comments about log formatting options
    jshimko authored Jun 19, 2017
    Configuration menu
    Copy the full SHA
    dd0a77b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b64ee84 View commit details
    Browse the repository at this point in the history
  3. update memory usage in CircleCI build (#2462)

    jshimko authored and Aaron Judd committed Jun 19, 2017
    Configuration menu
    Copy the full SHA
    72d1ad3 View commit details
    Browse the repository at this point in the history
  4. finished implementing design

    michael-alade committed Jun 19, 2017
    Configuration menu
    Copy the full SHA
    18778df View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2017

  1. Navbar hover issue (#2451)

    * added default hover style for languages and currencies class #2444
    
    * added accounts css class to div in mainDropdownContainer #2444
    
    * added hover styles for account class #2444
    
    * added hover style for notification class #2444
    rhenshaw56 authored and brent-hoover committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    25e8942 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cea9557 View commit details
    Browse the repository at this point in the history
  3. [WIP] 2452 fix on UI icon toolbar (#2460)

    2452 fix on UI icon toolbar
    rhenshaw56 authored and brent-hoover committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    1d0fd64 View commit details
    Browse the repository at this point in the history
  4. [WIP] 2356 fix on tag menu-sidebar glitch (#2472)

    Fix on tag menu-sidebar glitch
    rhenshaw56 authored and brent-hoover committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    1a6a8f3 View commit details
    Browse the repository at this point in the history
  5. format price string for invoice details

    michael-alade committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    d3e7da5 View commit details
    Browse the repository at this point in the history
  6. update media gallery new / deleted image indicators (#2469)

    * add new status for mediaGalleryIndicator
    
    * i18n translations for tooltips
    
    * status-badge styles for media gallery
    
    * update media gallery image new / deleted indicator
    
    * style updates
    
    * lint fix
    kieckhafer authored Jun 20, 2017
    Configuration menu
    Copy the full SHA
    b59263b View commit details
    Browse the repository at this point in the history
  7. Remove random regex checks on names. Fixes #2461 (#2471)

    brent-hoover authored and Aaron Judd committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    c9a0b28 View commit details
    Browse the repository at this point in the history
  8. remove older Blaze based launchdock plugin (#2467)

    jshimko authored and Aaron Judd committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    670ee6b View commit details
    Browse the repository at this point in the history
  9. 2459 router range error fix (#2476)

    * simple fix
    
    * fix typo & linting
    
    * fix linting issues
    prosf authored and kieckhafer committed Jun 20, 2017
    Configuration menu
    Copy the full SHA
    e87ea72 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2017

  1. 2422 Fix on email invite link leading to blank screen (#2437)

    * imported LoginFormValidation to forgotContainer
    
    * imported LoginFormValidation to passwordOverlayContainer
    
    * added setTimeout function to delay rendering
    
    * wrap component in translations (#2434)
    
    * removed setTimeouts from updatePassword.js
    
    * added spinner before mounting the component
    
    * replaced setTimeout with life-cycle hook(componentWillRecieveProps) #2422
    
    * imported LoginFormValidation to prevent console error
    rhenshaw56 authored and brent-hoover committed Jun 21, 2017
    Configuration menu
    Copy the full SHA
    c737ac9 View commit details
    Browse the repository at this point in the history
  2. Update current user's name on Navbar and profile page when address is…

    … added. (#2455)
    
    * Update current user's name and profile when address is added
    
    * Update user's name when address is updated
    
    * Get correct admin user's name from env variables
    Awa Desmoline authored and brent-hoover committed Jun 21, 2017
    Configuration menu
    Copy the full SHA
    c27f70e View commit details
    Browse the repository at this point in the history
  3. add invoice actions

    michael-alade committed Jun 21, 2017
    Configuration menu
    Copy the full SHA
    0b97a00 View commit details
    Browse the repository at this point in the history
  4. Updated dependencies (#2463)

    * Move babelrc into package.json
    
    * Updated dependencies
    
    * Define missing options variable
    Aaron Judd authored Jun 21, 2017
    Configuration menu
    Copy the full SHA
    3144dc3 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2017

  1. Revert minifier to abernix fork (#2486)

    * Use abernix:standard-minifier-js
    
    Replace standard-minifier-js with
    abernix:[email protected]
    
    This should be compatible with current 1.5 tools, and is what we were
    using before 1.5, because of the faster compilation and reduced memory
    footprint.  Restoring in an attempt to diagnose build issues related to
    memory.
    
    * updated meteor package versions
    jshimko authored and Aaron Judd committed Jun 22, 2017
    Configuration menu
    Copy the full SHA
    3f252fe View commit details
    Browse the repository at this point in the history
  2. Fix error when inviting already invited user (#2433)

    * Refactor invite function to send invites only to non invited members
    
    * Refactor error message to show status code
    
    * Change the error message to use inline Alert
    
    * Clear input fields when there is error
    
    * Use Reaction's blaze inlineAlerts for error message
    
    * Eliminate console error on inviteShopMember call
    Awa Desmoline authored and brent-hoover committed Jun 22, 2017
    Configuration menu
    Copy the full SHA
    543ddc0 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'development' of github.com:reactioncommerce/reaction in…

    …to michael-marketplace-line-items-refund-2377
    michael-alade committed Jun 22, 2017
    Configuration menu
    Copy the full SHA
    6c60ea1 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'marketplace' of github.com:reactioncommerce/reaction in…

    …to michael-marketplace-line-items-refund-2377
    michael-alade committed Jun 22, 2017
    Configuration menu
    Copy the full SHA
    1e11e68 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2017

  1. finish order line item popover functionality

    michael-alade committed Jun 27, 2017
    Configuration menu
    Copy the full SHA
    bef35d9 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'marketplace' of github.com:reactioncommerce/reaction in…

    …to michael-marketplace-line-items-refund-2377
    michael-alade committed Jun 27, 2017
    Configuration menu
    Copy the full SHA
    a6c941b View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2017

  1. allow only users with the orders and dashboard/orders permission to v…

    …iew the popover
    michael-alade committed Jun 29, 2017
    Configuration menu
    Copy the full SHA
    50c75f1 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2017

  1. New branch for orders refund

    joykare committed Jul 21, 2017
    Configuration menu
    Copy the full SHA
    9ba4187 View commit details
    Browse the repository at this point in the history
  2. Add checkbox functionality

    joykare committed Jul 21, 2017
    Configuration menu
    Copy the full SHA
    8555f11 View commit details
    Browse the repository at this point in the history
  3. Checkbox changes

    joykare committed Jul 21, 2017
    Configuration menu
    Copy the full SHA
    62b040c View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2017

  1. Prgress on UI

    joykare committed Jul 24, 2017
    Configuration menu
    Copy the full SHA
    5b5b38a View commit details
    Browse the repository at this point in the history
  2. Add in permissions

    joykare committed Jul 24, 2017
    Configuration menu
    Copy the full SHA
    a69f152 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    58fee6d View commit details
    Browse the repository at this point in the history
  4. Add line invoice

    joykare committed Jul 24, 2017
    Configuration menu
    Copy the full SHA
    3ad51f4 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    9d68fe6 View commit details
    Browse the repository at this point in the history
  6. Refactor code

    joykare committed Jul 24, 2017
    Configuration menu
    Copy the full SHA
    eef7b45 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2017

  1. Design iteration

    joykare committed Jul 25, 2017
    Configuration menu
    Copy the full SHA
    8dd458b View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2017

  1. Rewrite numberTypeComponent

    joykare committed Jul 28, 2017
    Configuration menu
    Copy the full SHA
    1df9c09 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2017

  1. Fix numeric Component

    joykare committed Jul 31, 2017
    Configuration menu
    Copy the full SHA
    aa97091 View commit details
    Browse the repository at this point in the history
  2. Refactor number component

    joykare committed Jul 31, 2017
    Configuration menu
    Copy the full SHA
    b1daa00 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2017

  1. Fix refunds

    joykare committed Aug 1, 2017
    Configuration menu
    Copy the full SHA
    bcccf44 View commit details
    Browse the repository at this point in the history
  2. Modify refund/createMethod

    joykare committed Aug 1, 2017
    Configuration menu
    Copy the full SHA
    9b0f9d9 View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2017

  1. Use /refunds/returnItems

    joykare committed Aug 2, 2017
    Configuration menu
    Copy the full SHA
    fcbafdd View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2017

  1. Add background color

    joykare committed Aug 3, 2017
    Configuration menu
    Copy the full SHA
    f36edc8 View commit details
    Browse the repository at this point in the history
  2. Styling iteration

    joykare committed Aug 3, 2017
    Configuration menu
    Copy the full SHA
    c097696 View commit details
    Browse the repository at this point in the history
  3. Pixels right

    joykare committed Aug 3, 2017
    Configuration menu
    Copy the full SHA
    e5e69fa View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c2af01f View commit details
    Browse the repository at this point in the history
  5. Fix approve button

    joykare committed Aug 3, 2017
    Configuration menu
    Copy the full SHA
    b86d9c8 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    9a13ffb View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2017

  1. Configuration menu
    Copy the full SHA
    02ae4f4 View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2017

  1. Add disabling buttons

    joykare committed Aug 6, 2017
    Configuration menu
    Copy the full SHA
    4511fe7 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2017

  1. Configuration menu
    Copy the full SHA
    e92bcc9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4f3ffdf View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ff74ac9 View commit details
    Browse the repository at this point in the history
  4. Massive refactor

    joykare committed Aug 7, 2017
    Configuration menu
    Copy the full SHA
    0ccc35a View commit details
    Browse the repository at this point in the history
  5. Add all line items on select

    joykare committed Aug 7, 2017
    Configuration menu
    Copy the full SHA
    11f6a8a View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    7daaa98 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2017

  1. Select process change

    joykare committed Aug 10, 2017
    Configuration menu
    Copy the full SHA
    035d268 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2017

  1. Refund/return name change

    joykare committed Aug 14, 2017
    Configuration menu
    Copy the full SHA
    4b49dfe View commit details
    Browse the repository at this point in the history
  2. Merge Marketplace

    joykare committed Aug 14, 2017
    Configuration menu
    Copy the full SHA
    321591e View commit details
    Browse the repository at this point in the history
  3. Fix lint error

    joykare committed Aug 14, 2017
    Configuration menu
    Copy the full SHA
    b039f87 View commit details
    Browse the repository at this point in the history
  4. Code updates

    joykare committed Aug 14, 2017
    Configuration menu
    Copy the full SHA
    b9b125c View commit details
    Browse the repository at this point in the history
  5. i18n keys addition

    joykare committed Aug 14, 2017
    Configuration menu
    Copy the full SHA
    4ef6aa5 View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2017

  1. Configuration menu
    Copy the full SHA
    9c0e11d View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2017

  1. Configuration menu
    Copy the full SHA
    e2af30a View commit details
    Browse the repository at this point in the history
  2. Add tests for orders method

    joykare committed Aug 17, 2017
    Configuration menu
    Copy the full SHA
    e42637e View commit details
    Browse the repository at this point in the history
  3. Remove describe.only in tests

    joykare committed Aug 17, 2017
    Configuration menu
    Copy the full SHA
    6871a61 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    cf8bf8c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    3a6acea View commit details
    Browse the repository at this point in the history
  6. Row resize

    joykare committed Aug 17, 2017
    Configuration menu
    Copy the full SHA
    5c365c0 View commit details
    Browse the repository at this point in the history
  7. Correct subTotal display

    joykare committed Aug 17, 2017
    Configuration menu
    Copy the full SHA
    fd0ab82 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2017

  1. Configuration menu
    Copy the full SHA
    3e38ac9 View commit details
    Browse the repository at this point in the history
  2. Fix tax display

    joykare committed Aug 18, 2017
    Configuration menu
    Copy the full SHA
    5f9207e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e409f40 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    d282b4a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    b7c27d5 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2017

  1. Configuration menu
    Copy the full SHA
    0c16338 View commit details
    Browse the repository at this point in the history
  2. Color change during merge

    joykare committed Aug 29, 2017
    Configuration menu
    Copy the full SHA
    2c1bdf5 View commit details
    Browse the repository at this point in the history
  3. Static columns

    joykare committed Aug 29, 2017
    Configuration menu
    Copy the full SHA
    463531f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    bc1f6bb View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f4abdde View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    cb7d31c View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2017

  1. Refunds working correctly

    joykare committed Aug 30, 2017
    Configuration menu
    Copy the full SHA
    2ce6218 View commit details
    Browse the repository at this point in the history
  2. Clean up code remove logs

    joykare committed Aug 30, 2017
    Configuration menu
    Copy the full SHA
    5f4f063 View commit details
    Browse the repository at this point in the history
  3. Add price format on modals

    joykare committed Aug 30, 2017
    Configuration menu
    Copy the full SHA
    a037809 View commit details
    Browse the repository at this point in the history
  4. Code refactor

    joykare committed Aug 30, 2017
    Configuration menu
    Copy the full SHA
    9caee44 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    adcfcd0 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2017

  1. Configuration menu
    Copy the full SHA
    b95b7c3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    64f2db4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    58c1079 View commit details
    Browse the repository at this point in the history
  4. Fix authnet issue

    joykare committed Aug 31, 2017
    Configuration menu
    Copy the full SHA
    753fd6d View commit details
    Browse the repository at this point in the history
  5. Fix scrollable issue

    joykare committed Aug 31, 2017
    Configuration menu
    Copy the full SHA
    a86de17 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2017

  1. Tax display

    joykare committed Sep 1, 2017
    Configuration menu
    Copy the full SHA
    ab1038d View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7ce7322 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    7f1cf7d View commit details
    Browse the repository at this point in the history
  4. Fix lint error

    joykare committed Sep 1, 2017
    Configuration menu
    Copy the full SHA
    df312d3 View commit details
    Browse the repository at this point in the history
  5. Add comment

    joykare committed Sep 1, 2017
    Configuration menu
    Copy the full SHA
    8619af4 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    194a7a8 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    182d896 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2017

  1. Configuration menu
    Copy the full SHA
    86fa03b View commit details
    Browse the repository at this point in the history
  2. Add missing i18next

    joykare committed Sep 5, 2017
    Configuration menu
    Copy the full SHA
    744d2bc View commit details
    Browse the repository at this point in the history
  3. Add jsdoc

    joykare committed Sep 5, 2017
    Configuration menu
    Copy the full SHA
    94457d8 View commit details
    Browse the repository at this point in the history
  4. Fixes around code comments

    joykare committed Sep 5, 2017
    Configuration menu
    Copy the full SHA
    6911414 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    e40afb0 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    90aa8a4 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2017

  1. Configuration menu
    Copy the full SHA
    296d218 View commit details
    Browse the repository at this point in the history
  2. fix linting

    joykare committed Sep 6, 2017
    Configuration menu
    Copy the full SHA
    c887b7d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f2d60c9 View commit details
    Browse the repository at this point in the history
  4. Add TODOs around email

    joykare committed Sep 6, 2017
    Configuration menu
    Copy the full SHA
    ab007ef View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    835ecc2 View commit details
    Browse the repository at this point in the history
  6. Refund email revamp

    joykare committed Sep 6, 2017
    Configuration menu
    Copy the full SHA
    6a01e84 View commit details
    Browse the repository at this point in the history
  7. Remove email todo

    joykare committed Sep 6, 2017
    Configuration menu
    Copy the full SHA
    229f82d View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    bb9cacb View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    272c70b View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    89fa5b1 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    6494f1c View commit details
    Browse the repository at this point in the history