Commit Graph

2417 Commits

Author SHA1 Message Date
afc163
c68f95c211 Merge branch master into develop-1.0.0 2016-04-29 17:26:21 +08:00
afc163
c66a226004 Fix lesshint problems 2016-04-29 17:03:28 +08:00
afc163
e9f083015e fix form demo (#1550) 2016-04-29 15:19:46 +08:00
afc163
93faa0d7b8 update (#1543) 2016-04-29 15:00:41 +08:00
afc163
f1646b29dc Add divider 2016-04-29 12:28:24 +08:00
Leon Shi
2228e201cc fix typo (#1548) 2016-04-29 12:15:16 +08:00
afc163
03cb74ead5 upgrade eslint-config-airbnb version and fix some problems 2016-04-29 12:13:27 +08:00
afc163
e071fc4aa9 Fix disabled button event bubble
close #1541

ref http://stackoverflow.com/a/17877723
2016-04-29 00:43:03 +08:00
afc163
96fd67ded0 remove old compatibility code 2016-04-28 17:18:36 +08:00
Benjy Cui
73715d810b css: add focused style for Select 2016-04-28 16:28:08 +08:00
afc163
205e76aa73 Add entry less file and update document (#1534)
* Add entry less file and update document

* fix pre-publish script
2016-04-28 15:54:18 +08:00
afc163
8939458069 fix demo format 2016-04-28 10:59:52 +08:00
zack
8287bac62e Dropdown中增加菜单隐藏方式示例和文档 2016-04-28 00:13:51 +08:00
yiminghe
1021d62ef6 fix checkbox 2016-04-27 21:47:47 +08:00
afc163
0ca6a1c24a css modularize (#1448)
* css modularize

* Add alert style

* Move more component style

* Move iconfont to common style

* Move layout style

* Move more component style

* Move all components

* Fix lots of mixin deps

* remove css-prefix from less

* fix a button icon style bug

* restructure

* fix index

* add dist

* fix jest

* fix some components style

* clean webpack config

* check more components style

* update tabs

* update scripts

* update scripts

* fix form style

* fix more style

* Fix select width

* Fix form and tabs style
2016-04-27 20:44:36 +08:00
afc163
cfcbc75190 Fix select demo 2016-04-27 18:07:48 +08:00
Leon Shi
6acb9ce400 upgrade rc-select to 6.2.3 (#1527) 2016-04-27 17:57:35 +08:00
afc163
ba2ef54900 Merge branch master into develop-1.0.0 2016-04-27 17:44:25 +08:00
afc163
affda966e5 fix #1528 2016-04-27 17:15:05 +08:00
afc163
0858413691 fix FormItem help and extra render 2016-04-27 17:02:50 +08:00
afc163
1d72c8abcc update menu doc 2016-04-27 17:01:55 +08:00
afc163
85ec9a8743 Fix Menu switch mode behavious
切换菜单模式时,子菜单有异常的表现
2016-04-27 15:29:27 +08:00
Benjy Cui
cd5a944e79 fix: add missing locale, relative: #1509 2016-04-27 11:45:21 +08:00
afc163
11499d54d5 Merge branch master into develop-1.0.0 2016-04-27 11:25:32 +08:00
afc163
16a702f5a0 Merge branch 'master' into develop-1.0.0 2016-04-27 11:25:16 +08:00
afc163
48f74fd5bd fix missing Option (#1521) 2016-04-27 11:23:18 +08:00
Marshall Chen
972cfa7a8b Missing Option const (#1522)
cause Option is not defined error
2016-04-27 11:20:58 +08:00
Benjy Cui
22e35544b6 fix: should not cache formatter, close #1509 2016-04-27 11:15:20 +08:00
Leon Shi
baac12d1c4 fix lint (#1513)
* fix lint `prefer-stateless-function`

* fix lint `arrow-body-style`
2016-04-26 14:09:19 +08:00
afc163
293812098a Merge branch master into develop-1.0.0 2016-04-25 19:34:01 +08:00
afc163
0805d4365d update locale demo 2016-04-25 19:27:02 +08:00
afc163
14f857b7ac prevent propagation of Table rowSelection controls, close #1470, close #1507 2016-04-25 17:55:45 +08:00
afc163
c5831310ac Merge branch 'master' into develop-1.0.0 2016-04-25 16:31:46 +08:00
afc163
3789fda6ee fix lint 2016-04-25 16:31:32 +08:00
afc163
7426233425 remove unused code 2016-04-25 16:27:47 +08:00
afc163
5f75a63e8e Merge branch 'master' into develop-1.0.0 2016-04-25 16:26:59 +08:00
afc163
287c45292d fix color of form help text 2016-04-25 16:25:57 +08:00
afc163
f9153e7b88 Merge branch master into develop-1.0.0 2016-04-25 13:51:18 +08:00
afc163
d7ee4bffa1 Fix initial selectedRowKeys, close #1501 2016-04-25 13:47:08 +08:00
yiminghe
eb7708c8db v15. Fixes #1252 2016-04-23 01:03:15 +08:00
Benjy Cui
e767edcb73 css: clear should be hidden if Select is disabled #1480 2016-04-22 15:41:52 +08:00
afc163
f87ec5248e Merge branch 'develop-1.0.0' of github.com:ant-design/ant-design into develop-1.0.0 2016-04-21 15:16:42 +08:00
afc163
540644826f Merge branch master into develop-1.0.0 2016-04-21 15:14:13 +08:00
然则
5374095604 update tree api:autoExpandParent, checkedKeys, onExpand 2016-04-21 13:11:55 +08:00
afc163
8d3bfae8ee fix doc (#1455) 2016-04-21 12:17:37 +08:00
Benjy Cui
12331ea57c style: enable react/prefer-stateless-function in demo 2016-04-21 11:36:51 +08:00
afc163
7e3b52f0fb Merge branch master into develop-1.0.0 2016-04-20 12:18:59 +08:00
afc163
6dc187e5f4 Not focus it when click button
91117c0faa (diff-39f43a348016e3a62dc9c315917c402bR108)
2016-04-20 12:14:57 +08:00
Benjy Cui
20e5146657 docs: add missing detail 2016-04-20 10:55:02 +08:00
Benjy Cui
0d7e92c056 docs: remove useless code in demo 2016-04-20 10:31:16 +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
afc163
0a121bd175 fix doc 2016-04-19 16:03:45 +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
cec56b40bf fix Timeline className and style 2016-04-18 16:58:46 +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
adc89d4809 Merge branch master into develop-1.0.0 2016-04-17 18:00:46 +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
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
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
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
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
afc163
736193eeb5 Merge branch master into develop-1.0.0 2016-04-15 11:23:57 +08:00
afc163
ef5ac96b49 update tree-select doc 2016-04-15 11:17:30 +08:00
然则
72f8e1f5dc correct tree-select doc 2016-04-14 18:47:37 +08:00
qubaoming
94e0488812 adjust props position 2016-04-14 16:48:34 +08:00
qubaoming
fc66d27042 change timepicker options to rctimepicker options 2016-04-14 15:48:16 +08:00
qubaoming
6b3a97b902 change timepicker options to rctimepicker options 2016-04-14 15:42:03 +08:00
wizawu
577663d185 Replace property spining with spinning 2016-04-14 15:26:55 +08:00
qubaoming
a674657287 data-picker extent options 2016-04-14 15:14:17 +08:00
qubaoming
c4bdf93a33 Merge remote-tracking branch 'upstream/develop-1.0.0' into develop-1.0.0 2016-04-14 15:10:43 +08:00
afc163
4835471210 update Table initial current page 2016-04-14 14:47:39 +08:00
afc163
6e00ea8945 Merge branch 'develop-1.0.0' of github.com:ant-design/ant-design into develop-1.0.0 2016-04-14 14:24:15 +08:00
afc163
e59715f98d fix checkbox and radio empty span 2016-04-14 14:23:12 +08:00
Benjy Cui
3677339646 fix: revert 2016-04-14 14:20:18 +08:00
qubaoming
fd57f4c12d date-picker extend options 2016-04-14 12:32:25 +08:00
Ma Tianxiao
be39bca93a fix input value/defaultValue prop (#1414)
Input elements must be either controlled or uncontrolled, specify either the value prop, or the defaultValue prop, but not both.
2016-04-14 11:58:01 +08:00
plandem
9af3e4fc55 ru locale (#1411) 2016-04-14 11:57:59 +08:00
Benjy Cui
0e156385da fix: revert delete defaultValue 2016-04-14 11:43:26 +08:00
Benjy Cui
9d95313d03 chore: suppress warning 2016-04-14 11:22:53 +08:00
然则
9b847b896f correct filterTreeNode api description 2016-04-13 20:46:54 +08:00
afc163
4a6337060e fix demo 2016-04-13 17:55:24 +08:00
Benjy Cui
047bfc2574 style: enable react/prefer-stateless-function 2016-04-13 17:38:53 +08:00