github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
3,098 Commits
64 Branches
246 Tags
104 MiB
Commit Graph

424 Commits (b0710c42b03f11855efaf69969f41942acc467ce)

Author SHA1 Message Date
ibuler 4531157c72 may be some wrong 2016-10-16 22:12:13 +08:00
ibuler 9960a6cd21 Plan create a new app: terminal 2016-10-15 17:14:56 +08:00
ibuler 0446f449e9 Add auth and permission backends 2016-10-15 16:04:54 +08:00
ibuler a62a2178d0 Add user backend 2016-10-15 00:49:59 +08:00
ibuler 0c8922e30f Modify some bug 2016-10-09 19:27:49 +08:00
ibuler 0954f6d7e8 Add audits api 2016-10-09 00:12:18 +08:00
ibuler 59727656c3 Update table desgin doc and audit log 2016-10-07 23:54:29 +08:00
ibuler 6b6105491c Add migrations 2016-10-02 22:13:08 +08:00
ibuler 45df58114c Merge branch 'connect' 2016-10-02 21:45:44 +08:00
ibuler a04d772501 Merge with master 2016-10-02 21:45:26 +08:00
xiaokong1937@gmail.com 6856fad0c0 integrate the user-group list page with its api; 2016-10-02 11:09:27 +08:00
xiaokong1937@gmail.com d40aa49d8c user bulk import through Excel and close #20 2016-10-01 20:26:43 +08:00
xiaokong1937@gmail.com 05e961f29f user-group detail: fix #15 2016-09-30 20:50:40 +08:00
xiaokong1937@gmail.com d8143a67cd user-group-detail: user-adding frontend integration 2016-09-29 21:14:55 +08:00
ibuler acf51238d0 Modify ssh server bug for using public key 2016-09-29 18:01:26 +08:00
xiaoyu e7fddf80ae user-group-detail: add users support 2016-09-29 16:41:55 +08:00
xiaokong1937@gmail.com f9b49605e4 user-group detail page: users op 2016-09-28 21:11:43 +08:00
xiaokong1937@gmail.com 2522f0d80f trivial changes: refactor the jumpserver DataTable api 2016-09-27 21:28:02 +08:00
xiaokong1937@gmail.com 70a6ddc897 fix #27 2016-09-27 20:16:46 +08:00
xiaokong1937@gmail.com 49f007601f add user-list-delete support for user-group detail page 2016-09-26 21:22:48 +08:00
xiaokong1937@gmail.com 74cdd2d0f3 user list groups bulk update 2016-09-26 19:39:43 +08:00
xiaoyu 15dcc760b4 user list bulk update modal 2016-09-26 16:33:10 +08:00
xiaoyu d2197d99c2 fix #26 2016-09-26 11:30:43 +08:00
ibuler cfef374454 Update ssh server 2016-09-25 00:11:31 +08:00
ibuler 7ab47916f2 add __init__.py 2016-09-24 22:12:49 +08:00
ibuler 283c53fddf Update gitignore 2016-09-24 22:11:53 +08:00
ibuler da56310db9 update .gitignore 2016-09-24 22:09:20 +08:00
ibuler 4925f3227a update .gitignore 2016-09-24 21:57:24 +08:00
ibuler 88bb620af2 Modify ignore 2016-09-24 11:50:25 +08:00
xiaoyu 22163173fe user bulk delete view 2016-09-23 16:30:59 +08:00
xiaoyu af713672fb user list page bulk action 2016-09-22 16:06:46 +08:00
xiaoyu 515406c05d temp: deactive test 2016-09-21 16:43:41 +08:00
xiaoyu 61d1d9ec90 temp 2016-09-21 15:48:21 +08:00
ibuler 220892824c Finish some bug 2016-09-20 01:13:50 +08:00
ibuler ce5950ca73 Merge with asset 2016-09-20 00:43:30 +08:00
xiaokong1937@gmail.com 65461a09a7 user-group edit implement 2016-09-19 21:08:08 +08:00
xiaoyu 9a81057d95 fix a typo 2016-09-19 15:51:28 +08:00
xiaoyu f00da20764 user-group delete implement 2016-09-19 15:47:58 +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 502c7e756b Modify asset 2016-09-17 23:43:41 +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
ibuler 06b2c623cb Modify some bug 2016-09-16 17:23:47 +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 0f9bdab108 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver 2016-09-14 15:40:47 +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
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
ibuler 324bb68667 user-pserm 2016-09-11 16:59:19 +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
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 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 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
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
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
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
ibuler 8aa92bb688 Add api: UserApi And UserGroupApi 2016-08-24 19:42:16 +08:00
ibuler 1d5faa3101 Delete Model: Role 2016-08-24 17:14:21 +08:00
ibuler b97b34961c Modify api: complete some setting 2016-08-24 12:29:19 +08:00
ibuler a43ac90b21 Modify CRLF to LF 2016-08-24 00:13:58 +08:00
ibuler 6458231946 Add api file 2016-08-24 00:11:13 +08:00
ibuler a99a6b6946 Split tests file in tests module 2016-08-23 22:19:39 +08:00
ibuler c37dea2079 Add user add view Test Case 2016-08-23 19:36:15 +08:00
ibuler 1f3c0d004f Change update batch, add _list_base.html 2016-08-23 17:14:08 +08:00
ibuler 3c3fda8064 Change chosen To select2 lib 2016-08-23 14:44:06 +08:00
ibuler ae9bbb40fd Add flash message template 2016-08-23 12:18:19 +08:00
ibuler 8e5e788bcd Test case added 2016-08-23 00:39:07 +08:00
ibuler f45690b34f Add test case 2016-08-22 19:53:01 +08:00
ibuler f0b0e41d33 Update user edit 2016-08-21 22:37:55 +08:00
wangyong 3771b2ff70 add asset detail and list 2016-08-21 22:12:17 +08:00
ibuler 8b0f31c43a modify list, edit url error 2016-08-21 21:32:20 +08:00
ibuler 8ba7b078fd Finish expaire date 2016-08-21 21:31:25 +08:00
ibuler 57f0b04387 Modify project statucure guide and init data 2016-08-21 20:59:39 +08:00
ibuler 85cf2169d4 Modify readme 2016-08-21 13:59:44 +08:00
ibuler 0427d406b9 Add init data file 2016-08-21 01:16:30 +08:00
ibuler e355c7b8ef Modify pagination and Role model 2016-08-20 18:33:18 +08:00
ibuler 6e46a17d98 Useradd group change 2016-08-20 00:42:50 +08:00
ibuler e48f36397e Modify url 2016-08-20 00:18:44 +08:00
ibuler cf15b7eaff Add UserGroup some View 2016-08-19 01:39:08 +08:00
ibuler 651e89994e modify list and sort 2016-08-18 22:29:35 +08:00
ibuler 342298ad3e reslove conflict 2016-08-18 14:43:10 +08:00
ibuler a76191ffdc Change view detail template 2016-08-18 10:20:37 +08:00
ibuler 279987925a Modify user detail of usergroup 2016-08-18 00:47:34 +08:00
ibuler 824b1c7f6f update user update view 2016-08-17 22:17:16 +08:00
ibuler bcae7beae6 upload avatar 2016-08-17 00:36:54 +08:00
ibuler 9353022627 add context 2016-08-17 00:23:52 +08:00
ibuler 35abf16f7d Modify panel color 2016-08-17 00:22:33 +08:00
ibuler c14eb42186 reslove conflict add user detail template 2016-08-17 00:14:56 +08:00
ibuler 98d6043f2d merged 2016-08-16 23:25:30 +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
广宏伟 e3223f745a app users 
Modify user list view
Modify user add view
 2016-08-15 21:10:30 +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 9303415b89 modify some issues 2016-08-14 00:40:21 +08:00
ibuler 234684c875 Rename dir name dashboard to apps 
It's may be well
 2016-08-13 21:59:08 +08:00