Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 8da69ea
Merge: bb6cbf4 f6e7609
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Thu Nov 12 13:32:54 2015 +0100

    Merge pull request mui#2043 from chrismcv/pop

    [Popover] Add new component

commit f6e7609
Author: Chris McVittie <chris@greenflump.com>
Date:   Mon Nov 2 20:50:31 2015 +0000

    popover component

commit bb6cbf4
Merge: 4d1bfa2 ce91f03
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Thu Nov 12 11:27:40 2015 +0100

    Merge pull request mui#2143 from oliviertassinari/app-bar-proptype

    [AppBar] Improve PropType for zDepth

commit ce91f03
Author: Olivier Tassinari <olivier.tassinari@gmail.com>
Date:   Thu Nov 12 11:19:36 2015 +0100

    [AppBar] Improve PropType for zDepth

commit 4d1bfa2
Merge: 9c88c9d 5c43f3f
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Thu Nov 12 11:15:44 2015 +0100

    Merge pull request mui#2135 from emohedano/bugfixes

    [TimePicker] Fixes mui#2064

commit 9c88c9d
Merge: 9879f09 d133c06
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Thu Nov 12 11:08:17 2015 +0100

    Merge pull request mui#2141 from quangbuule/patch-2

    Propose calendar style fix

commit 9879f09
Merge: c58f120 b669d99
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Thu Nov 12 11:04:56 2015 +0100

    Merge pull request mui#2134 from oliviertassinari/app-bar

    [AppBar] Add an example of a clickable title

commit b669d99
Author: Olivier Tassinari <olivier.tassinari@gmail.com>
Date:   Wed Nov 11 21:55:52 2015 +0100

    [AppBar] Add an example of a clickable title

commit c58f120
Merge: 808170e 62aea25
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Thu Nov 12 11:00:15 2015 +0100

    Merge pull request mui#2125 from StoneCypher/master

    Adds onTitleTouchTap to AppBar

commit 808170e
Merge: c03f3f9 81d2874
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Thu Nov 12 10:58:24 2015 +0100

    Merge pull request mui#2142 from oliviertassinari/dialog-warn

    [Dialog] Remove warnings on DatePicker and TimePicker

commit 81d2874
Author: Olivier Tassinari <olivier.tassinari@gmail.com>
Date:   Thu Nov 12 10:54:16 2015 +0100

    [Dialog] Remove warnings on DatePicker and TimePicker

commit d133c06
Author: Quangbuu Le <quangbuule@gmail.com>
Date:   Thu Nov 12 15:36:43 2015 +0700

    Propose calendar style fix

commit 62aea25
Merge: 512fb22 7d9fdf6
Author: John Haugeland <stonecypher@gmail.com>
Date:   Wed Nov 11 17:09:53 2015 -0800

    Merge branch 'master' of https://github.com/StoneCypher/material-ui

commit 512fb22
Author: John Haugeland <stonecypher@gmail.com>
Date:   Tue Nov 10 19:06:41 2015 -0800

    Adds onTitleTouchTap to AppBar

commit 5c43f3f
Author: Eduardo Mohedano <emohedanomonter@gmail.com>
Date:   Wed Nov 11 17:57:22 2015 -0600

    Added trailing comma for previous commit

commit 904b92e
Author: Eduardo Mohedano <emohedanomonter@gmail.com>
Date:   Wed Nov 11 17:43:31 2015 -0600

    [TimePicker] FIx: muiTheme missing in state

commit 7d9fdf6
Author: John Haugeland <stonecypher@gmail.com>
Date:   Tue Nov 10 19:06:41 2015 -0800

    Adds onTitleTouchTap to AppBar

commit c03f3f9
Merge: 23fd701 436c500
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Wed Nov 11 19:57:35 2015 +0100

    Merge pull request mui#2131 from mbrookes/patch-2

    Correct container type options.

commit 436c500
Author: Matt Brookes <mbrookes@users.noreply.github.com>
Date:   Wed Nov 11 17:31:54 2015 +0000

    Correct container type options.

commit 23fd701
Merge: 7b0881a 439ccfc
Author: Shaurya Arora <shaurya.arora1@gmail.com>
Date:   Tue Nov 10 15:33:34 2015 -0600

    Merge pull request mui#1946 from VincentBel/master

    [Dialog] fix the problem that bottom body become scrollable after resizing

commit 7b0881a
Merge: c24b79a c284c88
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Tue Nov 10 22:28:38 2015 +0100

    Merge pull request mui#1901 from jaygood/patch-4

    Correct invalid background-color property value

commit c284c88
Author: Jon Haygood <haygoodjon@gmail.com>
Date:   Tue Nov 10 16:22:27 2015 -0500

    Update raised-button.jsx

commit c24b79a
Merge: db23297 db21ee8
Author: Shaurya Arora <shaurya.arora1@gmail.com>
Date:   Tue Nov 10 14:25:49 2015 -0600

    Merge pull request mui#1478 from alldne/master

    AppBar should be positioned

commit db23297
Merge: 2a16e58 8ec1fcf
Author: Shaurya Arora <shaurya.arora1@gmail.com>
Date:   Tue Nov 10 13:53:14 2015 -0600

    Merge pull request mui#1610 from garth/fix-select-field-onchange

    SelectField now triggers on change consistently when using props.value

commit 2a16e58
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Tue Nov 10 16:25:22 2015 +0100

    [Babel] Disable .babelrc inheritance

    This behaviour is going to change in 6.x. In 6.x Babel will break on the first .babelrc it finds.

commit 79b0092
Merge: 4769528 97fd0f3
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Tue Nov 10 13:31:01 2015 +0100

    Merge pull request mui#2120 from oliviertassinari/inline

    [DatePicker] Add inline property

commit 97fd0f3
Author: Ty <ty@dice.fm>
Date:   Fri Oct 23 15:31:09 2015 +0100

    Inline Date Picker

commit 4769528
Merge: 615c4eb 369021d
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Tue Nov 10 13:17:37 2015 +0100

    Merge pull request mui#2104 from manuelmazzuola/issue#2104

    [Snackbar] add bodyStyle property

commit 369021d
Author: Manuel Mazzuola <manuel.mazzuola@cloudesire.com>
Date:   Tue Nov 10 11:32:12 2015 +0100

    [Snackbar] Add bodyStyle documentation

commit f8bfcf2
Author: Manuel Mazzuola <manuel.mazzuola@cloudesire.com>
Date:   Tue Nov 10 11:23:51 2015 +0100

    Add missing trailing comma

commit 80c0308
Author: Manuel Mazzuola <manuel.mazzuola@cloudesire.com>
Date:   Tue Nov 10 11:15:28 2015 +0100

    [Snackbar] Custom body style

    Merge the body style with a custom style
    passed by properties

commit 615c4eb
Merge: 48912d6 26a0c85
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Tue Nov 10 10:27:00 2015 +0100

    Merge pull request mui#2091 from callemall/oliviertassinari-patch-1

    [eslint] Use the latest version

