Commit Graph

3063 Commits

Author SHA1 Message Date
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
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
afc163
a46dc5135c fix selection column width, close #649 2015-12-09 21:55:07 +08:00
afc163
f659fecce7 Merge branch 'master' into develop-0.11.0 2015-12-09 18:14:22 +08:00
afc163
8b8f186ce0 update footer links 2015-12-09 16:58:20 +08:00
afc163
8604a9a2d2 slash -> separator, #641 2015-12-09 16:48:52 +08:00
afc163
e803524350 update small switch 2015-12-09 16:40:50 +08:00
afc163
ad50514b8c fix peerDenpdencies with react-router@1.0.2 2015-12-09 16:26:57 +08:00
afc163
dfd70ae634 fix empty filters when receive new columns in Table, ref #418 comment-163093580 2015-12-09 15:59:54 +08:00
afc163
801330cac7 update deps 2015-12-08 22:17:06 +08:00
afc163
2c3bf07d39 improve selected item style, close #467 2015-12-08 22:08:21 +08:00
afc163
c1b1765a1b Fix short format timepicker 2015-12-08 21:23:07 +08:00
afc163
4f4240227e Fix textarea not editable bug, close #646
Caused by #589 fix

and fix #586 via https://github.com/facebook/react/issues/2533#issuecomment-15150334
2015-12-08 19:23:23 +08:00
afc163
31ee4bea30 Fix textarea not editable bug, close #646
Caused by #589 fix

and fix #586 via https://github.com/facebook/react/issues/2533#issuecomment-15150334
2015-12-08 19:18:04 +08:00
afc163
69dc8e5fc4 remove completely, #567 2015-12-08 18:17:42 +08:00
afc163
f3d5607f13 update document for style import, #567 2015-12-08 18:05:01 +08:00
afc163
3016ef052a remove default style import, close #567
ref #413
2015-12-08 17:59:07 +08:00