2264 Commits

Author	SHA1	Message	Date
ibuler	db8b0022fc	Update usergroup detail	2016-11-15 19:33:04 +08:00
ibuler	f70abec5ef	Finish user detail	2016-11-10 22:06:23 +08:00
ibuler	69f2bf664b	Finish user permission revoke	2016-11-10 16:59:50 +08:00
ibuler	dde9ffb2ae	Update perm api	2016-11-10 00:18:57 +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	2a65e81316	detail page add update	2016-11-03 23:16:16 +08:00
ibuler	f437d3f883	update	2016-11-03 19:42:47 +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	34a0a37b63	Add token	2016-11-01 19:31:35 +08:00
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
ibuler	f253d2ea69	Merge with master	2016-09-14 23:31:22 +08:00
unknown	1005fbabbd	add assets manage ... Sweet Alert	2016-09-14 15:38:54 +08:00
unknown	8490583d73	add assets manage ... Sweet Alert	2016-09-14 15:19:27 +08:00
ibuler	5bca783e12	permission user search	2016-09-14 01:08:26 +08:00
ibuler	6d736d7309	Finish permission create and list	2016-09-11 22:45:24 +08:00
ibuler	70cae93a4b	Add user perm model and form	2016-09-11 09:50:42 +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	292179d41d	system-user	2016-09-09 21:48:44 +08:00
ibuler	a89ae94d85	Update system user create template script	2016-09-09 00:34:23 +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	239dd0567f	Finish admin user view	2016-09-08 20:39:06 +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	6f4a832389	Add admin user list view	2016-09-08 00:40:59 +08:00
ibuler	dfc628a397	modify idc	2016-09-07 21:03:18 +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	30fd51c268	Asset group detail	2016-09-06 21:39:21 +08:00
wangyong	bc232c4f77	merge cmdb	2016-09-06 18:45:40 +08:00
wangyong	342e4bdee8	change some html	2016-09-06 18:43:13 +08:00
ibuler	170b49428c	change date_added -> date_created	2016-09-06 16:50:19 +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
ibuler	2f5b7ad654	Modify asset model	2016-09-05 22:57:43 +08:00
ibuler	8827fd2d74	Modify translation	2016-09-05 20:17:45 +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
ibuler	d1c96cd4b2	Merge branch 'cmdb' of code.simcu.com:jumpserver/jumpserver into cmdb	2016-09-04 18:07:19 +08:00
ibuler	154783a974	Modify some and pull from server	2016-09-04 18:07:15 +08:00
wangyong	fa07f4ee8a	fix null	2016-09-04 18:06:14 +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	0ab015abfd	Asset add traslation	2016-09-04 17:15:26 +08:00
ibuler	11d06b5e2b	Add asset group view and url	2016-09-04 16:02:51 +08:00
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
lijiejie	cec5a7f2c6	create the restframework url	2016-09-02 22:51:10 +08:00
lijiejie	829df26b0f	create the api	2016-09-02 22:49:51 +08:00
ibuler	ffed46175d	update .gitignore	2016-08-30 17:26:33 +08:00
wangyong	d0d433db1a	add asset_list	2016-08-30 13:50:30 +08:00
wangyong	3771b2ff70	add asset detail and list	2016-08-21 22:12:17 +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