Commit Graph

27315 Commits

Author SHA1 Message Date
afc163
a63e2f8c0c Remove console.log 2015-09-07 21:48:30 +08:00
jljsj
dec9bc74e5 Merge branch 'master' of github.com:ant-design/ant-design into enterAnimation0.4.0 2015-09-07 18:38:05 +08:00
jljsj
59b1f1c4fa update enter-animation 2015-09-07 18:37:07 +08:00
偏右
4e5c15bab7 Merge pull request #246 from zhujun24/master
continue api position
2015-09-07 15:52:48 +08:00
zhujun24
29638d3d3b rename pending api 2015-09-07 15:26:42 +08:00
afc163
1a3614c72c Fix radio button style 2015-09-07 15:14:57 +08:00
zhujun24
f3bbf778f8 continue api position 2015-09-07 15:13:59 +08:00
afc163
68e44f3080 update demo text 2015-09-07 12:32:31 +08:00
afc163
4eb21ea5bc 0.9.0-beta3 2015-09-07 12:29:23 +08:00
afc163
e786f54c15 update CHANGELOG 2015-09-07 12:28:25 +08:00
afc163
1e5271491e Add loading message 2015-09-07 12:27:09 +08:00
afc163
24b1ad0ca9 fix CHANGELOG link 2015-09-07 11:57:11 +08:00
偏右
478d1e8668 Merge pull request #245 from zhujun24/master
equal height line
2015-09-07 11:51:20 +08:00
afc163
4296d9cf9b update Modal 2015-09-07 11:50:46 +08:00
afc163
75d710a1b8 Add some info type Modal, close #244 2015-09-07 11:48:57 +08:00
zhujun24
2510a68dca equal height line 2015-09-07 11:31:37 +08:00
afc163
579ad01fc5 rollback for reqwest 2015-09-07 11:24:28 +08:00
afc163
5a47594a86 update timeline text 2015-09-07 10:43:48 +08:00
afc163
b25b48b6e5 fix reqwest 2015-09-07 10:20:20 +08:00
afc163
eaad577e79 Fix xhr2 bug, ded/reqwest#207 2015-09-07 10:13:42 +08:00
偏右
f2ef4de9e0 Merge pull request #238 from zhujun24/master
optimize
2015-09-07 10:10:25 +08:00
zhujun24
7d95c56fcf search keyword sort 2015-09-02 20:50:18 +08:00
zhujun24
4a61592ff6 optimize 2015-09-02 12:12:11 +08:00
afc163
a2c8fbe5b2 Fix aside link 2015-09-01 22:37:18 +08:00
afc163
9355052359 update timeline style 2015-09-01 22:20:27 +08:00
afc163
108a469c79 0.9.0-beta2 2015-09-01 22:16:34 +08:00
afc163
ca980bf149 update README.md 2015-09-01 22:15:43 +08:00
afc163
72c4120480 update CHANGELOG, display it in ant.design 2015-09-01 22:13:50 +08:00
afc163
124c33ac0a update CHANGELOG 2015-09-01 21:57:27 +08:00
afc163
409c9d57fd update timeline style 2015-09-01 21:56:26 +08:00
偏右
53a1da5182 Merge pull request #235 from zhujun24/component-timeline
timeline
2015-09-01 21:47:49 +08:00
zhujun24
082104a2ae optimize code 2015-09-01 21:39:29 +08:00
zhujun24
3e3ff021b6 Merge remote-tracking branch 'upstream/master' into component-timeline 2015-09-01 21:15:40 +08:00
zhujun24
018a62886d add timeline 2015-09-01 21:15:31 +08:00
afc163
5516f7866c Fix radio button style 2015-09-01 18:23:46 +08:00
afc163
8ba3dedeec update badge index.md 2015-09-01 17:48:22 +08:00
afc163
c6f75d6be4 Fix whitespace 2015-09-01 17:43:42 +08:00
afc163
058199ed2c update steps 2015-09-01 17:43:08 +08:00
afc163
20ae732f14 update badge style 2015-09-01 17:26:06 +08:00
afc163
034b561948 Fix PropTypes 2015-09-01 17:19:31 +08:00
afc163
3165da4246 update badge 2015-09-01 17:16:51 +08:00
偏右
d60ffeeafe Merge pull request #233 from zhujun24/vertical-steps
restore vertical steps
2015-09-01 16:23:07 +08:00
afc163
691b0147b1 update eslintrc and fix code 2015-09-01 16:19:39 +08:00
zhujun24
f34ed22d1a Merge remote-tracking branch 'upstream/component-timeline' into component-timeline 2015-09-01 15:41:53 +08:00
zhujun24
6f0ba9142e restore vertical steps 2015-09-01 15:30:51 +08:00
afc163
23243844ba update devDeps
fix #231
2015-09-01 15:13:39 +08:00
偏右
96921d1303 Merge pull request #230 from ant-design/upgrade-react-slick
upgrade react-slick to 0.7
2015-09-01 14:46:52 +08:00
sorrycc
8cbd9ae6f9 upgrade react-slick to 0.7 2015-09-01 14:30:24 +08:00
afc163
6ecbed5b53 update CHANGELOG 2015-09-01 14:09:08 +08:00
偏右
598bfc9aad Merge pull request #229 from ant-design/component-badge
Add component badge
2015-09-01 14:07:51 +08:00