Commit Graph

331 Commits

Author SHA1 Message Date
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
afc163
6d15f9a77c update description 2015-07-03 18:08:31 +08:00
afc163
adc05ad22e prepublish 2015-07-03 12:06:48 +08:00
afc163
bcdd113487 update script 2015-07-03 11:22:09 +08:00
afc163
86e5a523ac breadcrumb & router 2015-07-02 17:22:26 +08:00
yiminghe
a270bb896d clean lib 2015-07-02 12:14:44 +08:00
yiminghe
abfe5df83f add lib 2015-07-02 12:12:13 +08:00
yiminghe
ba05e1e53c add swing 2015-07-01 17:25:16 +08:00
yiminghe
b98a302b9f add animation for picker 2015-07-01 15:54:39 +08:00
yiminghe
465c8c2cdf add input-number 2015-07-01 14:48:47 +08:00
yiminghe
63dca06483 upgrade 2015-06-30 20:23:44 +08:00
羽航
4cbc692382 fix conflict 2015-06-26 16:18:54 +08:00
羽航
bdd2d26596 update package.json 2015-06-26 16:13:11 +08:00
yiminghe
e76e720dec update modal style 2015-06-26 15:29:44 +08:00
羽航
1bad0062f9 support ant-design prefix class and prefixCls property 2015-06-26 10:43:01 +08:00
羽航
49c5585590 update package.json 2015-06-25 19:32:06 +08:00
羽航
1b4815608c fix conflict 2015-06-25 16:02:48 +08:00
羽航
e8ec073adc add steps 2015-06-25 16:01:04 +08:00
yiminghe
abcdaddcaa support promise for modal 2015-06-25 15:29:56 +08:00
afc163
cdba3e24e8 update select 2015-06-24 10:49:19 +08:00
afc163
eeec79eac6 remove gh-pages dependency 2015-06-19 18:23:16 +08:00
afc163
af86103b13 change deploy tool 2015-06-19 18:19:30 +08:00
afc163
8ab58d6fce update rc-select and demos 2015-06-18 11:57:31 +08:00
afc163
4f0eb44fb3 allow not to set key on menuitem, react-component/menu#9 2015-06-17 20:05:27 +08:00
偏右
867f5b45c8 Update package.json 2015-06-17 17:59:23 +08:00
afc163
8048eb7b54 improve debug speed and reliability, using webpack-dev-middleware 2015-06-16 16:31:37 +08:00
afc163
48700296b8 update select demos 2015-06-16 14:54:31 +08:00
yiminghe
73d89f46af update motion 2015-06-15 21:18:08 +08:00
yiminghe
8487d5ad6d update dropdown style 2015-06-15 20:36:49 +08:00
afc163
6340b875b5 update watch config 2015-06-15 15:52:31 +08:00
yiminghe
580481221f adjust onCancel 2015-06-12 23:46:04 +08:00
afc163
294e12693d Merge branch 'master' of github.com:ant-design/ant-design 2015-06-12 10:44:31 +08:00
然则
58938d38e7 up select component 2015-06-11 19:23:35 +08:00
afc163
7f3180d0ef Merge branch 'master' of github.com:ant-design/ant-design 2015-06-11 19:14:48 +08:00
afc163
a73aff66f8 update datepicker style 2015-06-11 18:08:00 +08:00
yiminghe
3690b2888d pass lint 2015-06-11 16:35:36 +08:00
afc163
e59e8569f4 update webpack.config 2015-06-11 11:38:53 +08:00
yiminghe
c634b4d14c add confirm 2015-06-10 22:02:13 +08:00
yiminghe
1d7c3af0f9 update tab 2015-06-10 19:50:02 +08:00
afc163
55041219f2 Add eslint, close #14 2015-06-10 17:59:32 +08:00
yiminghe
695c3b8ff6 upgrade rc-dialog 2015-06-09 22:24:19 +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
08c299e8b2 Add travis 2015-06-08 20:12:49 +08:00
yiminghe
9db6862ee5 update deps 2015-06-08 19:23:34 +08:00
yiminghe
ac2899efbb add dropdown 2015-06-08 19:10:47 +08:00
afc163
01ba29bbc6 Add rc-tabs 2015-06-08 13:13:02 +08:00
afc163
dded66bb9b update version 2015-06-08 12:44:00 +08:00
afc163
4a978ebf05 change rc-style to ant-style 2015-06-08 12:08:52 +08:00
afc163
b2fe8c42e1 seperate css file 2015-06-05 17:27:05 +08:00
afc163
a35e609d80 update footer 2015-06-05 15:02:39 +08:00
afc163
6c08eaf27e change slogan 2015-06-05 11:46:53 +08:00
yiminghe
6b0dd1dffe add modal 2015-06-04 21:17:52 +08:00
afc163
b12d53af60 site title 2015-06-04 14:42:24 +08:00
afc163
86aa0eee3a update deploy scripts 2015-06-04 13:49:55 +08:00
afc163
e747d802af update rc-calender to 3.80 2015-06-03 18:19:12 +08:00
afc163
de8a544a31 Add Tooltip 2015-06-03 17:08:51 +08:00
afc163
2058a9378f jsx-loader -> babel-loader, fix #5 2015-06-02 18:14:24 +08:00
afc163
08dc95eadc update rc-style repo url 2015-06-02 17:06:50 +08:00
afc163
73798c16ab change name 2015-06-02 15:41:43 +08:00
afc163
a2570196e6 less-loader 2015-05-28 11:33:48 +08:00
afc163
88bcc34f5f watch mode arguments 2015-05-27 14:26:05 +08:00
afc163
1e68880e17 update github url 2015-05-27 14:08:15 +08:00
afc163
e8519ccc3d update github url 2015-05-27 12:28:27 +08:00
afc163
5d1af50583 update rc-calendar version 2015-05-27 11:42:56 +08:00
afc163
60505f1498 code box style update 2015-05-27 11:35:01 +08:00
afc163
306d106a08 import rc-style 2015-05-26 17:35:24 +08:00
afc163
17a14faad2 update 2015-05-26 16:19:07 +08:00
afc163
9738455245 update watch mode 2015-05-26 10:18:39 +08:00
afc163
9c3dc4ba3c update webpack dev config 2015-05-25 21:04:53 +08:00
afc163
31ef99c81d debug mode 2015-05-25 17:20:49 +08:00
afc163
4c121603ec Add datepicker style 2015-05-21 20:36:13 +08:00
afc163
456f796f86 use nico-jsx, allow code type jsx 2015-05-18 18:13:16 +08:00
afc163
2d1187c9ac update code template 2015-05-18 17:33:42 +08:00
afc163
5f13503558 aside with category 2015-05-11 18:09:13 +08:00
afc163
06a97ff5cb update 2015-05-09 17:36:15 +08:00
afc163
a9ac2ecdc8 update README 2015-05-08 11:56:39 +08:00
afc163
97f8d04623 update theme 2015-05-07 21:01:15 +08:00
afc163
08900df2fb rm src 2015-05-07 20:54:19 +08:00
afc163
8b32a331d9 add deploy command 2015-05-07 20:09:50 +08:00
afc163
0693ae7b86 update 2015-05-07 19:54:54 +08:00
afc163
c5e67da18f first commit 2015-05-07 18:50:36 +08:00