-
-
Notifications
You must be signed in to change notification settings - Fork 32.3k
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 #1780
React 0.14 support #1780
Conversation
Or at least they do now, and it's very handy - think it's worth making it part of the contract? Also see mui#1314
Update themes.jsx
Changed 'static' to 'statics'
Fixed typo in src/card-expandable.jsx
We can now add #Comment, as used by react.
`.addons` is not defined when importing only `react`.
Made component-level theme values consistent with the raw theme Renamed canvasColor raw theme key to alternateTextColor Updated docs to use new theming values
[theme-manager] fix react addons
Change relative paths to module path
Removed hard-coded values from theme-manager
IconButton tooltips accept nodes, not just strings
Tooltips accept nodes for label
[ListItem] remove useless margin: 0
[EnhancedTextarea] add rowsMax property
[Slider] tiny performance improvement, code refactoring.
[AppBar] make IconMenu to render correctly
[TextField] Removed direct hintStyle prop ref
Now it indicates what it is meant to do, so it doesn't look like a bug.
Rename "Item Three" to be more obvious
Fix local dev Docs server, add prd command to run build folder locally.
added flatbutton background color property
Humm, wrong ^^ |
I dont think my push is wrong. (I dont think github can push -f automatically) look at it in gitk ! |
You are right, we can only move forward in the history of git as we are regular contributor. We would need more right to do it. Regarding the order of commit, they looks ok 👍. |
yep need to be hand merged. (with push -f). it's dangerous if many person push at the same time, but in that case it's safe, and it's annoying when you pull, if you have work in progress, you need to save them in a branch, then reset hard to the remote branch and cherry pick... but the history is cleaner... that's why the simple way is to merge, the tradeoff is you loose the nice history.. but github history would be as nice anyway. (on purpose I guess) |
Fixes issue mui#1761
Are we trying to merge |
# Conflicts: # docs/src/app/components/pages/components/tabs.jsx # src/enhanced-textarea.jsx # src/slider.jsx # src/styles/theme-manager.js
214c59c
to
6bbd2d6
Compare
Funny I think I got github lost... (he do not like push -f). closing an reopening a new ones. |
Bumps [dayjs](https://github.com/iamkun/dayjs) from 1.8.22 to 1.8.27. - [Release notes](https://github.com/iamkun/dayjs/releases) - [Changelog](https://github.com/iamkun/dayjs/blob/dev/CHANGELOG.md) - [Commits](iamkun/dayjs@v1.8.22...v1.8.27) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Rebase (first time I try that with github...)