Commit Graph

307 Commits (05a5e9cc69a683a5f0973f7f4df959768a1cf296)

Author SHA1 Message Date
ibuler d323c9df88 Modify asset create 2016-09-19 00:07:52 +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
xiaoyu 8cdc4674d7 update toastr js and close #8 2016-09-18 10:32:23 +08:00
ibuler acfe8950b8 MOdify asset create 2016-09-18 00:10:08 +08:00
ibuler 502c7e756b Modify asset 2016-09-17 23:43:41 +08:00
ibuler 7fd224e690 Merge with user-perm 2016-09-17 19:15:14 +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
wangyong 343f139904 alter asset add and detail 2016-09-17 14:52:14 +08:00
wangyong b95c1deee1 alter asset add and detail 2016-09-17 14:50:14 +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
ibuler e232962649 Update some template 2016-09-16 20:53:10 +08:00
wangyong 42012d7bfe merge master 2016-09-16 17:32:35 +08:00
ibuler 06b2c623cb Modify some bug 2016-09-16 17:23:47 +08:00
wangyong 792908eb35 asset add 2016-09-16 17:23:23 +08:00
ibuler a091036744 Add user permission select 2016-09-16 16:09:11 +08:00
ibuler d9812e2bdb Remove action from asset permission 2016-09-16 09:55:26 +08:00
ibuler 74b8ee8c10 Pre delete action 2016-09-16 09:38:07 +08:00
xiaokong1937@gmail.com db5d04c37f fix #13 2016-09-16 08:45:29 +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 766bd3b76d Move js to jumpserver.js 2016-09-15 13:09:24 +08:00
ibuler b2444c2aca Add fake data to init.json 2016-09-15 12:21:34 +08:00
ibuler bb8852d57e Modify some style 2016-09-15 12:20:53 +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
ibuler a4dc27f073 Finish permissin detail asset list and user list 2016-09-14 23:29:39 +08:00
ibuler 812df7b07b Restore settings.py 2016-09-14 16:52:09 +08:00
unknown c237f82e51 restore settings 2016-09-14 16:10:15 +08:00
unknown e7c20f0707 add assets manage Sweet Alert" 2016-09-14 15:51:09 +08:00
unknown 0f9bdab108 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver 2016-09-14 15:40:47 +08:00
unknown 1005fbabbd add assets manage
Sweet Alert
2016-09-14 15:38:54 +08:00
unknown 8490583d73 add assets manage
Sweet Alert
2016-09-14 15:19:27 +08:00
ibuler 5bca783e12 permission user search 2016-09-14 01:08:26 +08:00
xiaokong1937@gmail.com 6751c5a63a reset user password and ssh pk implement 2016-09-13 21:45:10 +08:00
xiaoyu 00502ce33d trivial js style changes; bugfix for patch method 2016-09-13 16:38:43 +08:00
ibuler 4c4f598552 Finish asset permission detail and add user or user group list 2016-09-13 00:37:24 +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 7b99a33a2f permission update and delete finished 2016-09-11 23:20:14 +08:00
ibuler 6d736d7309 Finish permission create and list 2016-09-11 22:45:24 +08:00
ibuler f558ded5bb Plan delete some view 2016-09-11 20:13:56 +08:00
ibuler 324bb68667 user-pserm 2016-09-11 16:59:19 +08:00
ibuler 70cae93a4b Add user perm model and form 2016-09-11 09:50:42 +08:00
ibuler 627a5825f4 Add user perm 2016-09-10 21:08:10 +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
ibuler 6069b8946b Start asset extend 2016-09-10 00:29:57 +08:00
ibuler c58725dbc0 Finish system user view 2016-09-09 23:19:39 +08:00
ibuler 292179d41d system-user 2016-09-09 21:48:44 +08:00
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 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 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 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 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 5350f83275 Add celery usage more 2016-08-31 16:48:12 +08:00
广宏伟 dd80b94b43 Update README.md 2016-08-31 16:43:44 +08:00
广宏伟 4cbadbd941 Update README.rst 2016-08-31 16:43:18 +08:00
广宏伟 e61341df79 Update README.md to README.rst 2016-08-31 16:33:05 +08:00
ibuler f7ab26a5da Add celery broker 2016-08-31 15:54:04 +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
ibuler ffed46175d update .gitignore 2016-08-30 17:26:33 +08:00
ibuler 31a39be9ea Resolve conflicts 2016-08-30 17:22:06 +08:00
ibuler 2022ca8e10 Add test code 2016-08-30 17:20:39 +08:00
wangyong d0d433db1a add asset_list 2016-08-30 13:50:30 +08:00
yumaojun03 e8d8f7c406 ops: ansible_api add ansible api 2.0 adhoc runner 2016-08-30 13:00:06 +08:00
yumaojun03 f6b2abb1fb add ansible 2.0 2016-08-30 01:16:14 +08:00
ibuler 011c125564 Modify user active api And Add Token authorization 2016-08-30 00:10:27 +08:00
ibuler 1a9f90a08e Modify api 2016-08-29 21:09:32 +08:00
ibuler 3eb4897bd3 Merge branch 'api' of code.simcu.com:jumpserver/jumpserver into api 2016-08-29 19:27:23 +08:00