commit 48912d6
Merge: 6f28ad0 5b4c559
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Tue Nov 10 10:16:55 2015 +0100

    Merge pull request mui#2116 from subjectix/fix-dialog-raw-code

    Fixed raw code of dialog's open prop

commit 5b4c559
Author: Ali Taheri <ali.taheri.m@gmail.com>
Date:   Tue Nov 10 10:37:26 2015 +0330

    Fixed raw code of dialog's open prop

commit 6f28ad0
Author: Shaurya Arora <shaurya.arora1@gmail.com>
Date:   Mon Nov 9 18:30:22 2015 -0600

    v0.13.2 release

commit fd088e1
Merge: d328658 4145d8f
Author: Shaurya Arora <shaurya.arora1@gmail.com>
Date:   Mon Nov 9 17:42:57 2015 -0600

    Merge pull request mui#2113 from shaurya947/master

    Add import statements to every component's doc page

commit 4145d8f
Author: Shaurya Arora <shaurya.arora1@gmail.com>
Date:   Mon Nov 9 17:32:18 2015 -0600

    Add import statements to every component's doc page

commit d328658
Merge: abfd6ae a8066d1
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Tue Nov 10 00:16:14 2015 +0100

    Merge pull request mui#2112 from callemall/oliviertassinari-patch-3

    [npm] Add private: true

commit a8066d1
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Tue Nov 10 00:12:13 2015 +0100

    Update package.json

    Add private to the docs package.json.
    Will prevent this warning to be displayed `npm WARN package.json material-ui-docs@0.13.1 No license field.`
    and accidental publish.

commit abfd6ae
Merge: 7233878 ed062ff
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Tue Nov 10 00:06:28 2015 +0100

    Merge pull request mui#2111 from luisrudge/remove-peer-dependencies

    [npm] moving some peer dependencies to dependencies

commit ed062ff
Author: Luis Rudge <luis@luisrudge.net>
Date:   Mon Nov 9 20:30:29 2015 -0200

    moving some peer dependencies to dependencies

commit 7233878
Merge: 49feb2e 915c1eb
Author: Shaurya Arora <shaurya.arora1@gmail.com>
Date:   Mon Nov 9 15:52:36 2015 -0600

    Merge pull request mui#2105 from oliviertassinari/open

    [Dialog] Use open instead of isOpen

commit 915c1eb
Author: Olivier Tassinari <olivier.tassinari@gmail.com>
Date:   Mon Nov 9 19:07:13 2015 +0100

    [Dialog] Use open instead of isOpen

commit 49feb2e
Merge: bb57b9f 6aff277
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Mon Nov 9 13:05:23 2015 +0100

    Merge pull request mui#2044 from CalebEverett/master

    [LeftNav] Open or close if docked prop changes when window resizes

commit bb57b9f
Merge: e439aaa bc7ceac
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Mon Nov 9 13:00:34 2015 +0100

    Merge pull request mui#2045 from rhythnic/master

    [Badge] Add a new component

commit bc7ceac
Author: Nick Baroni <nick@rhythnic.com>
Date:   Tue Nov 3 17:49:19 2015 +0900

    Added badge component.

commit e439aaa
Merge: c78b437 22e3b4c
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Mon Nov 9 11:37:23 2015 +0100

    Merge pull request mui#2097 from callemall/oliviertassinari-patch-2

    [README] Use master branch for the travis build status

commit 22e3b4c
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Mon Nov 9 11:12:46 2015 +0100

    [README] Use master branch for the travis build status

commit 6aff277
Author: Caleb Everett <caleb@careercalifornia.edu>
Date:   Wed Nov 4 12:20:53 2015 -0800

    set LeftNav docked in componentWillReceiveProps

commit 26a0c85
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Sun Nov 8 15:51:53 2015 +0100

    [eslint] Use the latest version

commit c78b437
Merge: df5f6ed 0dc2e4a
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Sun Nov 8 13:29:41 2015 +0100

    Merge pull request mui#2083 from subjectix/dialog-style-prop

    [doc] Add style property

commit df5f6ed
Merge: b4f8f8a 230bfcf
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Sun Nov 8 12:22:30 2015 +0100

    Merge pull request mui#2084 from oliviertassinari/npm

    [npm] Separate the lint and the build

commit 230bfcf
Author: Olivier Tassinari <olivier.tassinari@gmail.com>
Date:   Sat Nov 7 12:54:20 2015 +0100

    [npm] Separate the lint and the build

commit 0dc2e4a
Author: Ali Taheri <ali.taheri.m@gmail.com>
Date:   Tue Oct 6 15:54:45 2015 +0330

    Added undocumented style property to the components that use it

commit b4f8f8a
Merge: 780d9a5 34e26fb
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Sat Nov 7 04:03:50 2015 +0100

    Merge pull request mui#2078 from EnzoMartin/patch-1

    Fix label display with Chrome autocomplete

commit 780d9a5
Merge: 4ab4d19 dfa9216
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Sat Nov 7 02:44:05 2015 +0100

    Merge pull request mui#2073 from quangbuule/patch-1

    [TextField] Fix isValid function

commit 34e26fb
Author: Enzo Martin <enzo.r.martin@gmail.com>
Date:   Fri Nov 6 19:12:22 2015 +0100

    Fix label display with Chrome autocomplete

commit 4ab4d19
Merge: 47bf496 9fc0926
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Fri Nov 6 18:01:53 2015 +0100

    Merge pull request mui#2070 from mbrookes/patch-1

    [Doc] Add missing Textfield docs

commit 9fc0926
Author: Matt Brookes <mbrookes@users.noreply.github.com>
Date:   Fri Nov 6 16:34:44 2015 +0000

    Correct prop name!

commit dfa9216
Author: Quangbuu Le <quangbuule@gmail.com>
Date:   Fri Nov 6 11:29:25 2015 +0700

    Update text-field.jsx

    The isValid function return not correct, this caused re-rendering the whole TextField when value prop received.

commit 0904107
Author: Matt Brookes <mbrookes@users.noreply.github.com>
Date:   Thu Nov 5 23:08:41 2015 +0000

    Missing Textfield docs.

commit 47bf496
Merge: 7df3a99 2b1e062
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Thu Nov 5 15:22:32 2015 +0100

    Merge pull request mui#2063 from pandaiolo/node-props

    Changing propType from string to node on components

commit 2b1e062
Author: Pandaiolo <aurelien@arimaska.net>
Date:   Thu Nov 5 14:30:04 2015 +0100

    [docs] Changing propType from string to node on components

commit 98532fd
Author: Pandaiolo <aurelien@arimaska.net>
Date:   Thu Nov 5 12:53:38 2015 +0100

    Changing propType from string to node on components

commit 7df3a99
Merge: 789eaee 2019ad9
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Thu Nov 5 11:36:11 2015 +0100

    Merge pull request mui#2062 from pinturic/patch-1

    [LeftNav] Fix resize when using children

