Marketplace merge development #2501
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
private/data/Shops.json
2452 fix on UI icon toolbar
Fix on tag menu-sidebar glitch
* 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
* simple fix * fix typo & linting * fix linting issues
* 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
… 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
* Move babelrc into package.json * Updated dependencies * Define missing options variable
* 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
## Features - **Meteor 1.5 (#2371)** - **Order fulfillment UI updates (#2400)** - **React Router updated (#2123)** - **React Navbar (and deprecated Blaze navbar) (#2306)** - **Re-introduce icon toolbar as shortcutBar (#2261)** - **React unit testing example (#2170)** - **[WIP] [Style guide](https://styleguide.reactioncommerce.com)** ## Changes / Fixes - __Update current user's name on Navbar and profile page when address is added. (#2455)__ - __Fix #2422 on email invite link leading to blank screen (#2437)__ - __Fix #2459 router range error fix (#2476)__ - __Remove older Blaze based launchdock plugin (#2467)__ - __Remove random regex checks on names. Fixes #2461 (#2471)__ - __Update media gallery new / deleted image indicators (#2469)__ - __Fix #2356 on tag menu-sidebar glitch (#2472)__ - __Fix #2452 on UI icon toolbar (#2460)__ - __set css property overflow on horizontal to hidden (#2458)__ - __Navbar hover issue (#2451)__ - __update memory usage in CircleCI build (#2462)__ - __refactor default admin user creation (#2453)__ - __Bunyan and Loggly updates (#2425)__ - __Updated chai package__ - __add missing "orders not found" text (#2424)__ - __Add closeOnClick option to DropDownMenu component (#2418)__ - **Fixed console error when dragging product images (#2443)** - **Remove unmaintained Browserstack acceptance tests (#2430)** - **Add css style to differentiate read from unread notifications (#2442)** - **Added module aliases @reactioncommerce/reaction-ui (#2436)** - **Switch to Reaction’s new fork of Nodemailer (#2427)** - **Admin should be able to invite a user with the same name (#2386)** - **Updated yarn.lock and removed npm-shrinkwrap.json** - **use route permissions in register.js files (#2388)** - **Updated, refreshed order/fulfillment UI (#2400)** - **Change line width to match GH PR review width (#2407)** - **Fix Improper Cart Merge (#2387)** - **Implement missing router functions (#2393)** - **Correct the way we record tax overrides** - **CollectionFS cfs:tempstore and cfs:worker to Fix concurrency issues with GridFS uploads (#2096)** - **Fix typo in inventory test description (#2364)** - **Added Nigerian Naira to currency list in (#2366)** - **Fix git tagging on CircleCI 2.0 (#2362)** - **Adding the license description with link on README (#2365)** - **Better handling for unique routes for React Router (#2327)** - **Don't throwback a step if tax fails** - **Updated UI colors for styleguide (#2339)** - **Add loading component to Fix error (#2340)** - **Allow a MAIL_URL string without auth (#2330)** - **Defer Fixture load until the default shop is loaded (#2329)** - **Fix conditional in Circle deploy script (#2338)** - **Fix refunds not showing (#2317)** - **Add Verification Url to Welcome Email (#2216)** - **CircleCI 2.0 and docker base update (#2334)** - **i18n translation updates (#2302 #2420)** - **Change customer notification message when order is processed. (#2290)** - **Allow loader to show when one is passed in and defined BUGFIX (#2303)** - **Add the Vietnamese Dong as a supported currency (#2248)** - **Updated shipping / payment error messages in checkout (#2271)** - **Fix #2203 Long Strings Handling in Product Option Title (#2266)** - **Simplify core layout component (#2257)** - **Fix multiple refunds for stripe (#2260)**
* 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
* Updated timeout time. * don't autohide This should not autohide, the error should display until a user resubmits with a new email address. If the error is hidden, they might not see it right away and miss it. This is a blocking error for this field so it should stay until resolved.
* Provide tag component with missing click function * Remove hard refresh on PDP link in Grid settings
# Conflicts: # .meteor/packages # .meteor/versions # imports/plugins/core/ui-navbar/client/components/navbar/navbar.js # imports/plugins/core/ui/client/components/menu/dropDownMenu.js # imports/plugins/core/ui/client/components/tags/tags.jsx # imports/plugins/included/payments-stripe-connect/server/i18n/index.js # package.json # yarn.lock
|
I suspect problems with the shop switcher, etc. are already known so I am ignoring. |
brent-hoover
approved these changes
Jun 27, 2017
|
What problems did you have with the shop switcher? |
|
When I select "blank site" from the switcher I got a bunch of errors |
|
oh, hmm. I actually haven't done much with the default second site, so I can check on that, but I don't think it's been introduced in this merge, so approval seems okay still. |
|
CircleCI is finished and passed, not sure why it's saying queued still. Merging. |
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merges latest development into Reaction