9 Commits (0ab015abfd298572b0a555bdd351fe873a8a1b70)

Author	SHA1	Message	Date
wangyong	d96ac56460	merge master	2016-09-03 23:01:36 +08:00
wangyong	77f3a1f146	add asset add	2016-09-03 19:05:50 +08:00
ibuler	011c125564	Modify user active api And Add Token authorization	2016-08-30 00:10:27 +08:00
ibuler	0a9e4a5e85	Modify urls.conf: Merge to single	2016-08-25 13:28:02 +08:00
ibuler	8aa92bb688	Add api: UserApi And UserGroupApi	2016-08-24 19:42:16 +08:00
ibuler	1d5faa3101	Delete Model: Role	2016-08-24 17:14:21 +08:00
ibuler	b97b34961c	Modify api: complete some setting	2016-08-24 12:29:19 +08:00
ibuler	a43ac90b21	Modify CRLF to LF	2016-08-24 00:13:58 +08:00
ibuler	6458231946	Add api file	2016-08-24 00:11:13 +08:00