Commit Graph

159 Commits

Author SHA1 Message Date
afc163
0661010a04 Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into develop-0.10.0 2015-11-03 16:07:54 +08:00
afc163
cef93e2148 babel index.js, fix beta10 bug 2015-11-03 16:03:09 +08:00
偏右
d184d87308 Merge pull request #466 from benjycui/feat-button
feat: make `Button` easy to use
2015-11-03 14:48:33 +08:00
Benjy Cui
5fd6999866 feat: make Button easy to use 2015-11-03 14:25:36 +08:00
afc163
caa87cb6f2 Merge master for 0.9.3 change 2015-11-03 11:09:52 +08:00
afc163
39f8613379 check the React version is available
Conflicts:
	package.json
2015-11-03 11:06:42 +08:00
afc163
34665d9d70 check the React version is available 2015-11-02 18:26:05 +08:00
SimaQ
8f72f6cdcf 将 formItem 布局样式相关的属性写法同 layout 组件属性结合。 2015-10-31 08:46:14 +08:00
SimaQ
27ec561059 feat: add form to antd. 2015-10-31 08:45:35 +08:00
KgTong
852377b6b3 ES6 syntax for spin demo code 2015-10-28 21:40:05 +08:00
afc163
753c01ae18 ES6 syntax for demo code
fix antd.notification
2015-10-28 20:55:49 +08:00
pizn
69aaa6c296 Add layout componet for antd 2015-10-27 23:52:17 +08:00
KgTong
103104b256 fix conflict 2015-10-27 11:06:15 +08:00
KgTong
5c1a11710d add spin component 2015-10-27 10:10:27 +08:00
yiminghe
c9bea3019b guard window 2015-10-26 20:03:37 +08:00
afc163
cd0703e462 remove enter-animation 2015-10-23 21:38:35 +08:00
afc163
4bed95ef6a Merge 2015-10-22 21:30:28 +08:00
SimaQ
59c36965ea fix: fix slider disabled style bug. 2015-10-20 19:39:43 +08:00
yiminghe
76b0f673ec beta2 2015-10-20 16:47:55 +08:00
afc163
ca595c68f5 deprecate EnterAnimation 2015-10-19 16:20:30 +08:00
jljsj
bf1d703274 queue-anim demo 2015-10-19 15:36:32 +08:00
afc163
bd8c903e08 remove antd.confirm, please use antd.Modal.confirm 2015-10-19 13:58:33 +08:00
Benjy Cui
2f771b0482 feat: button should be a component 2015-10-05 15:19:07 +08:00
elrrrrrrr
6465712385 feat: 抽离 Icon 组件、支持自定义属性
fixed #307
2015-09-26 01:26:30 +08:00
afc163
5c00b0e66b Fix publish problem 2015-09-08 18:17:15 +08:00
afc163
f785d7b891 antd.confirm() is deprecated, use antd.Modal.confirm() instead 2015-09-08 11:42:10 +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
yiminghe
faf7aea2d5 add tree animation 2015-08-24 18:28:00 +08:00
然则
d29a215e74 up tree and add velocity-animate 2015-08-24 18:12:07 +08:00
afc163
0d33a5fbb4 Add radio button in radio 2015-08-21 18:24:09 +08:00
yiminghe
6929f060a6 fix case 2015-08-19 14:09:13 +08:00
afc163
cfaf31b47c update demo title 2015-08-19 11:41:44 +08:00
afc163
4af25dffb2 code style 2015-08-17 15:17:04 +08:00
afc163
315e61a33d fix react-slick bug via adding matchMedia polyfill 2015-08-17 15:12:59 +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
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
sorrycc
eb4f468b49 add Affix 2015-08-03 17:12:50 +08:00
ioldfish
c18af7db79 包装rc-tree,样式待修改 2015-08-03 16:07:21 +08:00
zhujun24
0a79201536 merge conflict index.js 2015-08-03 15:22:04 +08:00
SimaQ
5f70cf024a feat: add form-validation 2015-08-03 13:39:58 +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
718751d063 merge 0.8.0 2015-07-29 21:07:02 +08:00
偏右
5bc99bbe26 Merge pull request #83 from zhujun24/alert
Alert
2015-07-29 15:38:08 +08:00
afc163
6344e9151b Add component tag 2015-07-28 17:08:06 +08:00
zhujun24
19a2604b71 notification half 2015-07-28 15:40:28 +08:00
afc163
699a6c9ad3 Add enter-animation 2015-07-28 12:32:27 +08:00
zhujun24
eea48ffe16 Alert component 2015-07-27 20:53:08 +08:00
yiminghe
9b7b940cb4 use umd build 2015-07-21 14:58:20 +08:00
jljsj
2af7486e4f Add radio group 2015-07-17 16:06:46 +08:00
afc163
47f1211b67 fix lowercase spell 2015-07-17 12:04:24 +08:00
jljsj
6c99ebb170 update radio 2015-07-16 18:26:17 +08:00
jljsj
200b856bba add radio 2015-07-16 18:23:25 +08:00
蔡伦
581d62b233 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:33 +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
yiminghe
b5e1ab5e47 prepare npm 2015-07-15 12:09:01 +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
82c110ac5d Add table demos 2015-07-09 11:41:36 +08:00
yiminghe
c85e10083d add switch 2015-07-08 19:47:45 +08:00
yiminghe
ad7f079251 move css-animation to demo 2015-07-07 15:39:21 +08:00
afc163
fff4f39e5f remove react-router from antd 2015-07-06 20:18:19 +08:00
afc163
86e5a523ac breadcrumb & router 2015-07-02 17:22:26 +08:00
yiminghe
68a6e5ecc0 Merge branch 'master' of github.com:ant-design/ant-design 2015-07-02 12:12:37 +08:00
yiminghe
abfe5df83f add lib 2015-07-02 12:12:13 +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
ba05e1e53c add swing 2015-07-01 17:25:16 +08:00
yiminghe
465c8c2cdf add input-number 2015-07-01 14:48:47 +08:00
羽航
1b4815608c fix conflict 2015-06-25 16:02:48 +08:00
羽航
e8ec073adc add steps 2015-06-25 16:01:04 +08:00
afc163
6bd257de34 Add popconfirm component 2015-06-24 19:20:47 +08:00
afc163
7eaf96413e Add popover component 2015-06-17 16:58:13 +08:00
yiminghe
1316b07cfd rename tab to tabs 2015-06-15 19:56:58 +08:00
afc163
120687c314 tabs -> tab 2015-06-15 16:20:06 +08:00
偏右
34e1c66418 Merge pull request #20 from ibigbug/tab-style
Tab style
2015-06-14 13:13:39 +08:00
Yuwei Ba
b870935c91 Tabs -> Tab 2015-06-12 20:03:38 +08:00
afc163
646c6853d6 move confirm into modal 2015-06-12 19:41:30 +08:00
yiminghe
90241a7efe fix prefixCls 2015-06-12 12:01:02 +08:00
yiminghe
3690b2888d pass lint 2015-06-11 16:35:36 +08:00
yiminghe
c634b4d14c add confirm 2015-06-10 22:02:13 +08:00
然则
34e0fa4b8d add select component 2015-06-09 21:16:59 +08:00
夏奈
67265d49e3 progress 2015-06-09 16:54:11 +08:00
afc163
1de932c085 move ant-style inside ant-desgin 2015-06-09 15:21:44 +08:00
afc163
d924d5f2d0 update components spell 2015-06-09 14:50:55 +08:00
afc163
e278f63d2b update dropdown 2015-06-09 14:46:51 +08:00
afc163
0b8c71663f tweak code 2015-06-08 20:25:05 +08:00
yiminghe
ac2899efbb add dropdown 2015-06-08 19:10:47 +08:00
afc163
80fcde6247 fix tabs 2015-06-08 16:43:53 +08:00