10187 Commits (4cb499953c8f11709c68ee5e65d2a66536f94718)

All Branches

Search

Author	SHA1	Message	Date
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
ibuler	3972bd3ff3	Add asset traslation	2016-09-04 19:05:47 +08:00
ibuler	d1c96cd4b2	Merge branch 'cmdb' of code.simcu.com:jumpserver/jumpserver into cmdb	2016-09-04 18:07:19 +08:00
ibuler	154783a974	Modify some and pull from server	2016-09-04 18:07:15 +08:00
wangyong	fa07f4ee8a	fix null	2016-09-04 18:06:14 +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	11d06b5e2b	Add asset group view and url	2016-09-04 16:02:51 +08:00
ibuler	a9b5762fbc	Modify api style guide info	2016-09-04 15:31:10 +08:00
广宏伟	724b1c6fd4	Add new directory logs	2016-09-04 12:37:42 +08:00
ibuler	acd98365c1	Fix translation	2016-09-04 12:31:20 +08:00
liuzheng712	32c49c080c	update	2016-09-04 07:04:15 +08:00
liuzheng712	d371c0c5ae	mkdirp	2016-09-04 06:55:12 +08:00
ibuler	47171174b5	Merge branch 'master' of code.simcu.com:jumpserver/jumpserver	2016-09-04 00:52:04 +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
lijiejie	9fa70f6cb8	create a restframework api for cmdb models	2016-09-02 22:52:30 +08:00
lijiejie	cec5a7f2c6	create the restframework url	2016-09-02 22:51:10 +08:00
lijiejie	829df26b0f	create the api	2016-09-02 22:49:51 +08:00
ibuler	b8bebc9b64	Merge branch 'api' of code.simcu.com:jumpserver/jumpserver into api	2016-09-02 22:24:05 +08:00
ibuler	90ca5a8bb7	start capcha support	2016-09-02 22:23:15 +08:00
ibuler	2c11255828	Add capacha support	2016-09-02 22:21:26 +08:00
ibuler	9803dd9547	Add ico, Modify forget_password	2016-09-02 18:10:26 +08:00
ibuler	dcff84958f	Add run development server script: run_server.py	2016-09-01 23:10:28 +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