1450 Commits

Author	SHA1	Message	Date
ibuler	1159d9494c	Update signer	2016-11-01 17:21:16 +08:00
ibuler	f1dfba6a93	Update some asset issues	2016-10-31 19:31:56 +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	92251f2a45	Merge with master	2016-10-28 15:09:38 +08:00
ibuler	374dfbdac2	Force merge	2016-10-28 11:36:37 +08:00
ibuler	534321d1aa	Merge with master	2016-10-28 11:34:07 +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
江世峰	cdb1602e06	asset:add assets_bulk	2016-10-22 20:21:36 +08:00
江世峰	80baecc8be	Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver ... Merge	2016-10-21 21:15:04 +08:00
江世峰	73f0199dc0	asset:add assets_bulk	2016-10-21 21:14:49 +08:00
ibuler	6b161d5971	Update import	2016-10-20 19:01:57 +08:00
ibuler	45dcb26123	Merge branch 'audits'	2016-10-19 15:14:07 +08:00
江世峰	4e1f9c97a5	asset:update assets_list by tag	2016-10-16 22:35:25 +08:00
ibuler	4531157c72	may be some wrong	2016-10-16 22:12:13 +08:00
ibuler	26a8bce2c3	Change auto_now to auto_now_add	2016-10-15 23:34:02 +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
江世峰	fd52a85dbb	fix #25	2016-09-30 18:25:50 +08:00
江世峰	e83ecb1254	assets_group_forbug	2016-09-28 12:05:34 +08:00
ibuler	7ab47916f2	add __init__.py	2016-09-24 22:12:49 +08:00
ibuler	283c53fddf	Update gitignore	2016-09-24 22:11:53 +08:00
ibuler	da56310db9	update .gitignore	2016-09-24 22:09:20 +08:00
ibuler	4925f3227a	update .gitignore	2016-09-24 21:57:24 +08:00
ibuler	88bb620af2	Modify ignore	2016-09-24 11:50:25 +08:00
ibuler	1f3d763490	Add requirement	2016-09-24 11:44:59 +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	220892824c	Finish some bug	2016-09-20 01:13:50 +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	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	a091036744	Add user permission select	2016-09-16 16:09:11 +08:00
ibuler	bb8852d57e	Modify some style	2016-09-15 12:20:53 +08:00
ibuler	037d9323a4	Modify and code review	2016-09-15 11:19:36 +08:00