ioldfish
|
49c019f86d
|
Merge branch 'develop-0.10.0' of https://github.com/ant-design/ant-design into develop-0.10.0
Conflicts:
package.json
|
2015-10-27 16:28:00 +08:00 |
|
afc163
|
602c2d1f9d
|
support border radius in ie8 via css3pie
|
2015-10-27 16:26:56 +08:00 |
|
ioldfish
|
8f887d3879
|
update ant-tree dynamic
|
2015-10-27 15:47:01 +08:00 |
|
KgTong
|
0f4b4ae39f
|
fix table loading when removing type attrite of spin
|
2015-10-27 15:15:24 +08:00 |
|
KgTong
|
322d250aa0
|
Merge remote-tracking branch 'ant/develop-0.10.0' into feature-spin
|
2015-10-27 14:59:55 +08:00 |
|
KgTong
|
686a21df78
|
remove type attribute of spin
|
2015-10-27 14:58:04 +08:00 |
|
afc163
|
9266bbeaed
|
Merge master
|
2015-10-27 14:36:31 +08:00 |
|
Benjy Cui
|
e788bf8495
|
deps: upgrade React Components
|
2015-10-27 14:33:38 +08:00 |
|
afc163
|
e66fce6de9
|
Merge branch 'master' into develop-0.10.0
|
2015-10-27 14:31:51 +08:00 |
|
afc163
|
2b3c6d6cfb
|
update install antd-bin version
|
2015-10-27 14:27:02 +08:00 |
|
afc163
|
11fe24087a
|
update document
|
2015-10-27 14:26:21 +08:00 |
|
KgTong
|
ea0e9b7d6a
|
fix for code review
|
2015-10-27 14:01:55 +08:00 |
|
KgTong
|
103104b256
|
fix conflict
|
2015-10-27 11:06:15 +08:00 |
|
KgTong
|
b9ce4c7ddf
|
replace the table loading with spin
|
2015-10-27 10:34:05 +08:00 |
|
KgTong
|
5c1a11710d
|
add spin component
|
2015-10-27 10:10:27 +08:00 |
|
afc163
|
2071300339
|
update color tool style
|
2015-10-26 20:34:42 +08:00 |
|
偏右
|
0d638c8be5
|
Merge pull request #432 from ant-design/fix-progressbar-warn
fix progressbar worning
|
2015-10-26 20:18:48 +08:00 |
|
xiaoshuai
|
25a3a3c7b9
|
fix progressbar worning
|
2015-10-26 20:14:41 +08:00 |
|
yiminghe
|
b0a9560101
|
Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into develop-0.10.0
|
2015-10-26 20:06:51 +08:00 |
|
yiminghe
|
c9bea3019b
|
guard window
|
2015-10-26 20:03:37 +08:00 |
|
afc163
|
4f624e1806
|
Improve chinese font in OSX
|
2015-10-26 17:47:27 +08:00 |
|
afc163
|
157faaf458
|
Merge master for 0.9.2 upgrade
|
2015-10-26 17:38:27 +08:00 |
|
afc163
|
ac31536e75
|
update versionsHistory
|
2015-10-26 17:34:23 +08:00 |
|
afc163
|
1ccd553e17
|
bump 0.9.2
|
2015-10-26 17:29:22 +08:00 |
|
afc163
|
4daa815fe4
|
update document for 0.9.x
|
2015-10-26 17:12:40 +08:00 |
|
afc163
|
37d18de441
|
Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into develop-0.10.0
|
2015-10-26 16:37:13 +08:00 |
|
afc163
|
c0c4113740
|
Merge branch 'master' into develop-0.10.0
|
2015-10-26 16:36:57 +08:00 |
|
afc163
|
9b5311791e
|
just hide toottip overlay when there is no title
avoid rerender children when title is changed
|
2015-10-26 16:36:36 +08:00 |
|
afc163
|
62115e9034
|
just hide toottip overlay when there is no title
avoid rerender children when title is changed
|
2015-10-26 16:30:27 +08:00 |
|
yiminghe
|
8729808625
|
upgrade dropdown
|
2015-10-26 14:26:51 +08:00 |
|
afc163
|
4edb61876e
|
Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into develop-0.10.0
|
2015-10-26 11:09:12 +08:00 |
|
afc163
|
5a50df6b78
|
use ghost button to match primary button
|
2015-10-26 11:08:36 +08:00 |
|
yiminghe
|
e2b21bbf1f
|
upgrade
|
2015-10-26 11:07:19 +08:00 |
|
afc163
|
cad3fdff45
|
lg => large, sm => small
|
2015-10-26 11:02:48 +08:00 |
|
yiminghe
|
17b1ec14f8
|
add tabs add demo
|
2015-10-26 10:56:09 +08:00 |
|
afc163
|
5b448af596
|
Merge branch 'master' into develop-0.10.0
|
2015-10-25 14:56:46 +08:00 |
|
afc163
|
11b47aa79b
|
no show toolitp when there is no title
|
2015-10-25 14:55:45 +08:00 |
|
afc163
|
7ae46cd406
|
no show toolitp when there is no title
|
2015-10-25 14:55:31 +08:00 |
|
Pyiner
|
776238eda9
|
fix _target to target
|
2015-10-24 15:14:53 +08:00 |
|
afc163
|
fbe8454cd1
|
Merge branch 'master' of github.com:ant-design/ant-design
|
2015-10-24 15:14:23 +08:00 |
|
afc163
|
1e79f487c8
|
Read locale from deps
|
2015-10-23 23:50:26 +08:00 |
|
afc163
|
38a080ffee
|
Merge branch 'develop-0.10.0' of github.com:ant-design/ant-design into develop-0.10.0
|
2015-10-23 23:40:24 +08:00 |
|
afc163
|
9156b2647c
|
use a big button radius
|
2015-10-23 23:38:41 +08:00 |
|
yiminghe
|
2f8162da02
|
upgrade
|
2015-10-23 23:25:29 +08:00 |
|
jiang
|
1931db6307
|
update route md key
|
2015-10-23 23:15:03 +08:00 |
|
偏右
|
7177a26f61
|
Merge pull request #423 from ant-design/queue-anim
Queue anim
|
2015-10-23 22:42:54 +08:00 |
|
afc163
|
de49cb6e1b
|
Merge branch 'develop-0.10.0' into queue-anim
|
2015-10-23 22:37:49 +08:00 |
|
afc163
|
c4b0918872
|
update queue-anim demos
|
2015-10-23 22:37:42 +08:00 |
|
afc163
|
cd0703e462
|
remove enter-animation
|
2015-10-23 21:38:35 +08:00 |
|
afc163
|
5d7fea6c68
|
Add locale prop link
|
2015-10-23 18:17:57 +08:00 |
|