815 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
zuiidea	54964fabfb	Update README.md	2017-05-13 14:37:18 +08:00
zuiidea	b60e593f09	Update README.md	2017-05-13 14:35:53 +08:00
zuiidea	5359efce36	Merge pull request #287 from zuiidea/develop ... update 4.2.1	2017-05-12 18:07:53 +08:00
zuiidea	3decccc87d	update 4.2.1	2017-05-12 18:06:43 +08:00
zuiidea	d92eecb620	Merge pull request #285 from zuiidea/develop ... local icon	2017-05-12 15:56:18 +08:00
zuiidea	c3c8cf6f9b	local icon 4.2.1	2017-05-12 15:55:42 +08:00
zuiidea	b4699e75f1	Merge pull request #284 from zuiidea/develop ... fix NProgress	2017-05-12 12:26:35 +08:00
zuiidea	47ae7517a8	fix NProgress	2017-05-12 12:25:57 +08:00
zuiidea	19e07aeb7a	Merge pull request #277 from zuiidea/develop ... favicon	2017-05-11 11:11:49 +08:00
zuiidea	c7789f103e	favicon	2017-05-11 11:11:21 +08:00
zuiidea	2c74295843	Merge pull request #266 from zuiidea/develop ... default.less	2017-05-09 16:36:12 +08:00
zuiidea	44605c6311	default.less	2017-05-09 16:35:37 +08:00
zuiidea	55ef9dfc0e	Merge pull request #263 from zuiidea/develop ... Develop	2017-05-09 15:25:45 +08:00
zuiidea	664aeba133	fix qureyuser	2017-05-09 15:25:08 +08:00
zuiidea	d2595271f8	iconfont	2017-05-09 15:21:50 +08:00
zuiidea	0f03e1aa1a	ICONFONT	2017-05-09 11:28:49 +08:00
zuiidea	255b0a95a7	Merge pull request #258 from zuiidea/develop ... add:nprogress,dva-loading	2017-05-08 15:34:15 +08:00
zuiidea	839a7c5e0d	add:nprogress,dva-loading	2017-05-08 15:32:25 +08:00
zuiidea	bf260db940	Update README.md	2017-05-03 17:30:44 +08:00
zuiidea	3e1e782617	Update package.json	2017-05-03 17:29:44 +08:00
zuiidea	a1e8f2ed9b	Update package.json	2017-05-03 17:15:35 +08:00
zuiidea	88d835cee4	Merge pull request #237 from zuiidea/4.2-dev ... Update README.md	2017-05-02 10:45:05 +08:00
zuiidea	2434368b1f	Update README.md	2017-05-02 10:44:46 +08:00
zuiidea	058407e442	Update	2017-05-02 10:41:58 +08:00
zuiidea	d486fce33e	Merge pull request #232 from zhangpenglin/master ... fix typo	2017-04-30 19:06:37 +08:00
zuiidea	abbcfb8c3c	Merge pull request #233 from afc163/master ... Fix devDeps	2017-04-30 19:04:01 +08:00
Zhang Penglin	78166e6a83	fix bug	2017-04-30 12:29:48 +08:00
afc163	ca59db9f04	Fix devDeps	2017-04-29 17:35:54 +08:00
Zhang Penglin	5c8286b5cb	fix typo	2017-04-28 23:31:50 +08:00
zuiidea	ed8555f15e	Update README.md 4.2	2017-04-28 17:01:27 +08:00
zuiidea	33d4f1679e	Merge branch '4.2-dev'	2017-04-28 16:42:59 +08:00
zuiidea	37dd7d011e	merge	2017-04-28 16:42:31 +08:00
zuiidea	5641cc61c4	user mocj	2017-04-28 16:34:08 +08:00
zuiidea	30f14769f0	responsive	2017-04-27 20:40:47 +08:00
zuiidea	1b7c076057	filters	2017-04-27 20:26:30 +08:00
zuiidea	fbd0fcb5c4	user detail	2017-04-27 17:59:39 +08:00
zuiidea	19ee8eacce	user API restful	2017-04-27 17:29:50 +08:00
zuiidea	0b0c7c3f91	update some texts and configs	2017-04-27 14:40:36 +08:00
zuiidea	5d6abb67b6	Merge pull request #219 from HeChengjun/master ... 修正 arrayToTree 函数中 children 拼写错误	2017-04-26 16:55:17 +08:00
HeChengjun	1a58dcac95	修正 arrayToTree 函数中 children 拼写错误	2017-04-26 16:16:35 +08:00
zuiidea	3d2d524898	Update README.md	2017-04-25 16:17:25 +08:00
zuiidea	2869ead7bd	Merge pull request #215 from zuiidea/4.2-dev ... fix	2017-04-25 12:34:10 +08:00
zuiidea	25f7a65897	fix	2017-04-25 12:32:42 +08:00
zuiidea	75e6284873	Merge pull request #214 from zuiidea/4.2-dev ... Menu defaultSelected	2017-04-25 12:19:03 +08:00
zuiidea	5fbb1b338a	Menu defaultSelected	2017-04-25 12:09:20 +08:00
zuiidea	ed2b0b25bd	Merge pull request #212 from HeChengjun/patch-1 ... menu.js line 96 : lineChart -> barChart	2017-04-24 17:57:56 +08:00
HeChengjun	a4922c7541	menu.js line 96 : lineChart -> barChart	2017-04-24 17:17:10 +08:00
zuiidea	4566171265	Merge pull request #209 from zuiidea/4.2-dev ... hot update	2017-04-24 10:10:55 +08:00
zuiidea	6c48480031	hot update	2017-04-24 10:09:10 +08:00
zuiidea	3401215d41	Merge pull request #202 from zuiidea/4.2-dev ... fix userInfo	2017-04-21 18:37:36 +08:00