Commit Graph

7067 Commits

Author SHA1 Message Date
Benjy Cui
8f7c8fb9c0 site: improve performance 2016-04-19 17:06:15 +08:00
afc163
dbafd4ef63 Merge branch 'master' into develop-1.0.0
Conflicts:
	components/input/index.jsx
2016-04-19 17:02:08 +08:00
afc163
bad547c3bb Fix #1321 in 0.12.x
pick 28b36d5 manully
2016-04-19 16:58:39 +08:00
afc163
fa85bfb161 Merge branch master into develop-1.0.0 2016-04-19 16:16:04 +08:00
偏右
23b8c44d39 Merge branch 'master' of github.com:ant-design/ant-design 2016-04-19 16:04:27 +08:00
afc163
0a121bd175 fix doc 2016-04-19 16:03:45 +08:00
afc163
f36b648fab remove vendor prefixes dependency 2016-04-19 15:15:54 +08:00
afc163
8fd09ac1b2 control focus shadow should be transparent 2016-04-19 15:09:17 +08:00
afc163
cc4866bdec fix button clicked animation 2016-04-19 13:40:58 +08:00
afc163
37b33dc0a8 update home style 2016-04-18 18:56:25 +08:00
afc163
b77de58fa3 improve TimePicker style 2016-04-18 18:46:05 +08:00
afc163
07ea8ff323 Merge branch master into develop-1.0.0 2016-04-18 17:24:51 +08:00
afc163
d0b2bdad84 Fix DropdownButton onClick behavious, should respond left button only 2016-04-18 17:23:22 +08:00
afc163
63e110fbc6 fix #1442 2016-04-18 17:02:05 +08:00
afc163
4e292a89cf Merge branch 'develop-1.0.0' of github.com:ant-design/ant-design into develop-1.0.0 2016-04-18 16:59:42 +08:00
afc163
44cbba08ca Improve changelog page style 2016-04-18 16:59:04 +08:00
afc163
cec56b40bf fix Timeline className and style 2016-04-18 16:58:46 +08:00
Benjy Cui
3e05ca4877 site: fix search box 2016-04-18 15:21:02 +08:00
afc163
902b196687 change doc order 2016-04-18 15:19:37 +08:00
afc163
8116e775ff upgrade devDeps and fix some eslint problems 2016-04-18 14:58:38 +08:00
afc163
91e690282d update site markdown style 2016-04-18 13:43:33 +08:00
afc163
d759d2174f upgrade react-slick, close #1409 2016-04-18 11:10:09 +08:00
afc163
357ccc6fd8 bump beta version 2016-04-17 18:26:37 +08:00
afc163
f3a25de782 update shadow style system 2016-04-17 18:19:22 +08:00
afc163
adc89d4809 Merge branch master into develop-1.0.0 2016-04-17 18:00:46 +08:00
afc163
8a52195f39 Fix nested tabs style (#1437) 2016-04-17 17:56:06 +08:00
afc163
05299036b4 improve tabBarExtraContent render 2016-04-17 17:47:08 +08:00
afc163
0fb0b465f6 Fix extra afterClose callback of Tag
close #1435
2016-04-16 20:24:50 +08:00
afc163
72af92c47e Upgrade message icons 2016-04-16 17:38:30 +08:00
afc163
d2ffb0978f Merge branch master into develop-1.0.0 2016-04-16 17:10:10 +08:00
afc163
6a14de411d Fix uncontrolled table issue
close #1433 #1434
2016-04-16 17:07:39 +08:00
偏右
3ea39835b1 Merge branch 'master' of github.com:ant-design/ant-design 2016-04-16 00:00:26 +08:00
afc163
639093d8ee fix eslint warning 2016-04-15 23:58:52 +08:00
afc163
b1abf3bc28 change demo format 2016-04-15 23:56:44 +08:00
afc163
5f15195c14 Merge branch 'freestyle21-develop-1.0.0' into develop-1.0.0 2016-04-15 23:55:09 +08:00
afc163
8a422ba2cd update demo 2016-04-15 23:54:47 +08:00
afc163
e92c06f739 Merge branch 'develop-1.0.0' of https://github.com/freestyle21/ant-design into freestyle21-develop-1.0.0 2016-04-15 23:48:53 +08:00
afc163
728c3c2d6a Merge branch master into develop-1.0.0 2016-04-15 23:45:28 +08:00
afc163
278b5d83e1 update docs 2016-04-15 23:40:01 +08:00
afc163
8a9a1d2334 fix checkbox style 2016-04-15 23:34:40 +08:00
afc163
c6cba5a2a1 Make steps layout more flexible, close #1099 2016-04-15 23:04:06 +08:00
afc163
cc2f93a4e1 loading button should not be transparent 2016-04-15 16:21:08 +08:00
qubaoming
2d72bc58d2 adjust props position & range-picker add showTime options 2016-04-15 14:47:39 +08:00
qubaoming
bf1ee0b1c8 Merge remote-tracking branch 'upstream/develop-1.0.0' into develop-1.0.0 2016-04-15 14:22:12 +08:00
afc163
7fffcffdb2 Merge branch 'develop-1.0.0' of https://github.com/freestyle21/ant-design into freestyle21-develop-1.0.0 2016-04-15 12:06:54 +08:00
afc163
403bf41e82 Merge branch 'develop-1.0.0' of github.com:ant-design/ant-design into develop-1.0.0 2016-04-15 11:53:33 +08:00
afc163
c8df93466b Merge branch 'wizawu-develop-1.0.0' into develop-1.0.0 2016-04-15 11:53:11 +08:00
afc163
5100fed2bd Add warning console for spinning change 2016-04-15 11:52:15 +08:00
然则
6eefc065a1 correct api 2016-04-15 11:41:22 +08:00
afc163
28a3e706ee Merge branch 'develop-1.0.0' of https://github.com/wizawu/ant-design into wizawu-develop-1.0.0 2016-04-15 11:37:50 +08:00