Benjy Cui
|
74fc3fd710
|
fix: uncheck when all the data are disabled #682
|
2015-12-16 10:32:32 +08:00 |
|
afc163
|
406f611135
|
update tabs style
|
2015-12-15 22:10:50 +08:00 |
|
yiminghe
|
6e8d9c4079
|
Merge pull request #674 from ant-design/feat-new-tabs-style
Feat new tabs style
|
2015-12-15 19:24:51 +08:00 |
|
afc163
|
3ba785630b
|
Merge branch 'master' of github.com:ant-design/ant-design
|
2015-12-15 18:25:09 +08:00 |
|
afc163
|
2aa3e7149d
|
Merge branch 'develop-0.11.0' of github.com:ant-design/ant-design into develop-0.11.0
|
2015-12-15 18:24:23 +08:00 |
|
afc163
|
c74f204158
|
merge master
|
2015-12-15 18:23:05 +08:00 |
|
afc163
|
a580826675
|
fix peerDenpdencies with react-router@1.0.2
Conflicts:
package.json
|
2015-12-15 18:22:18 +08:00 |
|
afc163
|
8b34ffce3f
|
fix non-cached scripts
|
2015-12-15 18:20:16 +08:00 |
|
Benjy Cui
|
7cd8b34015
|
chore: remove useless div
|
2015-12-15 17:54:43 +08:00 |
|
afc163
|
734dcc142a
|
update tabs document
|
2015-12-15 17:30:06 +08:00 |
|
daqi.sdq
|
2850804feb
|
modify api
|
2015-12-15 17:08:34 +08:00 |
|
afc163
|
c43d59dbb4
|
update editable-card.md
|
2015-12-15 16:38:53 +08:00 |
|
afc163
|
12c1272354
|
rewrite editable card
|
2015-12-15 16:34:02 +08:00 |
|
daqi.sdq
|
2c8072cb98
|
Merge branch 'develop-0.11.0' into component-transfer
* develop-0.11.0: (147 commits)
update upload style
fix className
update tabs demo
Add picture style upload list
fix docs
fix #662
fix value prop of DatePicker to controlled prop
Add overflowCount for badge, close #660
Add ceiling spec, #413
update spec/tools.md
fix react-component/time-picker#9
fix prefixCls
feat: add Menu.ItemGroup #654
update tabs document
update text
Add design tools page
update upgrade notes
Add warn message and fix warn alert icon
Datepicker => DatePicker, Timepicker => TimePicker
Add propTypes
...
# Conflicts:
# index.js
|
2015-12-15 14:05:57 +08:00 |
|
afc163
|
b115f000f9
|
Fix some style and react key problems
|
2015-12-15 11:38:27 +08:00 |
|
afc163
|
349d03e384
|
update tabs document
|
2015-12-14 22:20:29 +08:00 |
|
afc163
|
257d90fce1
|
Add editable tabs example
|
2015-12-14 22:16:25 +08:00 |
|
afc163
|
6f04d7c1a7
|
Add type=card tabs
|
2015-12-14 16:30:15 +08:00 |
|
afc163
|
0bd2ed9378
|
update upload style
|
2015-12-14 11:56:00 +08:00 |
|
afc163
|
721c00e925
|
fix className
|
2015-12-14 11:45:35 +08:00 |
|
afc163
|
759baedadd
|
update tabs demo
|
2015-12-13 20:08:58 +08:00 |
|
afc163
|
9560c310a2
|
Merge pull request #666 from ant-design/upload-list-picture-style
Add picture style upload list
|
2015-12-13 19:47:20 +08:00 |
|
afc163
|
7288dfbaf9
|
Add picture style upload list
|
2015-12-13 17:46:06 +08:00 |
|
afc163
|
d4850c418f
|
Merge branch 'master' into develop-0.11.0
|
2015-12-12 16:01:43 +08:00 |
|
afc163
|
dcc15110b4
|
fix docs
|
2015-12-12 15:58:59 +08:00 |
|
afc163
|
d6bd53927e
|
Merge branch 'master' into develop-0.11.0
|
2015-12-12 15:43:28 +08:00 |
|
afc163
|
a1064fcf14
|
fix #662
|
2015-12-12 15:36:06 +08:00 |
|
afc163
|
41660c3814
|
fix value prop of DatePicker to controlled prop
|
2015-12-12 13:38:25 +08:00 |
|
afc163
|
dce02dd5f9
|
Merge branch 'develop-0.11.0' of github.com:ant-design/ant-design into develop-0.11.0
|
2015-12-11 17:57:43 +08:00 |
|
afc163
|
5e18c37cce
|
Add overflowCount for badge, close #660
|
2015-12-11 17:57:09 +08:00 |
|
afc163
|
dd050bed0c
|
Add ceiling spec, #413
|
2015-12-11 23:28:30 +08:00 |
|
afc163
|
51f9da1c34
|
update spec/tools.md
|
2015-12-11 22:50:14 +08:00 |
|
afc163
|
4ed1c17cd6
|
fix react-component/time-picker#9
|
2015-12-11 21:50:14 +08:00 |
|
afc163
|
9dd5becfc8
|
fix prefixCls
|
2015-12-11 19:58:41 +08:00 |
|
afc163
|
7701714615
|
Merge pull request #658 from ant-design/feat-menu-itemgroup
feat: add Menu.ItemGroup #654
|
2015-12-11 17:09:38 +08:00 |
|
Benjy Cui
|
6e95c29a1d
|
feat: add Menu.ItemGroup #654
|
2015-12-11 17:01:21 +08:00 |
|
afc163
|
23e1ad362b
|
update tabs document
|
2015-12-10 17:47:51 +08:00 |
|
afc163
|
941d8f7c6b
|
update text
|
2015-12-10 17:41:13 +08:00 |
|
afc163
|
a9ba48f7c1
|
Add design tools page
|
2015-12-10 17:23:37 +08:00 |
|
afc163
|
3f942d6cf5
|
update upgrade notes
|
2015-12-10 16:45:20 +08:00 |
|
afc163
|
5908b11652
|
Add warn message and fix warn alert icon
|
2015-12-10 16:41:41 +08:00 |
|
afc163
|
c7bcea8559
|
Merge pull request #651 from ant-design/remove-table-datasource
Remove remote mode datasource of Table
|
2015-12-10 16:33:23 +08:00 |
|
afc163
|
e5faf12d19
|
Merge pull request #653 from ant-design/feat-change-picker-name
Datepicker => DatePicker, Timepicker => TimePicker
|
2015-12-10 16:33:05 +08:00 |
|
afc163
|
d759d1f489
|
Datepicker => DatePicker, Timepicker => TimePicker
|
2015-12-10 16:30:18 +08:00 |
|
afc163
|
41c60f6469
|
Add propTypes
|
2015-12-10 15:26:45 +08:00 |
|
afc163
|
58845101c2
|
update table demos
|
2015-12-10 15:16:33 +08:00 |
|
afc163
|
62d4bbd573
|
remove remote dataSource
|
2015-12-10 14:49:24 +08:00 |
|
afc163
|
91387c2fa6
|
fix border-radius
|
2015-12-10 12:14:48 +08:00 |
|
afc163
|
b4789e585d
|
filter dropdown should have max height
|
2015-12-10 12:13:13 +08:00 |
|
afc163
|
397cfc96c0
|
fix selectedRowKeys bug code in 19c385c
|
2015-12-09 22:07:13 +08:00 |
|