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

128 Commits (b5abb175686a407d9cb85c0a9ddf4975f2e25e8b)

Author SHA1 Message Date
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
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