30 Commits

Author	SHA1	Message	Date
ibuler	239dd0567f	Finish admin user view	2016-09-08 20:39:06 +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
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
ibuler	dc01833a5b	Forget to forgot	2016-09-06 16:55:57 +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
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	61f0205529	Modify users url to singular	2016-09-04 16:05:58 +08:00
ibuler	0b406b6988	Add captch login using	2016-09-03 14:37:01 +08:00
ibuler	10d51ada37	Update login error message	2016-09-03 00:39:06 +08:00
ibuler	90ca5a8bb7	start capcha support	2016-09-02 22:23:15 +08:00
ibuler	3a9cf6c360	Add forget password and reset password	2016-09-01 23:09:58 +08:00
ibuler	5940cec0e6	Add user and send mail	2016-09-01 01:12:02 +08:00
ibuler	c9369db578	Add new login page	2016-08-31 20:39:25 +08:00
ibuler	011c125564	Modify user active api And Add Token authorization	2016-08-30 00:10:27 +08:00
ibuler	bb76f6c652	Add api authentication	2016-08-25 19:29:59 +08:00
ibuler	641e998504	Update context name path1, path2 => app, action	2016-08-25 13:56:49 +08:00
ibuler	0a9e4a5e85	Modify urls.conf: Merge to single	2016-08-25 13:28:02 +08:00
ibuler	cf15b7eaff	Add UserGroup some View	2016-08-19 01:39:08 +08:00
ibuler	7a8d4a3a59	Add delete view	2016-08-16 22:13:06 +08:00
ibuler	3bf0d4aabb	Add common app ... common app used as write public api or templatetags modify user list view and user edit view	2016-08-16 00:09:48 +08:00
广宏伟	86ffcc973c	Add user template	2016-08-14 19:18:41 +08:00
ibuler	9493fb07cb	Add user list view	2016-08-14 17:21:04 +08:00
ibuler	234684c875	Rename dir name dashboard to apps ... It's may be well	2016-08-13 21:59:08 +08:00