67 Commits

Author	SHA1	Message	Date
xiaokong1937@gmail.com	65461a09a7	user-group edit implement	2016-09-19 21:08:08 +08:00
xiaokong1937@gmail.com	4e2a41f4cf	user-group draft	2016-09-18 21:00:07 +08:00
xiaoyu	8a5a4f3362	fix #14	2016-09-18 14:28:34 +08:00
ibuler	dc4d388d9a	Merge with master	2016-09-17 18:53:11 +08:00
ibuler	df281defd8	Finish user detail asset grant ..	2016-09-17 18:51:19 +08:00
ibuler	7d3474aeea	Add user permission user list	2016-09-17 15:20:33 +08:00
ibuler	b5abb17568	Jiu zhe yang ba	2016-09-17 13:04:26 +08:00
ibuler	ab2eeb0da3	Finish user asset form	2016-09-17 01:04:52 +08:00
xiaokong1937@gmail.com	7984806b38	change user ssh reset type from private key to public key	2016-09-15 16:54:00 +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	8490583d73	add assets manage ... Sweet Alert	2016-09-14 15:19:27 +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	6d736d7309	Finish permission create and list	2016-09-11 22:45:24 +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
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
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
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
ibuler	170b49428c	change date_added -> date_created	2016-09-06 16:50:19 +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
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	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	3972bd3ff3	Add asset traslation	2016-09-04 19:05:47 +08:00
ibuler	f274684473	Add translation for support i18n	2016-09-04 00:51:36 +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	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	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	0d3bde1191	User add confirmed	2016-08-31 12:14:25 +08:00
ibuler	3eb4897bd3	Merge branch 'api' of code.simcu.com:jumpserver/jumpserver into api	2016-08-29 19:27:23 +08:00
ibuler	3c9dbaf860	Fix some bug	2016-08-28 23:58:22 +08:00
ibuler	d918d5b466	Add Logger setting .	2016-08-26 16:56:50 +08:00
ibuler	d95ffdfbf7	Test permmision	2016-08-26 00:51:05 +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