227 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ibuler	a091036744	Add user permission select	2016-09-16 16:09:11 +08:00
ibuler	d9812e2bdb	Remove action from asset permission	2016-09-16 09:55:26 +08:00
ibuler	74b8ee8c10	Pre delete action	2016-09-16 09:38:07 +08:00
ibuler	766bd3b76d	Move js to jumpserver.js	2016-09-15 13:09:24 +08:00
ibuler	b2444c2aca	Add fake data to init.json	2016-09-15 12:21:34 +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
ibuler	a4dc27f073	Finish permissin detail asset list and user list	2016-09-14 23:29:39 +08:00
ibuler	812df7b07b	Restore settings.py	2016-09-14 16:52:09 +08:00
unknown	c237f82e51	restore settings	2016-09-14 16:10:15 +08:00
unknown	e7c20f0707	add assets manage Sweet Alert"	2016-09-14 15:51:09 +08:00
unknown	0f9bdab108	Merge branch 'master' of code.simcu.com:jumpserver/jumpserver	2016-09-14 15:40:47 +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
xiaokong1937@gmail.com	6751c5a63a	reset user password and ssh pk implement	2016-09-13 21:45:10 +08:00
xiaoyu	00502ce33d	trivial js style changes; bugfix for patch method	2016-09-13 16:38:43 +08:00
ibuler	4c4f598552	Finish asset permission detail and add user or user group list	2016-09-13 00:37:24 +08:00
unknown	7cff5cbf61	Merge branch 'master' of code.simcu.com:jumpserver/jumpserver	2016-09-12 15:36:13 +08:00
unknown	12831a7d21	text	2016-09-12 15:35:50 +08:00
ibuler	7b99a33a2f	permission update and delete finished	2016-09-11 23:20:14 +08:00
ibuler	6d736d7309	Finish permission create and list	2016-09-11 22:45:24 +08:00
ibuler	f558ded5bb	Plan delete some view	2016-09-11 20:13:56 +08:00
ibuler	324bb68667	user-pserm	2016-09-11 16:59:19 +08:00
ibuler	70cae93a4b	Add user perm model and form	2016-09-11 09:50:42 +08:00
ibuler	627a5825f4	Add user perm	2016-09-10 21:08:10 +08:00
xiaokong1937@gmail.com	899233338d	#8 user first login view	2016-09-10 13:20:34 +08:00
xiaokong1937@gmail.com	a7e3f9c465	#8 user first login view	2016-09-10 13:16:58 +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
xiaokong1937@gmail.com	d8fe59debb	temp save for issue 8	2016-09-08 21:51:44 +08:00
ibuler	409fac3ef1	Merge branch 'admin-user'	2016-09-08 20:39:25 +08:00
ibuler	239dd0567f	Finish admin user view	2016-09-08 20:39:06 +08:00
xiaokong1937@gmail.com	62cac20ba7	fix #9	2016-09-08 19:30:22 +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	ccfe9b9d08	Merge branch 'admin-user'	2016-09-08 00:41:22 +08:00
ibuler	6f4a832389	Add admin user list view	2016-09-08 00:40:59 +08:00
xiaokong1937@gmail.com	8acbcb2ed2	Merge branch 'master' of code.simcu.com:jumpserver/jumpserver	2016-09-07 21:53:33 +08:00
xiaokong1937@gmail.com	04151b9957	user group quickedit frontend and rest API	2016-09-07 21:53:27 +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	d8e6433404	Merge branch 'master' of code.simcu.com:jumpserver/jumpserver	2016-09-07 20:06:01 +08:00
ibuler	d0ba17374e	Finish asset group create	2016-09-07 20:05:42 +08:00
xiaokong1937@gmail.com	7f09b486d9	user-group edit serializer and url implement	2016-09-06 21:44:23 +08:00