102 Commits

Author	SHA1	Message	Date
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
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	3c6f50b788	Modify some bug	2016-09-05 23:42:10 +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	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	4855e86a3f	Add asset group view	2016-09-04 21:47:10 +08:00
ibuler	3972bd3ff3	Add asset traslation	2016-09-04 19:05:47 +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	8d0334e003	Add translation	2016-09-04 17:34:48 +08:00
ibuler	0ab015abfd	Asset add traslation	2016-09-04 17:15:26 +08:00
ibuler	7350e150c8	Merge branch 'master' into cmdb	2016-09-04 16:39:27 +08:00
ibuler	61f0205529	Modify users url to singular	2016-09-04 16:05:58 +08:00
ibuler	acd98365c1	Fix translation	2016-09-04 12:31:20 +08:00
ibuler	f274684473	Add translation for support i18n	2016-09-04 00:51:36 +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
ibuler	ba3f46fbd6	i18n	2016-09-03 19:02:18 +08:00
ibuler	0b406b6988	Add captch login using	2016-09-03 14:37:01 +08:00
ibuler	6f0cfd23c1	Rm logout.html	2016-09-03 00:39:52 +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	9803dd9547	Add ico, Modify forget_password	2016-09-02 18:10:26 +08:00
ibuler	3a9cf6c360	Add forget password and reset password	2016-09-01 23:09:58 +08:00
ibuler	8ff872f41d	Add ls config	2016-09-01 16:05:14 +08:00
ibuler	5940cec0e6	Add user and send mail	2016-09-01 01:12:02 +08:00
ibuler	5359da3ce2	Finish user login	2016-08-31 23:42:06 +08:00
ibuler	c9369db578	Add new login page	2016-08-31 20:39:25 +08:00
ibuler	b31f8d5867	Add user generate reset password token	2016-08-31 19:28:06 +08:00
ibuler	0d3bde1191	User add confirmed	2016-08-31 12:14:25 +08:00
ibuler	c143735393	Add ssh-key-gen function	2016-08-31 01:00:20 +08:00
ibuler	43af5383e3	Add model user method: get_token set_token	2016-08-30 20:30:47 +08:00