commit 2019ad9
Author: pinturic <luca.tagliaferri@gmail.com>
Date:   Thu Nov 5 11:28:04 2015 +0100

    Update left-nav.jsx

    cleaned _updateMenuHeight variables declaration

commit b6cca6f
Author: pinturic <luca.tagliaferri@gmail.com>
Date:   Thu Nov 5 11:14:27 2015 +0100

    Update left-nav.jsx

    Menu can be null if the MenuItems are inlined

commit 789eaee
Merge: 8f5510a 308a7a2
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Wed Nov 4 23:56:20 2015 +0100

    Merge pull request mui#2016 from KapJI/theme-fix

    [Theme] Fix Slider and Toggle colors

commit 8f5510a
Merge: dfb8363 801e05a
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Wed Nov 4 23:13:54 2015 +0100

    Merge pull request mui#1996 from JorgenEvens/feature/dialog-show-prop

    [Dialog] Allow open state of dialog to be controlled through the show prop

commit 801e05a
Author: Jorgen Evens <jorgen@evens.eu>
Date:   Thu Oct 29 20:26:37 2015 +0100

    [Dialog] Re-enable legacy API with deprecation warnings.

commit 8050f49
Author: Jorgen Evens <jorgen@evens.eu>
Date:   Tue Oct 27 22:48:45 2015 +0100

    [Dialog] Switch from imperative control to props.

    - Remove .dismiss() and .show()
    - Remove onShow and onDismiss callback
    - Added onRequestClose callback
    - Removed modal property
    - Updated docs
    - Add default values for defaultIsOpen and isOpen.

commit dfb8363
Merge: aef950e 045b630
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Wed Nov 4 18:43:13 2015 +0100

    Merge pull request mui#2054 from cannium/master

    [TableBody] Table click away should also trigger onRowSelection

commit 045b630
Author: Can Zhang <zhangcan@letv.com>
Date:   Wed Nov 4 10:36:22 2015 +0800

    Table click away should also trigger onRowSelection

commit aef950e
Merge: d3ee052 e7d6660
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Tue Nov 3 19:33:29 2015 +0100

    Merge pull request mui#2051 from chrismcv/auto-prefix-null

    [AutoPrefix] add null support

commit d3ee052
Merge: 67cca09 d14c413
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Tue Nov 3 19:16:40 2015 +0100

    Merge pull request mui#2049 from Dashlane/fix/typo-textfield-doc

    [Doc] Fix typo in TextField doc

commit d14c413
Author: Thomas Guillory <thomas.guillory@dashlane.com>
Date:   Tue Nov 3 10:50:59 2015 +0100

    Fix typo in TextField doc

    There is a typo in TextField element documentation: the "Style Hint
    Text" example is not using the right property of `styles` object.

commit e7d6660
Author: Chris McVittie <chris.mcvittie@blue-zinc.com>
Date:   Tue Nov 3 16:25:52 2015 +0000

    auto prefix null support

