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

[feature/react-intl] Intl polyfill for Safari #672

Merged
merged 27 commits into from
Jul 10, 2016

Conversation

langpavel
Copy link
Collaborator

No description provided.

@langpavel
Copy link
Collaborator Author

@koistya Can you merge please?

zzh8829 and others added 13 commits June 9, 2016 21:36
- 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
Add eslint global-require exception, based in 'src/server.js' file.

The 'feature/react-intl' branch also has this problem.
* 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
@langpavel
Copy link
Collaborator Author

@koistya please

koistya and others added 5 commits July 10, 2016 15:12
Conflicts:
	package.json
	src/client.js
	src/server.js
	src/views/index.jade
Conflicts:
	package.json
	src/client.js
	src/server.js
	src/views/index.jade
…er-kit into feature/react-intl

Conflicts:
	src/client.js
	src/store/configureStore.js
@langpavel
Copy link
Collaborator Author

@koistya Updated. You can safely merge after #734

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.