Commit Graph

132 Commits

Author SHA1 Message Date
jljsj
200b856bba add radio 2015-07-16 18:23:25 +08:00
yiminghe
80886d6563 replace search 2015-07-15 19:32:03 +08:00
afc163
28d0037cf5 update rc-select to 4.3 2015-07-15 16:18:50 +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
偏右
c8eea9fddb Merge pull request #44 from ant-design/npm
prepare npm
2015-07-15 15:08:32 +08:00
yiminghe
b5e1ab5e47 prepare npm 2015-07-15 12:09:01 +08:00
afc163
4908cd2efa Merge branch 'master' of github.com:ant-design/ant-design 2015-07-15 11:43:23 +08:00
yiminghe
fced70bd69 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-15 11:26:55 +08:00
yiminghe
0ef8cd410f optimize deploy 2015-07-15 11:26:33 +08:00
afc163
35c5ac8efa update table row-selection style 2015-07-15 11:12:17 +08:00
翰文
6011f5caeb feat: collapse style review and change 2015-07-14 21:09:40 +08:00
afc163
2a41f0802b Merge master to components-table 2015-07-14 21:01:42 +08:00
yiminghe
b1a36dea1e upgrade rc-slider 2015-07-14 20:35:27 +08:00
afc163
c915a3989b merge master to components-table 2015-07-14 15:37:19 +08:00
羽航
2651589101 fix conflict 2015-07-14 13:45:47 +08:00
羽航
f2126bc343 update rc-steps to 1.1.4 2015-07-14 13:43:05 +08:00
simaQ
7375222ba4 update slider version 2015-07-14 12:06:04 +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
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
40bc7e3268 merge branch master 2015-07-10 10:48:59 +08:00
yiminghe
782095125b update switch 2015-07-09 21:05:33 +08:00
afc163
567280b0dc Merge branch 'master' into components-table 2015-07-09 20:14:02 +08:00
yiminghe
5991755496 update input-number 2015-07-09 20:06:03 +08:00
yiminghe
fc85fa836b use ie8 safe react-router 2015-07-09 17:47:21 +08:00
afc163
f47b29817a import component rc-table 2015-07-09 14:51:48 +08:00
afc163
82c110ac5d Add table demos 2015-07-09 11:41:36 +08:00
yiminghe
46b0685364 upgrade select 2015-07-08 22:07:15 +08:00
yiminghe
0a7410973e clean warning 2015-07-08 20:53:11 +08:00
yiminghe
d965b5faf4 upgrade tooltip 2015-07-08 19:48:17 +08:00
yiminghe
c85e10083d add switch 2015-07-08 19:47:45 +08:00
羽航
1de0aac428 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-08 16:36:33 +08:00
afc163
99f7579809 update tooltip delay 2015-07-08 16:29:57 +08:00
羽航
943fbd3d34 调整steps的样式 2015-07-08 15:53:51 +08:00
羽航
46c879dbbf Merge branch 'master' of https://github.com/ant-design/ant-design 2015-07-07 19:42:11 +08:00
羽航
33ed634f90 update rc-steps to 1.1.2 2015-07-07 19:41:31 +08:00
yiminghe
04d97f9ad7 add autoprefixer 2015-07-07 17:09:04 +08:00
afc163
fff4f39e5f remove react-router from antd 2015-07-06 20:18:19 +08:00
afc163
ecd6540ce3 fix css minify bug 2015-07-06 17:47:30 +08:00
afc163
7af7399d84 clean dependencies 2015-07-06 16:33:16 +08:00
afc163
e50b760671 update webpack and webpack-dev-middleware 2015-07-06 11:28:08 +08:00
afc163
53dcdebafb no optimize for now 2015-07-06 10:29:06 +08:00
afc163
0110b82ad9 update 2015-07-05 17:40:52 +08:00
afc163
325406776b download page 2015-07-04 16:20:50 +08:00