Commit Graph

4645 Commits

Author SHA1 Message Date
afc163
b3e1bd9e5a Merge pull request #1279 from waywardmonkeys/no-direct-import-component
Don't directly import Component, use React.Component.
2016-03-28 17:40:48 +08:00
afc163
9d0dfe07b3 Merge pull request #1284 from ant-design/feat-date-picker-args
Add dateString to DatePicker & TimePicker onChange
2016-03-28 17:40:19 +08:00
afc163
f5ef6e58dd Merge pull request #1287 from ant-design/feat-form-item
feat: support multi children for Form.Item
2016-03-28 17:40:14 +08:00
afc163
0677108ffb Merge branch 'master' into develop-1.0.0 2016-03-28 17:39:34 +08:00
Benjy Cui
10dd78122b feat: support multi children for Form.Item 2016-03-28 17:06:10 +08:00
afc163
436b6d8c3a fix progress style in some detail 2016-03-28 16:52:00 +08:00
afc163
80f11f5f70 Merge branch 'develop-1.0.0' of github.com:ant-design/ant-design into develop-1.0.0 2016-03-28 16:16:36 +08:00
afc163
fbda3c7b88 Merge master into develop-1.0.0 2016-03-28 16:15:36 +08:00
afc163
7cee16d153 Fix alert icons style 2016-03-28 16:09:13 +08:00
afc163
dafd25dd7c unifiy z-index 2016-03-28 16:01:37 +08:00
afc163
bc2bafff54 update table demo code style 2016-03-28 16:00:58 +08:00
Benjy Cui
f4193866b8 docs: update docs for form 2016-03-28 15:27:57 +08:00
Benjy Cui
8b58cdd137 docs: update docs for select 2016-03-28 15:13:18 +08:00
Benjy Cui
4f45fca1af site: filter should be case insensitive 2016-03-28 15:08:17 +08:00
Benjy Cui
ddb2a0eedb site: fix css 2016-03-28 14:14:47 +08:00
Benjy Cui
3f7cf472de site: fix url 2016-03-28 14:12:26 +08:00
afc163
127f893619 Add Table rowClassName into document 2016-03-28 13:44:50 +08:00
afc163
703cf31868 Add dateString to DatePicker & TimePicker onChange
close #1104
2016-03-28 12:18:30 +08:00
afc163
009c20530e slow down tabs effect speed 2016-03-28 11:29:20 +08:00
afc163
5308308df9 Merge pull request #1281 from yesmeck/update-upload
Update rc-upload to 1.9.0
2016-03-28 11:16:49 +08:00
Wei Zhu
4f541794e9 Update rc-upload to 1.9.0 2016-03-28 01:47:39 +08:00
afc163
5ecd21a732 Merge pull request #1267 from mrtone/patch-1
preventDefault for onClose.
2016-03-27 21:17:35 +08:00
ShiTengFei
896c940768 Fixed lint error. 2016-03-27 18:06:09 +08:00
Bruce Mitchener
50a2163518 Don't directly import Component, use React.Component.
This is another step towards making the code internally consistent.
2016-03-26 16:22:39 +07:00
afc163
cbfb910973 fix search-input style of large size 2016-03-25 19:59:05 +08:00
yiminghe
d03c644f1d Merge pull request #1272 from waywardmonkeys/use-babel-eslint
Use babel as the eslint parser.
2016-03-25 18:54:19 +08:00
yiminghe
771bbaa044 Merge pull request #1275 from ant-design/deps-object-assign
deps: remove object-assign
2016-03-25 18:30:53 +08:00
yiminghe
101bacc5b8 fix form 2016-03-25 18:29:18 +08:00
Benjy Cui
5e4786440d deps: remove object-assign 2016-03-25 18:16:48 +08:00
afc163
72db02ef04 Add icon prop for Button, close #1199 2016-03-25 18:13:51 +08:00
afc163
ff7940f86c upgrade api table style 2016-03-25 17:43:24 +08:00
afc163
8eacba09df Merge branch 'develop-1.0.0' of github.com:ant-design/ant-design into develop-1.0.0 2016-03-25 17:41:33 +08:00
Bruce Mitchener
4c0bf478d0 Use babel as the eslint parser.
This allows eslint to validate all of the code that babel is
configured to accept. Without this, eslint won't validate code
that is part of ES7.

We use the beta for 6.0 to avoid https://github.com/babel/babel-eslint/issues/249
2016-03-25 16:36:59 +07:00
Benjy Cui
6199cf158f site: enable GA 2016-03-25 17:35:26 +08:00
Benjy Cui
41460d615a site: add demo preview animation 2016-03-25 17:07:00 +08:00
afc163
acb6efa2d4 Merge branch 'develop-1.0.0' of github.com:ant-design/ant-design into develop-1.0.0 2016-03-25 16:32:51 +08:00
afc163
d179d05a8b Merge pull request #1265 from ant-design/feat-scroll-table
Feature scroll table
2016-03-25 16:32:36 +08:00
afc163
e0585711c1 Merge branch 'develop-1.0.0' of github.com:ant-design/ant-design into develop-1.0.0 2016-03-25 16:22:31 +08:00
afc163
d8bd20baf3 code style 2016-03-25 16:13:26 +08:00
afc163
e2b3b8dd19 fix table border-radius 2016-03-25 16:12:29 +08:00
afc163
138e40b54e fix detail style 2016-03-25 16:12:29 +08:00
afc163
61f9ba1fd7 Fix table footer style 2016-03-25 16:12:29 +08:00
afc163
4760d0b54c Add scroll and column.fixed document 2016-03-25 16:12:29 +08:00
afc163
0243afb7c5 fix scroll bar style 2016-03-25 16:12:29 +08:00
afc163
15f576020b Add fixed columns demos 2016-03-25 16:12:29 +08:00
afc163
df1252cba1 Merge branch 'master' into develop-1.0.0 2016-03-25 16:01:12 +08:00
afc163
8d3537d186 fix chrome table border-radius, close #1271 2016-03-25 16:00:32 +08:00
afc163
c4df6b940c update docs 2016-03-25 15:42:08 +08:00
afc163
b0827e2d8f Add TimePicker locale change doc, close #1270 2016-03-25 15:41:05 +08:00
afc163
52ca8c1279 fix req.path error in webpack/webpack-dev-middleware#79 2016-03-25 15:13:39 +08:00