72 Commits

Author	SHA1	Message	Date
ibuler	a822f667af	[Fixture] 完成用户推送task	2017-03-09 14:55:33 +08:00
ibuler	b055144908	Merge with audits	2017-03-01 15:35:11 +08:00
Webb	63fd3cfff2	fixed asset_group delete html	2017-02-25 20:18:13 +08:00
Webb	a6825ac91e	fixed asset_list html and asset_update	2017-02-25 17:25:27 +08:00
ibuler	a79c3dd156	[Fixture] 添加command log backends, 未来支持es	2017-02-06 23:13:27 +08:00
ibuler	0869931e67	[Bugfix] 修改了一些issue上的bug	2017-01-20 20:13:22 +08:00
ibuler	87bbb6afde	[Bugfix] 修改添加系统用户view	2017-01-10 23:41:14 +08:00
ibuler	49861b6a84	Merge with master	2017-01-07 22:34:12 +08:00
右书僮	dbdb8a58fe	资产相关API及Web	2017-01-06 20:34:24 +08:00
ibuler	775cd523eb	Update app terminal name to applications	2016-12-25 23:10:53 +08:00
ibuler	a7476222a9	Update import	2016-11-27 23:36:35 +08:00
ibuler	3aea994101	asset import	2016-11-27 14:37:50 +08:00
ibuler	c1c9c7b68a	update asset	2016-11-25 22:45:47 +08:00
ibuler	205c11dfba	Finish list paganation	2016-11-18 12:00:23 +08:00
ibuler	e89d3b3807	Update asset	2016-11-17 19:28:45 +08:00
ibuler	db8b0022fc	Update usergroup detail	2016-11-15 19:33:04 +08:00
ibuler	8d7759d22f	change user api	2016-11-09 19:29:15 +08:00
ibuler	a75e1db970	Add form validate	2016-11-07 00:39:26 +08:00
ibuler	072da114db	Finish system user list	2016-11-06 22:45:26 +08:00
ibuler	968b1b4cb6	Stash	2016-11-06 21:29:04 +08:00
ibuler	afb923737c	Merge with audits	2016-11-06 11:52:25 +08:00
ibuler	61eadf6891	Modify asset detail	2016-11-03 00:09:38 +08:00
ibuler	05a5e9cc69	Finish some bug	2016-11-02 19:44:11 +08:00
江世峰	6b6fdcd5fd	asset:add assets_bulk_update	2016-10-28 21:24:01 +08:00
江世峰	3d4f79ca59	asset:add assets_bulk_update	2016-10-28 21:19:37 +08:00
ibuler	688bfa556c	Merge with audits	2016-10-27 23:04:02 +08:00
ibuler	5d3f9b4a03	Add command list	2016-10-26 19:10:14 +08:00
江世峰	f88c149076	asset:add assets_bulk	2016-10-25 02:16:20 +08:00
ibuler	6a510dad6c	Update some bug	2016-10-24 19:32:53 +08:00
江世峰	73f0199dc0	asset:add assets_bulk	2016-10-21 21:14:49 +08:00
江世峰	abe09e2a85	asset:update assets_list by tag	2016-10-14 19:28:58 +08:00
江世峰	73f5891f87	asset:update assets_list by tag	2016-10-12 18:57:51 +08:00
江世峰	b99b88a30f	asset:update tag	2016-10-08 18:33:00 +08:00
江世峰	2829445f4f	assets:add tag	2016-10-07 23:04:37 +08:00
江世峰	5bf414ffb5	update add_assets-group	2016-09-23 20:22:45 +08:00
江世峰	d2e989403f	update assets-group	2016-09-22 18:31:04 +08:00
ibuler	ce5950ca73	Merge with asset	2016-09-20 00:43:30 +08:00
ibuler	24e31a69cb	finish asset	2016-09-20 00:39:33 +08:00
江世峰	98757aa428	update assets_group	2016-09-19 17:25:41 +08:00
ibuler	d323c9df88	Modify asset create	2016-09-19 00:07:52 +08:00
ibuler	502c7e756b	Modify asset	2016-09-17 23:43:41 +08:00
ibuler	7fd224e690	Merge with user-perm	2016-09-17 19:15:14 +08:00
wangyong	343f139904	alter asset add and detail	2016-09-17 14:52:14 +08:00
wangyong	b95c1deee1	alter asset add and detail	2016-09-17 14:50:14 +08:00
ibuler	ab2eeb0da3	Finish user asset form	2016-09-17 01:04:52 +08:00
ibuler	e232962649	Update some template	2016-09-16 20:53:10 +08:00
wangyong	42012d7bfe	merge master	2016-09-16 17:32:35 +08:00
wangyong	792908eb35	asset add	2016-09-16 17:23:23 +08:00
ibuler	bb8852d57e	Modify some style	2016-09-15 12:20:53 +08:00
unknown	8490583d73	add assets manage ... Sweet Alert	2016-09-14 15:19:27 +08:00