Commit Graph

2545 Commits

Author SHA1 Message Date
afc163
c40655d3a6 update tooltip doc for #1871 2016-05-27 14:11:35 +08:00
afc163
dff87da25a Merge branch 'master' of github.com:ant-design/ant-design 2016-05-27 13:38:50 +08:00
afc163
5a87d219d7 use remote api for demo 2016-05-27 13:35:49 +08:00
RaoHai
ff31a5b555 Revert "Revert "refactor with bisheng""
This reverts commit 7a07b128d1.
2016-05-27 11:48:08 +08:00
RaoHai
7bed6d89b5 Merge pull request #1869 from ant-design/revert-1745-refactor-bisheng
Revert "refactor with bisheng"
2016-05-27 11:08:22 +08:00
RaoHai
7a07b128d1 Revert "refactor with bisheng" 2016-05-27 11:03:49 +08:00
afc163
dfc92fbf4f Merge branch 'master' of github.com:ant-design/ant-design 2016-05-27 11:00:53 +08:00
RaoHai
c4054d0019 Merge pull request #1745 from ant-design/refactor-bisheng
refactor with bisheng
2016-05-27 10:57:19 +08:00
Benjy Cui
a6e38f8479 site: support iframe 2016-05-27 09:44:07 +08:00
Benjy Cui
95222a51fa site: migrate changelog.md 2016-05-27 09:44:07 +08:00
Benjy Cui
0d0b6b0a32 site: update 2016-05-27 09:44:07 +08:00
afc163
73eeec6236 update dropdown doc 2016-05-26 21:45:38 +08:00
RaoHai
ddd2b33d56 Merge branch 'master' of https://github.com/ant-design/ant-design 2016-05-26 21:37:45 +08:00
afc163
aa3ffbe025 put normalize.css inside 2016-05-26 20:58:11 +08:00
yiminghe
c02dfb48fc use js import 2016-05-26 20:45:27 +08:00
RaoHai
7a5c6d51af Update 1.1.1 Changelog 2016-05-26 19:05:38 +08:00
RaoHai
4938c25782 Merge pull request #1858 from ant-design/fix-filter-without-pagination
[Table] fix: throws error when filtering data with `pagination` set to `false…
2016-05-26 18:00:27 +08:00
afc163
b3ab13e551 Merge branch 'master' of github.com:ant-design/ant-design 2016-05-26 16:19:58 +08:00
afc163
ea5e74b348 Fix tag closable with link, close #1862 2016-05-26 16:19:26 +08:00
ddcat1115
37e376df11 fix #1777 2016-05-26 16:07:30 +08:00
afc163
447d167222 Merge branch 'master' of github.com:ant-design/ant-design 2016-05-26 16:01:53 +08:00
afc163
f920e4a9d0 Fix clear icon of Select, close #1861 2016-05-26 16:00:55 +08:00
RaoHai
3c98d3f80f Merge branch 'fix-1771' of https://github.com/ddcat1115/ant-design into ddcat1115-fix-1771 2016-05-26 15:42:48 +08:00
RaoHai
972b528ee1 Merge pull request #1821 from ddcat1115/fix-1750
fix #1750
2016-05-26 15:33:09 +08:00
RaoHai
780377a5d6 Merge pull request #1806 from forthedamn/translation-calendar
Translation calendar
2016-05-26 15:27:44 +08:00
Leon Shi
dbdd5c5da0 fix: throws error when filtering data with pagination set to false, close #1842 2016-05-26 15:01:50 +08:00
yiminghe
56f4f0688d clean deps 2016-05-26 12:52:07 +08:00
RaoHai
b8e196f178 Restore width props in affixStyle of <Affix /> (#1854)
+ close #1820
2016-05-26 11:07:02 +08:00
ddcat1115
c4454dea04 fix #1771 2016-05-25 18:34:36 +08:00
RaoHai
38433f606b Merge pull request #1839 from RaoHai/FixedrowSelection
fix rowSelection display while some columns fixed left
2016-05-25 17:43:26 +08:00
RaoHai
5b021a5e23 Merge pull request #1828 from ant-design/fix-tree-select
up tree-select doc
2016-05-25 17:43:11 +08:00
afc163
6f11e1fda0 update upload demo doc 2016-05-25 17:32:59 +08:00
afc163
ee1ed40a77 use inline import (ant-design/antd-init#52) 2016-05-25 15:09:16 +08:00
RaoHai
25d996d666 fix rowSelection display while some columns fixed left
+ close #1829
2016-05-25 11:37:16 +08:00
Benjy Cui
f22e682217 docs: update translation 2016-05-25 09:43:26 +08:00
guoxin.zgx
3206196a7b fix(component):fix translation for calendar component 2016-05-24 21:04:18 +08:00
afc163
15bb865037 Fix form detail style 2016-05-24 20:08:13 +08:00
afc163
6c3d00368c improve upload code style 2016-05-24 17:57:31 +08:00
ddcat1115
bed556e900 fix #1750 2016-05-24 14:35:21 +08:00
RaoHai
ae7476a3f9 Merge pull request #1822 from RaoHai/checkboxZeroChildren
Checkbox will show its label while label equals number 0.
2016-05-24 13:55:38 +08:00
然则
edc9014d13 up tree-select doc 2016-05-24 12:17:32 +08:00
afc163
dd33cb8f60 Move InputGroup style from Form into Input, close #1812 2016-05-23 20:09:25 +08:00
afc163
41a8c17b2b remove search-input from Form 2016-05-23 19:53:07 +08:00
afc163
3ee8c0b604 remove table layout fixed (#1819) 2016-05-23 18:59:27 +08:00
RaoHai
d6c0aa2e1c Checkbox show its label while label equals number 0.
close #1811
2016-05-23 17:37:31 +08:00
afc163
7c2ac50ca7 Add new icons, close #1170
`pushpin` `pushpin-o` `enter` `file-pdf` `file-ppt` `file-excel`
`file-jpg`
2016-05-23 16:41:33 +08:00
afc163
b06cdd08c3 Fix row-flex-space-around, close #1781 2016-05-22 01:52:26 +08:00
afc163
5960ecab7a fix code style 2016-05-21 21:45:07 +08:00
afc163
2464d2acfc Merge branch 'master' of https://github.com/ecofe/ant-design into ecofe-master 2016-05-21 21:44:01 +08:00
afc163
43cf39d9a0 put icon into emptyText, close #1759 2016-05-21 18:53:49 +08:00