commit 67cca09
Merge: 5821f0a dfb0acb
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Tue Nov 3 17:04:18 2015 +0100

    Merge pull request mui#1720 from NatalieT/ipad-fix

    [TextField fix ipad enhanced textarea

commit dfb0acb
Author: Natalie Fitzsimons <natalie.fitzsimons@tm2app.co.uk>
Date:   Tue Nov 3 15:23:00 2015 +0000

    ipad cursor in extra field fix

commit 5821f0a
Merge: c8e622e 50a0942
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Tue Nov 3 14:47:55 2015 +0100

    Merge pull request mui#2042 from chrismcv/r2l

    Render to Layer component

commit 50a0942
Author: Chris McVittie <chris@greenflump.com>
Date:   Mon Nov 2 20:35:40 2015 +0000

    Render to Layer component (+ squashed fixes)

commit c8e622e
Merge: 08a7c6b 3983146
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Tue Nov 3 12:07:44 2015 +0100

    Merge pull request mui#2014 from oliviertassinari/button-label-position

    [Button] Fix and add missing labelPosition

commit 08a7c6b
Merge: 076c4af bfa7336
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Tue Nov 3 12:06:52 2015 +0100

    Merge pull request mui#2024 from oliviertassinari/snackbar-fix-hide-show

    [Snackbar] Assert that displayed data changed before hide/show

commit 076c4af
Merge: ac357ec 7677be5
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Tue Nov 3 11:58:29 2015 +0100

    Merge pull request mui#2047 from oliviertassinari/fix-progress

    [CircularProgress] Fix transition

commit 7677be5
Author: Olivier Tassinari <olivier.tassinari@gmail.com>
Date:   Tue Nov 3 11:50:19 2015 +0100

    [CircularProgress] clean up

commit 3f6d31a
Author: Chris McVittie <chris@greenflump.com>
Date:   Mon Nov 2 19:45:57 2015 +0000

    fix circular progress issue

commit ac357ec
Merge: 68baf9b b12bcdd
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Sun Nov 1 20:15:40 2015 +0100

    Merge pull request mui#2007 from Cavitt/universal-rendering

    Universal Rendering Support

commit b12bcdd
Author: Cavitt <support@xenomap.com>
Date:   Thu Oct 29 06:01:27 2015 -0500

    Implemented inline-style-prefixer

    User agent based prefixing for client and server side rendering. When
    rendering server-side define `navigator.userAgent` after receiving
    request headers but before rendering styles. A warning will be shown
    when attempting to use server-side rendering without defining a user
    agent. Client side rendering should automatically work as all modern
    browsers provide user agent via the navigator property.

commit 68baf9b
Merge: edaf30f b13fe11
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Sun Nov 1 16:49:36 2015 +0100

    Merge pull request mui#2025 from CameronFletcher92/timepicker-fix

    Added keys to timepicker buttons, fixed mui#1964

commit edaf30f
Merge: c66ff3d f25ef9e
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Sun Nov 1 16:46:11 2015 +0100

    Merge pull request mui#2030 from CameronFletcher92/tableheader-fix

    [Table] Added key to selectall column in TableHeader. Addresses mui#2028

commit f25ef9e
Author: Cameron Fletcher <cameronfletcher92@gmail.com>
Date:   Sun Nov 1 15:06:04 2015 +1000

    removed console log

commit 0b57d95
Author: Cameron Fletcher <cameronfletcher92@gmail.com>
Date:   Sun Nov 1 15:02:18 2015 +1000

    [Table] Added key to selectall column in TableHeader. Addresses mui#2028

commit c66ff3d
Merge: 0d86eea 80141f6
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Sun Nov 1 00:51:10 2015 +0100

    Merge pull request mui#2021 from callemall/oliviertassinari-patch-1

    [Overlay] Fix server side rendering

commit b13fe11
Author: Cameron Fletcher <cameronfletcher92@gmail.com>
Date:   Sun Nov 1 00:24:16 2015 +1000

    changed timepicker button keys to AM/PM

commit e3920ac
Author: Cameron Fletcher <cameronfletcher92@gmail.com>
Date:   Sun Nov 1 00:14:17 2015 +1000

    Added keys to timepicker buttons, fixed mui#1964

commit bfa7336
Author: Olivier Tassinari <olivier.tassinari@gmail.com>
Date:   Sat Oct 31 12:28:17 2015 +0100

    [Snackbar] Assert that displayed data changed before hide/show

commit 0d86eea
Merge: 6141e2b 176762e
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Sat Oct 31 12:22:26 2015 +0100

    Merge pull request mui#2022 from oliviertassinari/fix-test-date-picker

    [DatePicker] Fix tests for the 31 of October

commit 176762e
Author: Olivier Tassinari <olivier.tassinari@gmail.com>
Date:   Sat Oct 31 12:03:05 2015 +0100

    [DatePicker] Fix tests for the 31 of October

    This is a temporary fix.
    There is an edge case with the test.
    Calling addMonths with 31 of October return 1 of December,
    while we expect November.

commit 80141f6
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Sat Oct 31 11:16:39 2015 +0100

    [Overlay] Fix server side rendering

    The componentDidMount method is not called when rendering server side

commit 6141e2b
Merge: fd346dd 3f8825f
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Sat Oct 31 11:11:49 2015 +0100

    Merge pull request mui#1609 from umidbekkarimov/master

    [Table] onRowSelection return 'none' string on unselect all

commit 3983146
Author: Olivier Tassinari <olivier.tassinari@gmail.com>
Date:   Fri Oct 30 13:39:33 2015 +0100

    [Button] Fix and add missing labelPosition

commit fd346dd
Merge: 9be7261 a3e9cad
Author: Shaurya Arora <shaurya.arora1@gmail.com>
Date:   Fri Oct 30 17:03:23 2015 -0500

    Merge pull request mui#1589 from KapJI/slider-minvalue

    [Slider] Remove redundant 'defaultValue'. Fix bug when 'min' is greater than zero.

commit 308a7a2
Author: Ruslan Sayfutdinov <ruslan@sayfutdinov.com>
Date:   Fri Oct 30 20:54:27 2015 +0300

    Fix Slider and Toggle colors

commit a3e9cad
Author: Ruslan Sayfutdinov <ruslan@sayfutdinov.com>
Date:   Fri Oct 30 19:35:44 2015 +0300

    [Slider] Return 'defaultValue' back

commit 9be7261
Merge: 3304889 f69ad2d
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Thu Oct 29 22:34:34 2015 +0100

    Merge pull request mui#1907 from oliviertassinari/tabs-swipeable

    [Docs] Add an example of tabs with a slide effect

commit f69ad2d
Author: Olivier Tassinari <olivier.tassinari@gmail.com>
Date:   Sat Oct 17 01:05:22 2015 +0200

    [Docs] Add an example of tabs with a slide effect

    This a classical use case for tabs on android.

commit 3304889
Author: Shaurya Arora <shaurya.arora1@gmail.com>
Date:   Thu Oct 29 16:08:34 2015 -0500

    V0.13.1 release

commit 02959ea
Merge: eb3d232 8aaa223
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Thu Oct 29 10:51:14 2015 +0100

    Merge pull request mui#1988 from igorbt/gridlist-docs-fix

    [GridList] docs fix - add back code examples

commit eb3d232
Merge: 9ccc4e1 470c23f
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Wed Oct 28 10:26:54 2015 +0100

    Merge pull request mui#1691 from felipeptcho/master

    [Tabs] Added tabTemplate property in Tabs component for custom tab templates.

commit 9ccc4e1
Merge: aa7e541 83c610f
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Wed Oct 28 10:20:22 2015 +0100

    Merge pull request mui#1995 from KaeruCT/cardTextTextColor

    [Theme] Making card-text pull its text color from the theme

commit 8aaa223
Author: igorbt <igorbt@yahoo.com>
Date:   Wed Oct 28 06:28:43 2015 +0200

    fixed warning about keys and style

commit 470c23f
Author: Felipe Lima <felipeptcho@gmail.com>
Date:   Tue Oct 27 22:02:23 2015 -0300

    Added tabTemplate property in Tabs component for custom tab templates.

commit 83c610f
Author: Andres Villarreal <andres@securelink.com>
Date:   Tue Oct 27 17:30:14 2015 -0600

    Making tabs use theme colors for their text

commit 23e4080
Author: Andres Villarreal <andres@securelink.com>
Date:   Tue Oct 27 15:23:32 2015 -0600

    Making card-text pull its text color from the theme

commit aa7e541
Merge: 26fef66 1098b59
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Tue Oct 27 13:22:12 2015 +0100

    Merge pull request mui#1949 from tyfoo/feature/TimePicker-override-styles

    [TimePicker] added style and textFieldStyle (same as DatePicker)

commit 1098b59
Author: Ty <ty@dice.fm>
Date:   Wed Oct 21 13:46:48 2015 +0100

    TimePicker style and textFieldStyle props

commit 26fef66
Merge: efbbb15 d311e64
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Tue Oct 27 10:56:44 2015 +0100

    Merge pull request mui#1896 from chrismcv/text-field-fix

    [TextField] Fix children style

commit 6e93319
Author: igorbt <igorbt@yahoo.com>
Date:   Thu Oct 22 07:33:24 2015 +0300

    adding back grid-list code examples

commit efbbb15
Merge: f61d24d aa5dd75
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Mon Oct 26 19:37:15 2015 +0100

    Merge pull request mui#1668 from oliviertassinari/snackebar

    [Snackbar] Update for the new material specification

commit f61d24d
Merge: f2f84df 5239861
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Mon Oct 26 16:54:07 2015 +0100

    Merge pull request mui#1989 from pandaiolo/text-field-bg

    [TextField][Fix] Custom theme backgroundColor hiding hint text

commit f2f84df
Merge: 1169058 85256fe
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Mon Oct 26 13:45:30 2015 +0100

    Merge pull request mui#1982 from tyfoo/feature/LeftNav-Children

    [LeftNav] Support nested children (w/o menuItems)

commit 85256fe
Author: Ty <ty@dice.fm>
Date:   Fri Oct 23 18:28:05 2015 +0100

    LeftNav support nested children (w/o menuItems)

commit 5239861
Author: Pandaiolo <aurelien@arimaska.net>
Date:   Mon Oct 26 13:06:45 2015 +0100

    Fix custom theme backgroundColor hiding hint text

commit 1169058
Merge: f47888c b3b9bd6
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Sat Oct 24 01:00:43 2015 +0200

    Merge pull request mui#1694 from pbambusek/click-awayable

    [ClickAwayable] added event propagation to click-awayable mixin

commit f47888c
Merge: 6a9be42 5676a68
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Fri Oct 23 21:54:36 2015 +0200

    Merge pull request mui#1948 from DaveWM/master

    [Docs] Add grid list back into the menu

commit 6a9be42
Merge: 94737a7 7f54529
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Fri Oct 23 21:43:49 2015 +0200

    Merge pull request mui#1983 from davidmdem/Example_warnings_fix

    [Exemple] Fix rendering to body warning in example projects.

commit 7f54529
Author: David DeMeulenaere <dmdemeul@iu.edu>
Date:   Fri Oct 23 15:10:46 2015 -0400

    Fix React.render deprecated warning

commit f264c49
Author: David DeMeulenaere <dmdemeul@iu.edu>
Date:   Fri Oct 23 14:57:46 2015 -0400

    Fix rendering to body warning in example projects.

commit 94737a7
Merge: 8e05be5 1e3e40a
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Fri Oct 23 20:41:49 2015 +0200

    Merge pull request mui#1980 from xmityaz/master

    [Docs][TextField] Added inputStyle property in info section

commit 1e3e40a
Author: Dmytro <xmizok@gmail.com>
Date:   Fri Oct 23 20:43:14 2015 +0300

    [Docs][TextField] Added inputStyle property in info section

    [Docs][TextField] Added inputStyle property in info section

    [Docs][TextField] Added inputStyle property in info section

commit 8e05be5
Merge: 75f6782 9c59bba
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Fri Oct 23 18:23:26 2015 +0200

    Merge pull request mui#1658 from oliviertassinari/date-picker-intl

    [DatePicker] add Intl support

commit 75f6782
Merge: 2c18cd7 f8de5da
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Fri Oct 23 17:32:53 2015 +0200

    Merge pull request mui#1978 from davidmdem/Example_Dependencies_Fix

    [example] Update projects

commit f8de5da
Author: David DeMeulenaere <dmdemeul@iu.edu>
Date:   Fri Oct 23 11:27:01 2015 -0400

    Set contetnBase in example webpack dev server

commit db7d0cb
Author: David DeMeulenaere <dmdemeul@iu.edu>
Date:   Fri Oct 23 11:22:39 2015 -0400

    Update dependencies in example projects

commit 9c59bba
Author: Olivier Tassinari <olivier.tassinari@gmail.com>
Date:   Wed Sep 16 19:43:27 2015 +0100

    [DatePicker] add example with fr

commit 1db8cfc
Author: Olivier Tassinari <olivier.tassinari@gmail.com>
Date:   Tue Sep 15 22:44:19 2015 +0100

    [DatePicker] add proporty needed for Intl

commit ecab894
Author: Olivier Tassinari <olivier.tassinari@gmail.com>
Date:   Tue Sep 15 21:56:32 2015 +0100

    [DatePicker] implement custom DateTimeFormat

commit 2c18cd7
Merge: a18f08b 41f7477
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Fri Oct 23 16:07:01 2015 +0200

    Merge pull request mui#1954 from jsyrjala/master

    [ToolbarGroup] Allow putting strings inside

commit a18f08b
Merge: c7f6a82 bd0eb61
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Fri Oct 23 10:48:46 2015 +0200

    Merge pull request mui#1940 from tyfoo/feature/TimePick-autoOk

    [TimePicker] autoOk prop to automatically close the dialog

commit c7f6a82
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Thu Oct 22 19:46:03 2015 +0200

    [Docs] Fix a typo

commit bd0eb61
Author: Ty <ty@dice.fm>
Date:   Wed Oct 21 10:04:35 2015 +0100

    autoOk added to docs, missing comma, const

commit 2c2df5d
Merge: bba2703 77f71aa
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Thu Oct 22 13:37:05 2015 +0200

    Merge pull request mui#1939 from tyfoo/feature/TimePicker-openDialog

    [TimePicker] openDialog() method similar to DatePicker

commit 77f71aa
Author: Ty <ty@dice.fm>
Date:   Wed Oct 21 10:17:19 2015 +0100

    added openDialog() and focus() to docs

commit 2a4ce1f
Author: Ty <ty@dice.fm>
Date:   Tue Oct 20 17:30:07 2015 +0100

    TimePicker openDialog() similar to DatePicker

commit 41f7477
Author: Juha Syrjälä <juha.syrjala@gmail.com>
Date:   Wed Oct 21 21:18:46 2015 +0300

    Allow putting strings inside <ToolbarGroup>.

    Fixes mui#1953

commit bba2703
Merge: d2b7807 c3b23ff
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Thu Oct 22 01:27:03 2015 +0200

    Merge pull request mui#1875 from matsilva/issue/1870

    [TextField] Fix issue/1870: Fix if newHeight is 0, use rowsHeight instead

commit d2b7807
Merge: c8cada0 d25d122
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Thu Oct 22 01:18:44 2015 +0200

    Merge pull request mui#1957 from mmckelvy/master

    [Overlay] Fix body overflow style reset in overlay.jsx

commit c8cada0
Merge: 8c5d095 f39790f
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Thu Oct 22 01:17:39 2015 +0200

    Merge pull request mui#1959 from shaurya947/icons-index-gen

    [SVG] add Icons index.js

commit f39790f
Author: Shaurya Arora <shaurya.arora1@gmail.com>
Date:   Wed Oct 21 17:17:56 2015 -0500

    Adding newlines to end

    And some other minor changes

commit 5fcd97e
Author: Shaurya Arora <shaurya.arora1@gmail.com>
Date:   Wed Oct 21 17:01:05 2015 -0500

    Minor code cleanup

commit 4d213bf
Author: Shaurya Arora <shaurya.arora1@gmail.com>
Date:   Wed Oct 21 16:56:03 2015 -0500

    Added index generator for SVG icons

    src/svg-icons/index-generator.js is a naive implementation to generate an index.js file for SVG icons that uses synchronous calls to fs (nodejs API).

    index-generator.js can be run with node using "node index-generator.js" to generate the index.js file (good idea to delete old index.js first).

commit d25d122
Author: Mark McKelvy <mmckelvy@gmail.com>
Date:   Wed Oct 21 13:21:31 2015 -0700

    fix overlay issue

commit 8c5d095
Merge: 7980cd5 94463f2
Author: Shaurya Arora <shaurya.arora1@gmail.com>
Date:   Wed Oct 21 15:09:12 2015 -0500

    Merge pull request mui#1677 from MrLeebo/open-dropdownmenu

    Allow programmatic opening and closing DropDownMenu

commit 7980cd5
Author: Shaurya Arora <shaurya.arora1@gmail.com>
Date:   Wed Oct 21 14:38:59 2015 -0500

    V0.13.0 release

commit 94463f2
Author: Jeremy Liberman <jliberman@strenuus.com>
Date:   Mon Sep 21 09:49:42 2015 -0500

    Allow programmatic opening and closing DropDownMenu

commit 4e29f27
Merge: ca207c4 c69a57e
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Wed Oct 21 20:49:41 2015 +0200

    Merge pull request mui#1651 from louy/master

    [Card] Fix a potential error in <Card>

commit ca207c4
Merge: a5afe6d 8d119a3
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Wed Oct 21 20:27:41 2015 +0200

    Merge pull request mui#1887 from louy/patch-3

    [eslint] Set root: true in .eslintrc

commit a5afe6d
Merge: b7e4cd6 ebbd08f
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Wed Oct 21 20:20:21 2015 +0200

    Merge pull request mui#1686 from KapJI/toggle-layout

    [Toggle] Fix layout

commit b7e4cd6
Merge: cbca4f3 adc5a8c
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Wed Oct 21 20:19:36 2015 +0200

    Merge pull request mui#1575 from TrySpace/master

    [FloatingActionButton] add iconStyle prop

commit cbca4f3
Merge: 3dc01af 26e3a3e
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Wed Oct 21 20:17:03 2015 +0200

    Merge pull request mui#1833 from AliciaWamsley/patch-1

    [CardMedia] Add width='100%' to mediaChild

commit 3dc01af
Merge: 806732f 4706cca
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Wed Oct 21 20:15:23 2015 +0200

    Merge pull request mui#1950 from pandaiolo/master

    [CardHeader] title and subtitle can be any node, not only strings

commit 26e3a3e
Author: Alicia Wamsley <wamsleai@ucmail.uc.edu>
Date:   Wed Oct 7 13:10:44 2015 -0400

    Add width='100%' to mediaChild

    Add width='100%' to mediaChild for Firefox.
    In Firefox, the IMG tag children pop out of their containers if the width isn't set.

commit 806732f
Merge: b63a94f 0a2d21b
Author: Olivier Tassinari <Olivier.tassinari@gmail.com>
Date:   Wed Oct 21 19:01:35 2015 +0200

    Merge pull request mui#1936 from vinzscam/master

    [Grid] Fix GridList style broken in Safari

commit c69a57e
Author: Louy <me@l0uy.com>
Date:   Wed Oct 21 19:57:37 2015 +0300

    Fix a potential error in <Card>

commit 4706cca
Author: Pandaiolo <aurelien@arimaska.net>
Date:   Wed Oct 21 15:23:56 2015 +0200

    CardHeader title and subtitle can be any node, not only strings

commit 5676a68
Author: Dave Martin <dmartin@sportingindex.com>
Date:   Wed Oct 21 12:56:02 2015 +0100

    docs - added grid list back into component menu. Fixes mui#1947

commit d0ed1db
Author: Ty <ty@dice.fm>
Date:   Wed Oct 21 10:04:21 2015 +0100

    default autoOk value (false)

commit c663e35
Author: Ty <ty@dice.fm>
Date:   Wed Oct 21 10:03:25 2015 +0100

    typo correction and using const

commit 69d47fa
Author: Ty <ty@dice.fm>
Date:   Tue Oct 20 17:59:35 2015 +0100

    TimePicker autoOk prop

commit 439ccfc
Author: VincentBel <buaazqh@gmail.com>
Date:   Wed Oct 21 12:36:34 2015 +0800

    [Dialog] fix the problem that bottom body become scrollable after resizing

commit ebbd08f
Author: Ruslan Sayfutdinov <ruslan@sayfutdinov.com>
Date:   Wed Oct 21 00:55:06 2015 +0300

    Make 46px less magic

commit 0a2d21b
Author: Vincenzo Scamporlino <vinz.scamporlino@gmail.com>
Date:   Tue Oct 20 23:13:11 2015 +0200

    Default cellHeight value to number

commit aa5dd75
Author: Olivier Tassinari <olivier.tassinari@gmail.com>
Date:   Wed Sep 16 23:34:47 2015 +0100

    [Snackbar] update for the new specification

    Conflicts:
    	src/snackbar.jsx

commit e967763
Author: Vincenzo Scamporlino <vinz.scamporlino@gmail.com>
Date:   Tue Oct 20 15:32:30 2015 +0200

    fixed style issues with Safari

commit 59a8530
Author: Jon Haygood <haygoodjon@gmail.com>
Date:   Fri Oct 16 11:34:05 2015 -0400

    Correct invalid background-color property value

    What are we going for here? - transparent, inherit, or palette.canvasColor all would make sense to me

    http://stackoverflow.com/questions/8739665/is-background-colornone-valid-css

commit d311e64
Author: Chris McVittie <chris.mcvittie@blue-zinc.com>
Date:   Fri Oct 16 10:25:20 2015 +0100

    text field style fix

commit 8d119a3
Author: Louy Alakkad <louy08@gmail.com>
Date:   Thu Oct 15 19:24:40 2015 +0300

    Set root: true in .eslintrc

    Closes mui#1861

commit c3b23ff
Author: Mat Silva <askmatsilva@gmail.com>
Date:   Tue Oct 13 21:23:04 2015 -0400

    issue/1870: Fix if newHeight is 0, use rowsHeight instead

commit 28a0477
Author: Ruslan Sayfutdinov <ruslan@sayfutdinov.com>
Date:   Fri Sep 4 18:48:19 2015 +0300

    Fix value update while dragging

commit 29964f5
Author: Ruslan Sayfutdinov <ruslan@sayfutdinov.com>
Date:   Fri Sep 4 00:39:48 2015 +0300

    Remove redundant 'defaultValue'. Fix bug when 'min' greater than zero.

commit b3b9bd6
Author: Petr Bambušek <petr.bambusek@gmail.com>
Date:   Mon Sep 21 20:12:11 2015 +0200

    added event propagation to click-awayable mixin

commit d907417
Author: Ruslan Sayfutdinov <ruslan@sayfutdinov.com>
Date:   Sun Sep 20 19:13:36 2015 +0300

    [Toggle] Fix layout

commit 8ec1fcf
Author: Garth Williams <garth@wi.llia.ms>
Date:   Tue Sep 8 15:44:21 2015 +0200

    SelectField now triggers on change consistently when using props.value

    fixes mui#1608

commit 3f8825f
Author: Umidbek Karimov <uma.karimov@gmail.com>
Date:   Tue Sep 8 18:02:54 2015 +0500

    Update table.jsx

    [Table] onRowSelection return 'none' string on unselect all

commit adc5a8c
Merge: 28403c3 5fc8647
Author: Try Space <mgasman@gmail.com>
Date:   Wed Sep 2 13:21:52 2015 +0200

    Merge pull request mui#1 from TrySpace/TrySpace-FloatingActionButton-iconStyle

    add `iconStyle` to EnhancedButton

commit 5fc8647
Author: Try Space <mgasman@gmail.com>
Date:   Wed Sep 2 13:21:34 2015 +0200

    add `iconStyle` to EnhancedButton

    mui#1574

commit db21ee8
Author: Jeong Yong-uk <ywj1022@gmail.com>
Date:   Fri Aug 21 21:34:39 2015 +0900

    AppBar should be positioned

    zIndex only has an effect if an element is positioned
  • Loading branch information
@tyfoo
tyfoo committed Nov 12, 2015
1 parent b63a94f commit 4132bbf
Show file tree
Hide file tree
Showing 144 changed files with 4,035 additions and 853 deletions.
7 changes: 7 additions & 0 deletions .babelrc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"breakConfig": true,
"stage": 1,
"plugins": [
"dev-expression"
]
}
3 changes: 3 additions & 0 deletions .eslintrc
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# So parent files don't get applied
root: true

