[feature/redux] merge master #733
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
- Update `history` dependency to v3.0.0 ([changelog](https://github.com/ReactJSTraining/history/blob/master/CHANGES.md)) - Add `windowScrollX` and `windowScrollY` helpers to `core/DOMUtils` - Rename `match()` to `UniversalRouter.resolve()` - Fix scroll issues ([see article](https://developers.google.com/web/updates/2015/09/history-api-scroll-restoration))
…iasoft#678) * fix(Isomorphic Style Loader): Add support to load multiple styles * fix(Isomorphic Style Loader): Add remove feature back
Integrates comments by @langpavel
* Update stylelint-config-standard When I run 'npm run lint', this warning show up: Deprecation Warning: 'number-zero-length-no-unit' has been deprecated, and will be removed in '7.0'. Use 'length-zero-no-unit' instead. See: http://stylelint.io/user-guide/rules/length-zero-no-unit/ update package to remove it. * Update stylelint to use length-zero-no-unit instead number-zero-length-no-unit.
replace ../Nav with ../Navigation
Remove jade dependency
Conflicts: package.json src/client.js src/server.js src/views/index.jade
langpavel
added a commit
that referenced
this pull request
Jul 10, 2016
This reverts commit cb0eb7f.
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.
@koistya This is merge of
kriasoft/masterintokriasoft/feature/reduxwithout any new feature