Merge react-0.14-support branch#1882
Closed
oliviertassinari wants to merge 25 commits intomui:masterfrom
oliviertassinari:merge-react-v14
Closed
Merge react-0.14-support branch#1882oliviertassinari wants to merge 25 commits intomui:masterfrom oliviertassinari:merge-react-v14
oliviertassinari wants to merge 25 commits intomui:masterfrom
oliviertassinari:merge-react-v14
Conversation
[reactV14] add history dependency
Only application (that wont be used as npm modules) should declare peerDependencies as real dependencies to bring them to the build. NPM 3 do not install peerDependencies anymore.
React 0.14 support
# Conflicts: # docs/src/app/components/pages/components/tabs.jsx # src/enhanced-textarea.jsx # src/slider.jsx # src/styles/theme-manager.js
React 0.14 support - merge master
Temporarily included personal fork until pull-request is accepted upstream.
- Replaced unix command with rimraf for cross-platform support - Updated dependencies to resolve warnings - Updated to temporary fork of react-draggable2 with 0.14 support.
Contains React 0.14 compatibility fixes.
React 0.14 support
# Conflicts: # docs/src/app/app-routes.jsx # docs/src/app/components/pages/components.jsx # package.json
React 0.14 support
[React-v14] Use findDOMNode where needed and fix package
This was referenced Oct 14, 2015
Merged
Closed
Contributor
|
RTL is not broken btw. |
Member
Author
|
@louy Oh, I will have a closer look then. contextTypes: {
muiTheme: React.PropTypes.object,
}, |
Contributor
|
@oliviertassinari this was still missing some commits from master I believe. I have rebased react-0.14-support with master. I will apply your commit to fix |
Member
Author
Well, If you say so, I didn't know that a merge can lost commit. That's weird. Ok, thanks! |
Contributor
|
|
Merged
|
npm WARN peerDependencies The peer dependency react@~0.13 included from material-ui |
mnajdova
pushed a commit
to mnajdova/material-ui
that referenced
this pull request
Nov 10, 2020
* [docs] Update responsiveness section close mui#1882 * Update index.mdx * Update index.mdx * Update docs/pages/demo/datepicker/index.mdx * apply same description to the other components Co-authored-by: Olivier Tassinari <olivier.tassinari@gmail.com> Co-authored-by: Dmitriy Kovalenko <dmtr.kovalenko@outlook.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
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.
Merge react-0.14-support branch inside master.
Also fix
this.findDOMNode().