env:
es6: true
browser: true
Expand Down
3 changes: 3 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@ language: node_js
node_js:
- "stable"
sudo: false
script:
- npm run lint
- npm test
63 changes: 63 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,69 @@
## 0.13.2
###### _Nov 9, 2015_

##### General
- Add tabs with slide effect (#1907)
- Universal rendering support (#2007) (thanks @Cavitt)
- Add labelPosition prop to buttons (#2014)
- Add RenderToLayer component (#2042) (thanks @chrismcv)
- Open state of of dialog now controlled through props (#1996)
- openImmediately, show(), dismiss() deprecated
- Update TextField docs (#2070)
- New Badge component (#2045) (thanks @rhythnic)
- Add import statements to components' docs pages (#2113)

##### Component Fixes / Enhancements
- Fix server side rendering (#2021)
- Add key to TableHeaderColumn for selectAll (#2030)
- Fix Circular Progress transition (#2047)
- Fix Snackbar getting stuck when receiving new props (#2024)
- iPad enhanced textarea fix (#1720)
- Table clickAway triggers onRowSelection (#2054)
- Theme color fixes for Slider and Toggle (#2016)

## 0.13.1
###### _Oct 29, 2015_

##### General
- [SVGIcons] added index.js and index-generator script (#1959)
- [TimePicker] openDialog() function (#1939) and autoOk prop (#1940) added
- [DatePicker] i18n support added (#1658)
- [LeftNav] supports nested children (w/o menuItems) (#1982)
- [Snackbar] updated for new specification (#1668)
- [Tabs] added tabTemplate prop (#1691)

##### Component Fixes / Enhancements
- [TextArea] height issue fixed (#1875)
- [GridList] doc added (#1948) with code examples (#1988)
- [TextField] fixed custom theme color hiding backgroundColor (#1989)
- [TimePicker] added style and textFieldStyle props (#1949)
- [Card] text color is now pulled from theme (#1995)

## 0.13.0
###### _Oct 21, 2015_

##### Breaking Changes
- Material-UI for React 0.14.x

##### Component Fixes / Enhancements
- FloatingActionButton now has iconStyle prop (#1575)
- Card title and subtitle props can be any node (#1950)

## 0.12.5
###### _Oct 21, 2015_

v0.12.4 should have really been v0.13.0 as it breaks compatibility with React 0.13.3. This version fixes that. We reverted some commits (related to React 0.14.0 support) from v0.12.4 to bring to you v0.12.5 that works as expected.

##### Component Fixes / Enhancements
- DatePicker performance has been improved (#1905)
- Docs code now follows ESLint rules more strictly (#1778)
- Removed duplicate keys in component definitions (#1933)

## 0.12.4
###### _Oct 19, 2015_

**This version is not compatible with React 0.13.x.** If you're on React 0.13.x, use Material-UI v0.12.5 instead.

##### General
- React 0.14 compatible

Expand Down
5 changes: 4 additions & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
#[Material-UI](http://callemall.github.io/material-ui/) [![npm package](https://img.shields.io/npm/v/material-ui.svg?style=flat-square)](https://www.npmjs.org/package/material-ui) [![Build Status](https://img.shields.io/travis/callemall/material-ui.svg?style=flat-square)](https://travis-ci.org/callemall/material-ui) [![Gitter](https://img.shields.io/badge/gitter-join%20chat-f81a65.svg?style=flat-square)](https://gitter.im/callemall/material-ui?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
#[Material-UI](http://callemall.github.io/material-ui/)
[![npm package](https://img.shields.io/npm/v/material-ui.svg?style=flat-square)](https://www.npmjs.org/package/material-ui)
[![Build Status](https://travis-ci.org/callemall/material-ui.svg?branch=master)](https://travis-ci.org/callemall/material-ui)
[![Gitter](https://img.shields.io/badge/gitter-join%20chat-f81a65.svg?style=flat-square)](https://gitter.im/callemall/material-ui?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

[![PeerDependencies](https://img.shields.io/david/peer/callemall/material-ui.svg?style=flat-square)](https://david-dm.org/callemall/material-ui#info=peerDependencies&view=list)
[![Dependencies](https://img.shields.io/david/callemall/material-ui.svg?style=flat-square)](https://david-dm.org/callemall/material-ui)
Expand Down
10 changes: 4 additions & 6 deletions docs/package.json
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
{
"name": "material-ui-docs",
"version": "0.12.4",
"version": "0.13.2",
"description": "Documentation site for material-ui",
"repository": {
"type": "git",
"url": "https://github.com/callemall/material-ui.git"
},
"private": true,
"scripts": {
"prestart": "webpack-dev-server --config webpack-dev-server.config.js --progress --colors --inline",
"start": "open http://localhost:3000",
Expand All @@ -15,13 +16,10 @@
"dependencies": {
"codemirror": "^5.5.0",
"history": "^1.11.1",
"react-addons-create-fragment": "^0.14.0",
"react-addons-perf": "^0.14.0",
"react-addons-pure-render-mixin": "^0.14.0",
"react-addons-transition-group": "^0.14.0",
"react-addons-update": "^0.14.0",
"react-dom": "^0.14.0",
"react-tap-event-plugin": "^0.2.0"
"react-motion": "^0.3.1",
"react-swipeable-views": "^0.3.0"
},
"devDependencies": {
"raw-loader": "^0.5.1",
Expand Down
6 changes: 6 additions & 0 deletions docs/src/app/app-routes.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,21 @@ const InlineStyles = require('./components/pages/customization/inline-styles');
const Components = require('./components/pages/components');
const AppBar = require('./components/pages/components/app-bar');
const Avatars = require('./components/pages/components/avatars');
const Badge = require('./components/pages/components/badge');
const Buttons = require('./components/pages/components/buttons');
const Cards = require('./components/pages/components/cards');
const DatePicker = require('./components/pages/components/date-picker');
const Dialog = require('./components/pages/components/dialog');
const DropDownMenu = require('./components/pages/components/drop-down-menu');
const GridList = require('./components/pages/components/grid-list');
const Icons = require('./components/pages/components/icons');
const IconButtons = require('./components/pages/components/icon-buttons');
const IconMenus = require('./components/pages/components/icon-menus');
const LeftNav = require('./components/pages/components/left-nav');
const Lists = require('./components/pages/components/lists');
const Menus = require('./components/pages/components/menus');
const Paper = require('./components/pages/components/paper');
const Popover = require('./components/pages/components/popover');
const Progress = require('./components/pages/components/progress');
const RefreshIndicator = require('./components/pages/components/refresh-indicator');
const Sliders = require('./components/pages/components/sliders');
Expand Down Expand Up @@ -76,18 +79,21 @@ const AppRoutes = (
<Route path="components" component={Components}>
<Route path="appbar" component={AppBar} />
<Route path="avatars" component={Avatars} />
<Route path="badge" component={Badge} />
<Route path="buttons" component={Buttons} />
<Route path="cards" component={Cards} />
<Route path="date-picker" component={DatePicker} />
<Route path="dialog" component={Dialog} />
<Route path="dropdown-menu" component={DropDownMenu} />
<Route path="grid-list" component={GridList} />
<Route path="icons" component={Icons} />
<Route path="icon-buttons" component={IconButtons} />
<Route path="icon-menus" component={IconMenus} />
<Route path="left-nav" component={LeftNav} />
<Route path="lists" component={Lists} />
<Route path="menus" component={Menus} />
<Route path="paper" component={Paper} />
<Route path="popover" component={Popover} />
<Route path="progress" component={Progress} />
<Route path="refresh-indicator" component={RefreshIndicator} />
<Route path="sliders" component={Sliders} />
Expand Down
3 changes: 3 additions & 0 deletions docs/src/app/components/pages/components.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,21 @@ export default class Components extends React.Component {
let menuItems = [
{ route: '/components/appbar', text: 'AppBar'},
{ route: '/components/avatars', text: 'Avatars'},
{ route: '/components/badge', text: 'Badge'},
{ route: '/components/buttons', text: 'Buttons'},
{ route: '/components/cards', text: 'Cards'},
{ route: '/components/date-picker', text: 'Date Picker'},
{ route: '/components/dialog', text: 'Dialog'},
{ route: '/components/dropdown-menu', text: 'Dropdown Menu'},
{ route: '/components/grid-list', text: 'Grid List'},
{ route: '/components/icons', text: 'Icons'},
{ route: '/components/icon-buttons', text: 'Icon Buttons'},
{ route: '/components/icon-menus', text: 'Icon Menus'},
{ route: '/components/left-nav', text: 'Left Nav'},
{ route: '/components/lists', text: 'Lists'},
{ route: '/components/menus', text: 'Menus'},
{ route: '/components/paper', text: 'Paper'},
{ route: '/components/popover', text: 'Popover'},
{ route: '/components/progress', text: 'Progress'},
{ route: '/components/refresh-indicator', text: 'Refresh Indicator'},
{ route: '/components/sliders', text: 'Sliders'},
Expand Down
47 changes: 37 additions & 10 deletions docs/src/app/components/pages/components/app-bar.jsx
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,22 @@
let React = require('react');
let { AppBar, DropDownMenu } = require('material-ui');
let IconButton = require('icon-button');
let NavigationClose = require('svg-icons/navigation/close');
let FlatButton = require('flat-button');
let ComponentDoc = require('../../component-doc');
let CodeExample = require('../../code-example/code-example');
let Code = require('app-bar-code');
const React = require('react');
const { AppBar, DropDownMenu, Paper } = require('material-ui');
const IconButton = require('icon-button');
const NavigationClose = require('svg-icons/navigation/close');
const FlatButton = require('flat-button');
const ComponentDoc = require('../../component-doc');
const CodeExample = require('../../code-example/code-example');
const CodeBlock = require('../../code-example/code-block');
const Code = require('app-bar-code');
const IconMenu = require('menus/icon-menu');
const MenuItem = require('menus/menu-item');
const MoreVertIcon = require('svg-icons/navigation/more-vert');

const styles = {
title: {
cursor: 'pointer',
},
};

export default class AppBarPage extends React.Component {

constructor(props) {
Expand Down Expand Up @@ -63,7 +70,7 @@ export default class AppBarPage extends React.Component {
name: 'style',
type: 'object',
header: 'optional',
desc: 'Override the inline-styles of the app bars\'s root element.',
desc: 'Override the inline-styles of the app bar\'s root element.',
},
{
name: 'showMenuIconButton',
Expand Down Expand Up @@ -102,6 +109,12 @@ export default class AppBarPage extends React.Component {
desc: 'Callback function for when the right icon is selected via ' +
'a touch tap.',
},
{
name: 'onTitleTouchTap',
header: 'AppBar.onTitleTouchTap(e)',
desc: 'Callback function for when the title text is selected via ' +
'a touch tap.',
},
],
},
];
Expand All @@ -113,13 +126,23 @@ export default class AppBarPage extends React.Component {
name="AppBar"
desc={this.desc}
componentInfo={this.componentInfo}>

<Paper style = {{marginBottom: '22px'}}>
<CodeBlock>
{
'//Import statement:\nconst AppBar = require(\'material-ui/lib/app-bar\');\n\n' +
'//See material-ui/lib/index.js for more\n'
}
</CodeBlock>
</Paper>

<CodeExample code={Code}>
<AppBar
title="Title"
iconClassNameRight="muidocs-icon-navigation-expand-more" />
<br />
<AppBar
title="Title"
title={<span style={styles.title} onTouchTap={this._onTouchTap}>Title</span>}
iconElementLeft={<IconButton><NavigationClose /></IconButton>}
iconElementRight={<FlatButton label="Save" />} />
<br />
Expand All @@ -140,4 +163,8 @@ export default class AppBarPage extends React.Component {
);
}

_onTouchTap() {
alert('onTouchTap triggered on the title component');
}

}
25 changes: 18 additions & 7 deletions docs/src/app/components/pages/components/avatars.jsx
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
let React = require('react');
let { Avatar, FontIcon, List, ListItem, Styles } = require('material-ui');
let ComponentDoc = require('../../component-doc');
let FileFolder = require('svg-icons/file/folder');
let { Colors } = Styles;
let Code = require('avatars-code');
let CodeExample = require('../../code-example/code-example');
const React = require('react');
const { Avatar, FontIcon, List, ListItem, Styles, Paper } = require('material-ui');
const ComponentDoc = require('../../component-doc');
const FileFolder = require('svg-icons/file/folder');
const { Colors } = Styles;
const Code = require('avatars-code');
const CodeExample = require('../../code-example/code-example');
const CodeBlock = require('../../code-example/code-block');


export default class AvatarsPage extends React.Component {
Expand Down Expand Up @@ -70,6 +71,16 @@ export default class AvatarsPage extends React.Component {
name="Avatars"
desc={desc}
componentInfo={componentInfo}>

<Paper style = {{marginBottom: '22px'}}>
<CodeBlock>
{
'//Import statement:\nconst Avatar = require(\'material-ui/lib/avatar\');\n\n' +
'//See material-ui/lib/index.js for more\n'
}
</CodeBlock>
</Paper>

<CodeExample code={Code}>
<List>
<ListItem leftAvatar={imageAvatar} disabled={true}>Image Avatar</ListItem>
Expand Down
Loading

0 comments on commit 4132bbf

Please sign in to comment.