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

React 0.14 support #1884

Merged
merged 16 commits into from
Oct 14, 2015
Merged

React 0.14 support #1884

merged 16 commits into from
Oct 14, 2015

Conversation

shaurya947
Copy link
Contributor

Merging into master once and for all :-)

I do notice a couple things broken in the docs site:

  • Material-UI icon not showing on top left in AppBar
  • Tabs not getting highlighted
  • Slider is broken

@oliviertassinari
Copy link
Member

I should have rebased, that's way cleaner 👍 than #1882.

shaurya947 added a commit that referenced this pull request Oct 14, 2015
@shaurya947 shaurya947 merged commit fa4a019 into master Oct 14, 2015
@shaurya947
Copy link
Contributor Author

@oliviertassinari @cgestes feel free to re-submit any PRs straight to master now!

@oliviertassinari
Copy link
Member

@shaurya947 Awesome!

@shaurya947 shaurya947 deleted the react-0.14-support branch October 14, 2015 19:54
@shaurya947
Copy link
Contributor Author

as soon as we can fix the issues listed above (and any others), we should be ready to release a new version

@aweary
Copy link
Contributor

aweary commented Oct 14, 2015

@shaurya947 any idea on an ETA for when this will make it to npm?

shaurya947 added a commit that referenced this pull request Oct 21, 2015
Squashed all revert commits into this single one for cleaner history

Revert "Merge pull request #1919 from cgestes/master"

This reverts commit 85d57da, reversing
changes made to 26141b0.

Revert "Merge pull request #1904 from oliviertassinari/docs-scroll"

This reverts commit e754e0f, reversing
changes made to 7943e16.

Revert "Merge pull request #1913 from tomasztomys/feature/react-v0.14-support-grid-list"

This reverts commit 7943e16, reversing
changes made to d310459.

Revert "Merge pull request #1916 from shaurya947/react-14-route-hotfix"

This reverts commit 02e28f3, reversing
changes made to 1e0a4a5.

Conflicts:
	docs/src/app/components/mobile-tear-sheet.jsx

Revert "Merge pull request #1884 from callemall/react-0.14-support"

This reverts commit fa4a019, reversing
changes made to 8819be8.

Conflicts:
	docs/package.json
	docs/src/app/app.jsx
	docs/src/app/components/code-example/code-block.jsx
	docs/src/app/components/pages/components/tabs.jsx
	docs/src/app/components/pages/customization.jsx
	docs/src/app/components/pages/get-started.jsx
	docs/src/app/components/pages/page-with-nav.jsx
	package.json
	src/date-picker/date-picker-dialog.jsx
	src/slider.jsx

Cleaning up some dependency issues and missed merge conflicts
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>
@zannager zannager added the docs Improvements or additions to the documentation label Mar 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs Improvements or additions to the documentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants