347 Commits (17ade287ab7617521fe1a22539792c052d303e8e)

All Branches

Search

Author	SHA1	Message	Date
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
ibuler	30fd51c268	Asset group detail	2016-09-06 21:39:21 +08:00
xiaokong1937@gmail.com	556fb4e09f	refactor `is_active` trigger view and `enable_otp` trigger view in UserDetail page;trivial changes	2016-09-06 21:03:51 +08:00
xiaokong1937@gmail.com	a3096689b5	Merge branch 'xiaoyu'	2016-09-06 19:14:16 +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	dc01833a5b	Forget to forgot	2016-09-06 16:55:57 +08:00
ibuler	170b49428c	change date_added -> date_created	2016-09-06 16:50:19 +08:00
xiaoyu	c6f875c517	temp commit	2016-09-06 16:40:44 +08:00
ibuler	07dd6d1192	Reslove conflict	2016-09-06 15:56:03 +08:00
ibuler	25d9dbe93c	Merge with cmdb	2016-09-06 15:09:00 +08:00
xiaoyu	8cc09f0e5a	move login and logout view back to CBV	2016-09-06 15:03:37 +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	3c6f50b788	Modify some bug	2016-09-05 23:42:10 +08:00
ibuler	2cb6b15bc3	set textarea rows	2016-09-05 23:12:01 +08:00
ibuler	2f5b7ad654	Modify asset model	2016-09-05 22:57:43 +08:00
xiaokong1937@gmail.com	6aedfb5219	fix small template erros	2016-09-05 22:20:50 +08:00
xiaokong1937@gmail.com	397da7d676	Merge branch 'master' of code.simcu.com:jumpserver/jumpserver	2016-09-05 21:38:37 +08:00
xiaokong1937@gmail.com	e75d33439a	fix captcha not valid bug of login view; use django's default login and logout view to enhance robustness	2016-09-05 21:38:21 +08:00
ibuler	7241f7509f	Update nav	2016-09-05 20:27:44 +08:00
ibuler	8827fd2d74	Modify translation	2016-09-05 20:17:45 +08:00
ibuler	6fc3bbb97d	Update initial data: fixtures dir	2016-09-05 19:41:34 +08:00
ibuler	508bda37f5	Modify form datetime valid error, because form format	2016-09-05 19:37:37 +08:00
ibuler	a0ef3cfc34	Update locale dir name to zh	2016-09-05 19:17:18 +08:00
ibuler	1b9c9c48b6	Merge branch 'cmdb'	2016-09-04 21:54:17 +08:00
ibuler	22e20d29f5	Merge branch 'master' of code.simcu.com:jumpserver/jumpserver	2016-09-04 21:50:39 +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	246fcb8efa	Modify run_server.py	2016-09-04 19:10:28 +08:00