Merge development into marketplace #2466
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
* 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
# Conflicts: # imports/plugins/core/ui/client/components/menu/dropDownMenu.js
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
spencern
changed the title
* 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
aaronjudd
approved these changes
Jun 21, 2017
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 dev into marketplace branch.
After we merge this, we can start merging this into feature branches and then feature branches back into marketplace