50 Commits (067426d5e0fc44b1f0a0b056c8b3cb5e11c957d8)

Author	SHA1	Message	Date
ibuler	10eb13920b	[Delete] 删除资产tag	2017-03-24 14:48:18 +08:00
ibuler	2ae57a7970	[Delete] 删除 system user一些属性	2017-03-22 22:15:15 +08:00
ibuler	610c9c5149	Pull it	2017-03-22 22:05:24 +08:00
ibuler	0fbd9843bd	[Change] 修改runner, inventory位置	2017-03-16 00:19:47 +08:00
ibuler	915873135e	[Fixture] 添加runner run record	2017-03-14 00:58:25 +08:00
ibuler	a822f667af	[Fixture] 完成用户推送task	2017-03-09 14:55:33 +08:00
xiaokong1937@gmail.com	694899799b	trivial changes	2017-03-06 21:05:00 +08:00
ibuler	ab62bfca7e	[Bugfix] 修改一些bug	2017-03-04 16:38:26 +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
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
ibuler	3da33a57e2	[Bugfix] 修改tab -> space, 删除system user的 as default	2017-01-07 20:17:22 +08:00
右书僮	dbdb8a58fe	资产相关API及Web	2017-01-06 20:34:24 +08:00
ibuler	70da177ed7	Update api	2016-12-29 19:17:00 +08:00
ibuler	3aea994101	asset import	2016-11-27 14:37:50 +08:00
ibuler	db8b0022fc	Update usergroup detail	2016-11-15 19:33:04 +08:00
ibuler	a75e1db970	Add form validate	2016-11-07 00:39:26 +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
ibuler	f1dfba6a93	Update some asset issues	2016-10-31 19:31:56 +08:00
江世峰	f88c149076	asset:add assets_bulk	2016-10-25 02:16:20 +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
江世峰	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	acfe8950b8	MOdify asset create	2016-09-18 00:10:08 +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	b95c1deee1	alter asset add and detail	2016-09-17 14:50:14 +08:00
ibuler	c58725dbc0	Finish system user view	2016-09-09 23:19:39 +08:00
ibuler	4fc9274e00	Add asset system user	2016-09-09 00:09:49 +08:00
ibuler	5259dd8054	Asset form: Add some comment	2016-09-08 22:54:05 +08:00
ibuler	ff30435eb4	Finish adin user add	2016-09-08 18:12:53 +08:00
ibuler	5a0b119410	Stash it	2016-09-08 00:59:00 +08:00
ibuler	4db352f55b	Add idc	2016-09-07 20:51:33 +08:00
ibuler	d0ba17374e	Finish asset group create	2016-09-07 20:05:42 +08:00
ibuler	25d9dbe93c	Merge with cmdb	2016-09-06 15:09:00 +08:00
ibuler	02b5483d81	Update add->create edit->update and assetgrou->asset-grou etc format	2016-09-06 14:38:19 +08:00
ibuler	b8c10a0350	Add assetgroup form save action	2016-09-06 01:09:03 +08:00
ibuler	126d7fd62c	Add asset group add Form m2m	2016-09-06 00:49:42 +08:00
wangyong	b531d9eeb2	asset add html	2016-09-04 19:12:31 +08:00
wangyong	fa07f4ee8a	fix null	2016-09-04 18:06:14 +08:00
wangyong	426c3c4062	add asset amdin|sys user model	2016-09-04 17:43:03 +08:00
wangyong	fcd39370ed	add asset some cbv	2016-08-14 22:10:10 +08:00