Commit Graph

52 Commits

Author SHA1 Message Date
warmhug
f0b4a173a5 Merge pull request #775 from ant-design/feature/tree-select
Feature/tree select
2015-12-31 14:50:29 +08:00
然则
f40d5ff36b big change 2015-12-31 14:38:35 +08:00
afc163
20ce55933e Add cascade 2015-12-30 17:53:43 +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
1d5e119d26 Remove empty less files 2015-11-27 12:03:44 +08:00
Daqi Song
27dc9bc853 init transfer 2015-11-25 23:17:06 +08:00
afc163
47a0c8dc5e resolve conflict 2015-11-19 14:30:50 +08:00
afc163
f8d6555fe8 fix timepicker validate style 2015-11-19 14:11:34 +08:00
崖鹰
bfb4342c0c add timepicker component 2015-11-19 14:07:31 +08:00
崖鹰
bf4afae270 add timepicker component 2015-11-19 14:03:58 +08:00
血诺
4db12ff733 add components/calendar 2015-11-11 13:11:47 +08:00
KgTong
5c1a11710d add spin component 2015-10-27 10:10:27 +08:00
zhujun24
018a62886d add timeline 2015-09-01 21:15:31 +08:00
afc163
af2425d7d5 Add component badge 2015-09-01 13:59:45 +08:00
afc163
dae05a55c4 merge 2015-08-09 18:05:50 +08:00
玄寂
63cf7bb742 feat: add upload component 2015-08-08 23:37:35 +08:00
afc163
bba4f9df42 ant-affix 2015-08-07 11:04:22 +08:00
yiminghe
4d203b6e67 add menu 2015-08-06 16:49:54 +08:00
偏右
2fe97eb8ee Merge pull request #88 from zhujun24/notification
Notification
2015-08-04 11:45:40 +08:00
sorrycc
ebf1c3ed25 add Carousel 2015-08-03 17:43:05 +08:00
ioldfish
c18af7db79 包装rc-tree,样式待修改 2015-08-03 16:07:21 +08:00
zhujun24
a4f6890dec merge 0.8.0 2015-07-31 18:19:36 +08:00
afc163
e067bcd7a5 merge from 0.8.0 2015-07-30 10:52:30 +08:00
zhujun24
26df3480ff Merge branch 'alert' into notification 2015-07-30 10:50:11 +08:00
afc163
b8ef693afc button loading animation effect 2015-07-29 22:23:55 +08:00
zhujun24
718751d063 merge 0.8.0 2015-07-29 21:07:02 +08:00
afc163
2e0be628a7 update tag style 2015-07-28 20:03:10 +08:00
zhujun24
19a2604b71 notification half 2015-07-28 15:40:28 +08:00
zhujun24
eea48ffe16 Alert component 2015-07-27 20:53:08 +08:00
jljsj
200b856bba add radio 2015-07-16 18:23:25 +08:00
蔡伦
ff0262c50c Merge branch 'master' of github.com:ant-design/ant-design
# By afc163 (55) and others
# Via afc163 (21) and others
* 'master' of github.com:ant-design/ant-design: (96 commits)
  arrow size and rotate
  input focus style update
  update site style
  fix color variable
  sort params
  修复清空的问题
  prepare npm
  update table document
  fix sort table logic, only allow one column to be sorted at a time
  chore: change collapse color
  optimize deploy
  update table row-selection style
  update table demos
  fix markdown table in chrome
  fix table loading style
  feat: collapse style review and change
  fix table loading style
  fix table loading style
  update table document
  update filter dropdown function and style
  ...

Conflicts:
	index.js
	style/components/index.less
2015-07-15 15:28:07 +08:00
蔡伦
26c42c6cec add checkbox 2015-07-15 15:19:24 +08:00
afc163
6b9c988f12 Merge branch 'master' into components-table 2015-07-13 20:06:27 +08:00
偏右
00435273b5 Merge pull request #39 from ibigbug/master
添加分页组件
2015-07-13 19:48:36 +08:00
afc163
01483740b3 merge from master 2015-07-13 10:57:34 +08:00
simaQ
349061b711 add slider into antd 2015-07-13 07:59:38 +08:00
Yuwei Ba
27c6e03322 添加分页组件 2015-07-13 01:05:25 +08:00
afc163
5757d6cc78 operation links 2015-07-12 13:15:05 +08:00
afc163
ed9b534252 merge 2015-07-12 12:46:48 +08:00
翰文
41244d83de feat: add message component
Conflicts:
	index.js
	style/components/index.less
2015-07-11 16:40:59 +08:00
翰文
4c28bc1fe2 feat: add component collapse 2015-07-11 10:17:58 +08:00
afc163
f47b29817a import component rc-table 2015-07-09 14:51:48 +08:00
yiminghe
c85e10083d add switch 2015-07-08 19:47:45 +08:00
simaQ
7fb5995309 add form and input style 2015-07-07 11:32:08 +08:00
afc163
228a1042b6 merge 2015-07-01 20:47:40 +08:00
afc163
c103918518 Add simple breadcrumb 2015-07-01 20:44:19 +08:00
yiminghe
465c8c2cdf add input-number 2015-07-01 14:48:47 +08:00
羽航
e8ec073adc add steps 2015-06-25 16:01:04 +08:00
afc163
7eaf96413e Add popover component 2015-06-17 16:58:13 +08:00
yiminghe
97d8859ff8 update dialog style 2015-06-15 20:04:14 +08:00