4584 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
afc163	0ca97b07d3	resolve merge conflict	2016-01-28 15:15:39 +08:00
afc163	be1bad307b	simplify tree demos	2016-01-28 15:13:17 +08:00
Benjy Cui	646c224db0	docs: update Tree's demos	2016-01-28 14:40:29 +08:00
afc163	78d3653620	update button group demo	2016-01-28 14:23:09 +08:00
afc163	ffd8b8a7b9	Merge branch 'master' into develop-0.12.0	2016-01-28 12:41:04 +08:00
afc163	e00caff86e	Merge branch 'develop-0.12.0' of github.com:ant-design/ant-design into develop-0.12.0	2016-01-28 12:40:28 +08:00
afc163	f3a9050d3c	0.12.0-beta.30	2016-01-28 12:38:28 +08:00
Benjy Cui	e719e7db87	docs: update version selector	2016-01-28 12:18:01 +08:00
afc163	48433b5c93	upgrade rc-select	2016-01-28 12:16:18 +08:00
afc163	9ed1f665a3	Merge pull request #949 from ant-design/chore-eslint-fix ... chore: update eslint-tinker	2016-01-28 11:50:49 +08:00
Benjy Cui	9319f7296e	chore: update eslint-tinker	2016-01-28 11:25:09 +08:00
afc163	e6092ef09d	Merge pull request #945 from ant-design/chore-eslint-fix ... Add tool to fix Markdown ESLint errors automatically	2016-01-27 19:00:50 +08:00
Benjy Cui	f8fe0b27ec	chore: seperate eslint-fix and eslint-tinker	2016-01-27 17:00:58 +08:00
Benjy Cui	68b51e298d	style: update code style for space-before-function-paren	2016-01-27 17:00:58 +08:00
Benjy Cui	cd1391e6a2	style: update code style for object-curly-spacing	2016-01-27 17:00:58 +08:00
Benjy Cui	79aa53ce51	docs: update Slider's demo	2016-01-27 17:00:58 +08:00
Benjy Cui	9d6ddd727d	chore: to fix eslint errors automatically	2016-01-27 17:00:58 +08:00
afc163	1fdf5c3539	Merge branch 'develop-0.12.0' of github.com:ant-design/ant-design into develop-0.12.0	2016-01-27 16:48:40 +08:00
afc163	31ae114a19	fix(transfer): fix compatibility es2015 function, close #944	2016-01-27 16:46:42 +08:00
yiminghe	9c36b900bf	fix(upload): fix default name value ... do not set value to ''	2016-01-27 16:25:05 +08:00
afc163	f540b1c201	fix(cascader): empty menu style	2016-01-27 15:26:39 +08:00
afc163	3958b2e640	Merge branch 'develop-0.12.0' of github.com:ant-design/ant-design into develop-0.12.0	2016-01-27 14:48:51 +08:00
afc163	dc1e05f9e9	fix(tag): Add enter animation	2016-01-27 14:48:25 +08:00
yiminghe	df326bea67	fix fieldOption	2016-01-27 14:35:21 +08:00
afc163	bf7caf9dda	Merge pull request #940 from ant-design/feat-form ... feat: size of controls in form should be large	2016-01-27 13:33:57 +08:00
yiminghe	821013ee47	upgrade rc-form	2016-01-27 12:37:23 +08:00
Benjy Cui	d06935528e	feat: customized size first	2016-01-27 12:00:27 +08:00
Benjy Cui	1e42ee95b7	feat: size of controls in form should be large	2016-01-27 10:00:27 +08:00
afc163	62dbc54eb2	improve tag code style	2016-01-27 01:51:54 +08:00
afc163	d010b7957c	update tag demo	2016-01-27 01:47:36 +08:00
afc163	5602d90f12	improve tag code style	2016-01-27 01:47:12 +08:00
afc163	0635877a51	fix(tag): fix tag link style	2016-01-27 01:23:30 +08:00
afc163	a75dfe8fd6	Add tag control demo	2016-01-27 01:20:05 +08:00
afc163	5719a83f36	chore(tag): some code style	2016-01-26 23:40:20 +08:00
afc163	7e7925484a	update tag demo	2016-01-26 23:34:28 +08:00
jljsj	fa806b1612	update home scrollHideProps to hideProps	2016-01-26 20:08:45 +08:00
yiminghe	65b338de2b	fix(upload): fix upload when edit ... instanceof check error	2016-01-26 19:55:19 +08:00
afc163	d1fdf38e7d	Merge pull request #934 from ant-design/fix-form ... fix: help is generate automatically now	2016-01-26 18:21:20 +08:00
Benjy Cui	4d84706d7f	fix: help is generate automatically now	2016-01-26 17:42:56 +08:00
afc163	f559dfbbb7	fix progress format	2016-01-26 17:34:45 +08:00
afc163	02c3a18f79	0.12.0-beta.25	2016-01-26 17:03:44 +08:00
afc163	08c080948e	Merge pull request #929 from ant-design/chore-form ... refactor: rename option to fieldOption	2016-01-26 17:02:44 +08:00
afc163	d6ba326433	0.12.0-beta.24	2016-01-26 16:48:41 +08:00
afc163	5a0f033159	Merge branch 'develop-0.12.0' of github.com:ant-design/ant-design into develop-0.12.0	2016-01-26 16:42:08 +08:00
afc163	0c7feaaa1f	Allow finish selection on Cascader parent option, close #896	2016-01-26 16:41:41 +08:00
yiminghe	a35c027551	support extra for FormItem	2016-01-26 15:40:47 +08:00
yiminghe	60a77bdccf	support extra for FormItem	2016-01-26 15:38:58 +08:00
Benjy Cui	cf25379010	refactor: rename option to fieldOption	2016-01-26 15:17:51 +08:00
afc163	d064e122b3	fix time-picker demo error in safari	2016-01-26 15:04:57 +08:00
afc163	c6e39ee5ac	minify pics	2016-01-26 14:17:32 +08:00