26 Commits (69f2bf664bf22aefcfa6ffdef68a16e44759e6c0)

Author	SHA1	Message	Date
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	34a0a37b63	Add token	2016-11-01 19:31:35 +08:00
江世峰	73f0199dc0	asset:add assets_bulk	2016-10-21 21:14:49 +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	e232962649	Update some template	2016-09-16 20:53:10 +08:00
ibuler	6069b8946b	Start asset extend	2016-09-10 00:29:57 +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	6f4a832389	Add admin user list view	2016-09-08 00:40:59 +08:00
ibuler	4db352f55b	Add idc	2016-09-07 20:51:33 +08:00
ibuler	02b5483d81	Update add->create edit->update and assetgrou->asset-grou etc format	2016-09-06 14:38:19 +08:00
ibuler	0604f76f56	Merge branch 'cmdb' of code.simcu.com:jumpserver/jumpserver into cmdb	2016-09-04 21:47:20 +08:00
ibuler	4855e86a3f	Add asset group view	2016-09-04 21:47:10 +08:00
wangyong	69349368bf	cmdb merge model and url	2016-09-04 19:15:31 +08:00
wangyong	b531d9eeb2	asset add html	2016-09-04 19:12:31 +08:00
ibuler	3972bd3ff3	Add asset traslation	2016-09-04 19:05:47 +08:00
wangyong	0e8e88fac0	add admin|sys user model	2016-09-04 17:50:30 +08:00
wangyong	426c3c4062	add asset amdin|sys user model	2016-09-04 17:43:03 +08:00
ibuler	11d06b5e2b	Add asset group view and url	2016-09-04 16:02:51 +08:00
wangyong	77f3a1f146	add asset add	2016-09-03 19:05:50 +08:00
wangyong	d0d433db1a	add asset_list	2016-08-30 13:50:30 +08:00
wangyong	fcd39370ed	add asset some cbv	2016-08-14 22:10:10 +08:00
ibuler	234684c875	Rename dir name dashboard to apps ... It's may be well	2016-08-13 21:59:08 +08:00