Commit Graph

4152 Commits

Author SHA1 Message Date
MG12
dcd6a05432 rollback the version 2015-12-16 18:14:27 +08:00
afc163
e20111d918 Add table locale emptyText 2015-12-16 18:14:22 +08:00
afc163
5ed3ba72b4 fix some form item style 2015-12-16 17:39:10 +08:00
MG12
ece8eaa7ad update time-picker to 1.0.0-alpha9 2015-12-16 17:29:28 +08:00
afc163
76ecce0942 Add column key for table demo 2015-12-16 16:35:56 +08:00
afc163
5d0287615d update table index 2015-12-16 15:53:46 +08:00
afc163
55315649bc Merge branch 'develop-0.11.0' of github.com:ant-design/ant-design into develop-0.11.0 2015-12-16 15:48:02 +08:00
afc163
7b6fd3128c update docs 2015-12-16 15:26:14 +08:00
Benjy Cui
7f2957b23b style: unify demos' code style 2015-12-16 15:25:15 +08:00
afc163
d1fc49f885 update docs 2015-12-16 15:14:42 +08:00
afc163
4bb18780e5 update import document 2015-12-16 15:04:51 +08:00
afc163
269326abaa 0.11.0-beta1 2015-12-16 14:57:07 +08:00
afc163
ca0cfc2cd0 Merge pull request #685 from ant-design/deps-slider
deps: upgrade rc-slider, ref #413
2015-12-16 14:14:05 +08:00
Benjy Cui
d644484236 deps: upgrade rc-slider 2015-12-16 14:03:09 +08:00
afc163
029890a5ab fix default prop doc 2015-12-16 11:56:30 +08:00
afc163
7eb3c04a1e Add tabPostion bottom 2015-12-16 11:53:52 +08:00
afc163
f056e517b9 Merge pull request #684 from ant-design/fix-table
fix: uncheck when all the data are disabled #682
2015-12-16 10:57:13 +08:00
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