4025 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
yiminghe	e924c57296	fix scripts ... Conflicts: package.json	2016-01-14 20:50:33 +08:00
afc163	c65400c586	Merge branch 'develop-0.12.0' of github.com:ant-design/ant-design into develop-0.12.0	2016-01-14 20:41:10 +08:00
afc163	e91b630e8a	Merge branch 'Carrotzpc-develop-0.12.0' into develop-0.12.0	2016-01-14 20:40:49 +08:00
afc163	4669c67bc4	resolve conflict	2016-01-14 20:40:30 +08:00
yiminghe	6a6cc8228a	update index	2016-01-14 19:38:07 +08:00
yiminghe	1afb9b543d	fix scripts	2016-01-14 19:23:25 +08:00
yiminghe	dc3b34510b	compatible with rc-form	2016-01-14 19:15:21 +08:00
Benjy Cui	a145a3ec32	chore: update package.json	2016-01-14 16:47:01 +08:00
Benjy Cui	41ed04e977	style: update code style to please lint	2016-01-14 16:46:38 +08:00
afc163	dde03eaec4	Merge branch 'develop-0.12.0' of github.com:ant-design/ant-design into develop-0.12.0	2016-01-14 16:44:10 +08:00
afc163	772eea09c7	support pending timeline node, ref #708	2016-01-14 16:43:48 +08:00
yiminghe	fd1312803f	upgrade calendar/timePicker. Fixes #822	2016-01-14 16:38:37 +08:00
afc163	efcc8c5cb2	fix popover API table	2016-01-14 15:55:42 +08:00
afc163	d271e92b8e	Merge master	2016-01-14 15:35:21 +08:00
afc163	413e816c98	update button doc	2016-01-14 15:24:54 +08:00
afc163	1405600919	Add IE8 issues link	2016-01-14 14:29:30 +08:00
afc163	f22eeb179b	update resource link	2016-01-14 14:19:12 +08:00
afc163	f1ff04a1ce	Docs: fix markdown and remove console	2016-01-14 13:59:12 +08:00
afc163	11353c7a60	reset menu link color, fix #872	2016-01-14 11:54:46 +08:00
afc163	29b99bbf69	Merge branch 'master' of github.com:ant-design/ant-design	2016-01-14 11:26:09 +08:00
afc163	56a0badded	fix links	2016-01-14 11:25:46 +08:00
afc163	124d702f88	Merge pull request #874 from raptium/master ... Fix typo in layout demo code	2016-01-14 11:15:28 +08:00
Guan Hao	9e2d1be3d6	fix typo in layout demo code	2016-01-14 11:08:57 +08:00
zhangpc	db2ef44617	remove href attributes of tag	2016-01-14 09:26:20 +08:00
afc163	7aad7ba116	Merge branch 'develop-0.12.0' of github.com:ant-design/ant-design into develop-0.12.0	2016-01-14 02:40:47 +08:00
afc163	f6b4991374	Merge branch 'master' into develop-0.12.0	2016-01-14 02:40:12 +08:00
afc163	73b806e159	upgrade webpack config	2016-01-14 02:37:52 +08:00
afc163	fae30906b2	update style link	2016-01-14 02:10:24 +08:00
afc163	22bb5ea1b3	upgrade nico.js	2016-01-14 02:05:57 +08:00
然则	2e26942ecd	Merge branch 'develop-0.12.0' of github.com:ant-design/ant-design into develop-0.12.0	2016-01-14 00:42:10 +08:00
然则	696b3438b8	up tree, change drag api, fix drag state	2016-01-14 00:41:25 +08:00
afc163	5e635654ed	update download page style	2016-01-14 00:33:12 +08:00
afc163	1d75c19895	update style	2016-01-14 00:26:51 +08:00
afc163	2e3ccfb345	Merge branch 'master' into develop-0.12.0	2016-01-13 22:48:54 +08:00
afc163	644c43f4e0	fix demo style	2016-01-13 22:46:05 +08:00
afc163	63476680bd	Add upload inline item demo, ref #859	2016-01-13 22:44:45 +08:00
afc163	fdcc665c80	merge drag upload demo	2016-01-13 22:39:02 +08:00
afc163	027a69b0f0	hide multiple upload demo	2016-01-13 22:32:42 +08:00
afc163	cf77d46493	fix search icon	2016-01-13 22:26:40 +08:00
afc163	a16903009e	merge from master	2016-01-13 22:22:33 +08:00
afc163	f96a57ec25	update site style	2016-01-13 22:03:21 +08:00
afc163	4cd73289b3	update checkbox use instruction, fix #860	2016-01-13 21:56:51 +08:00
afc163	56c4882f30	Merge pull request #845 from ant-design/new-design-spec ... New design spec	2016-01-13 21:49:46 +08:00
afc163	be1a353301	update pictures	2016-01-13 21:38:02 +08:00
afc163	2381b78af2	upgrade ant-ux link	2016-01-13 17:54:53 +08:00
Benjy Cui	f58ac72a88	docs: update Select's documentation	2016-01-13 17:35:48 +08:00
afc163	a479bc8fe3	Fix MonthPicker style, close #848	2016-01-13 17:30:54 +08:00
afc163	94f6f5ab9f	fix time-picker width	2016-01-13 17:15:47 +08:00
afc163	24bd1f09da	fix Modal case bug	2016-01-13 16:46:38 +08:00
afc163	d4a65d14ba	Merge branch 'master' into new-design-spec	2016-01-13 16:30:30 +08:00