Commit Graph

7485 Commits

Author SHA1 Message Date
RaoHai
4500f2e9ee dependence of nunjucks 2016-05-27 12:05:38 +08:00
RaoHai
ff31a5b555 Revert "Revert "refactor with bisheng""
This reverts commit 7a07b128d1.
2016-05-27 11:48:08 +08:00
RaoHai
b7f1c4077b update version to 1.2.0
update changelog
2016-05-27 11:17:54 +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
afc163
014152f17f update Changelog 2016-05-27 11:07:26 +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
8566c25682 site: improve detail 2016-05-27 09:44:07 +08:00
Benjy Cui
2d0d70efcb deps: remove useless deps 2016-05-27 09:44:07 +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
38f9864732 site: extract bisheng-plugin-react 2016-05-27 09:44:07 +08:00
Benjy Cui
4afb1cc6dd site: update 2016-05-27 09:44:07 +08:00
Benjy Cui
0d0b6b0a32 site: update 2016-05-27 09:44:07 +08:00
Benjy Cui
6e59cae163 site: remove scrollTo 2016-05-27 09:44:07 +08:00
Benjy Cui
7017c9e5d1 site: update demo relative 2016-05-27 09:44:07 +08:00
Benjy Cui
1a9708febf site: update 2016-05-27 09:44:07 +08:00
Benjy Cui
6bd299000a site: refactor with bisheng-plugin-toc/description 2016-05-27 09:44:07 +08:00
Benjy Cui
a97e54e253 site: migrate practice pattern spec to bisheng 2016-05-27 09:44:07 +08:00
Benjy Cui
0ab1d56817 site: refactor resource with bisheng 2016-05-27 09:44:07 +08:00
Benjy Cui
e389e6b795 site: migrate MainContent to bisheng 2016-05-27 09:44:07 +08:00
Benjy Cui
a031271384 site: refactor home & 404 with bisheng 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
RaoHai
a940547aff Merge pull request #1835 from ddcat1115/fix-1777
fix #1777 add onChange for Affix
2016-05-26 16:17:33 +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
2ab6879b12 Merge branch 'ddcat1115-fix-1771' 2016-05-26 15:43:01 +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
yiminghe
8de1a5cf58 update deps 2016-05-26 15:38:50 +08:00
RaoHai
fbf7da7d83 Merge pull request #1853 from RaoHai/dependenciesUpToDate
make dependencies up to date
2016-05-26 15:35:58 +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
偏右
6799ee278f Merge branch 'master' of github.com:ant-design/ant-design 2016-05-26 13:28:41 +08:00
yiminghe
56f4f0688d clean deps 2016-05-26 12:52:07 +08:00
afc163
b2f6407560 update getting started doc 2016-05-26 12:16:14 +08:00
RaoHai
b8e196f178 Restore width props in affixStyle of <Affix /> (#1854)
+ close #1820
2016-05-26 11:07:02 +08:00
RaoHai
2f25084fa6 make dependencies up to date
+ close #1848
2016-05-26 10:27:04 +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