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

291 Commits (218f917f69b486079cfd3449eaeb460bad3002d2)

Author SHA1 Message Date
ibuler b6cd4a20c5 [Bugfix] Data table xss attack 2018-07-08 13:02:43 +08:00
wojiushixiaobai 2950613b69 修改提示文字 2018-06-20 15:58:01 +08:00
BaiJiangJie ee35ca3643 [Feature] 增加功能，安全设置（全局MFA设置，密码强度校验） 2018-06-05 17:26:31 +08:00
ibuler 7de6af89ad [Update] 使用xterm.js替换原来的term.js 2018-05-10 12:19:37 +08:00
BaiJiangjie b5fc76d6a5 [Update] 修改用户首次登录页 2018-04-23 21:04:46 +08:00
BaiJiangjie f450accbf8 [Merge] with dev 2018-04-18 12:49:17 +08:00
BaiJiangjie 0bbfc7433d [Feature] 支持otp 2018-04-18 12:48:07 +08:00
ibuler 823e879432 [Update] 更新节点移动交互 2018-04-13 15:48:10 +08:00
ibuler 84634eb8c0 [Update] 修改Permr认证 2018-04-10 20:29:06 +08:00
ibuler 0b812a03c6 [Bugfix] 修复 ApiUpdateAttr的bug 2018-04-03 10:36:11 +08:00
ibuler 24c4e1df50 [Update] 资产，系统用户，管理用户等支持查看日志 2018-04-02 16:55:39 +08:00
ibuler 7f4f67aa8d [Update] 支持网域 2018-03-23 19:46:46 +08:00
q4speed 4d7fbcc49b 修复文字过长bug 2018-03-14 18:01:37 +08:00
ibuler 25ebb5c442 [Update] 修改一些bug 2018-03-06 17:05:36 +08:00
ibuler bd4f96134f [Update] 修改一些文案 2018-03-04 13:01:33 +08:00
q4speed 66b8e8bcf8 增加隐藏树功能 2018-02-26 16:31:51 +08:00
ibuler 6104acae8f [Update] 资产列表选中和移除资产 2018-02-07 13:39:45 +08:00
ibuler bd4768c147 [Update] 拆分asset api module 2018-02-06 18:32:02 +08:00
ibuler 2d3967872b [Feature] 完成资产授权和资产添加 2018-02-02 17:06:08 +08:00
ibuler 2bc5e882fd [Update] 更改授权规则前commit 2018-02-01 15:06:44 +08:00
ibuler 017c3ae36a [Update] 修改ztrr 2018-02-01 01:03:31 +08:00
ibuler 3603b33a42 [Feature] 添加资产树 2018-01-31 10:46:26 +08:00
ibuler 9e09a962af [Feature] 支持popover 2018-01-30 18:07:51 +08:00
ibuler b0fab2453a [Merge] 合并标签功能 2018-01-26 15:49:09 +08:00
ibuler cb902362b5 [Feature] 资产列表标签搜索 2018-01-26 14:47:10 +08:00
ibuler a976475617 [Update] 修改禁止排序的颜色 2018-01-23 17:11:26 +08:00
ibuler 579e74dd5d [Bugfix] 修复一些bug 2018-01-23 12:22:25 +08:00
ibuler cad07434ff add logo test 2018-01-23 11:11:20 +08:00
ibuler 2f136800c7 [Update] 修改默认头像和logo 2018-01-22 23:47:41 +08:00
ibuler dad21cadb3 [Update] check all 只选择当前页面 2018-01-15 18:32:07 +08:00
ibuler 7e2d627d3f [Bugfix] 资产列表选择别的页会报错 2018-01-15 18:14:58 +08:00
ibuler b2f97a263d [Feature] 添加后端paging 2018-01-15 17:41:49 +08:00
ibuler abb1a40a4f [Feature] 添加basic settings 2018-01-12 15:43:26 +08:00
ibuler b49e3b8f84 [Update] api 返回platform, 并增加web terminal nav 2018-01-10 19:39:22 +08:00
q4speed 576ddbf673 修复全选按钮在搜索后仍然选择全部的问题 2018-01-10 17:56:50 +08:00
q4speed 7f3d32a876 Merge remote-tracking branch 'origin/dev' into dev 2018-01-10 16:42:57 +08:00
q4speed 6d7b596854 修改tab样式 2018-01-10 16:42:30 +08:00
ibuler 07a70311df [Bugfix] 修复以下bug 
- 删除用户报错，上次更新带来的
- 管理员用户页面会看到所有主机的，而不是授权给自己的
- 授权详情页面 资产显示无效
 2018-01-08 11:22:19 +08:00
ibuler afce4c81a8 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2018-01-05 14:56:50 +08:00
q4speed 9a2fbba956 修改访问官网链接 2018-01-03 15:07:46 +08:00
ibuler a327c46229 Merge remote-tracking branch 'github/dev' into dev 2018-01-02 19:37:56 +08:00
q4speed 25fa392dda 修复图片高度和大小 2018-01-02 17:51:25 +08:00
q4speed ad3297ff2f 显示个人头像 2018-01-02 17:40:49 +08:00
q4speed ab27d1c193 修改菜单折叠起来时Logo 2018-01-02 17:31:20 +08:00
q4speed 8160425672 修改Logo 2018-01-02 17:07:00 +08:00
ibuler 68ccec6b9c [UPdate] 修改cookie设置 2018-01-02 17:02:03 +08:00
ibuler 3b6403b2f2 [Update] 修改一些翻译 2018-01-01 15:08:33 +08:00
ibuler c48531c586 [Update] 添加和修改部分翻译 2018-01-01 00:45:12 +08:00
ibuler 0b299344a7 [Update] 修改database 表现 2017-12-31 12:20:08 +08:00
ibuler 13b610c140 [Change] 仅点击checkbox选中 2017-12-31 11:14:02 +08:00
ibuler e20444983d [Bugfix] 修改html bug 2017-12-28 12:25:43 +08:00
ibuler bf9bb1b973 [Update] 修改ops task运行 2017-12-24 18:53:07 +08:00
ibuler 76df1de634 [Bugfix] 修复一些明显的bug 2017-12-21 11:31:13 +08:00
ibuler a308000d2e [Bugfix] 修改users模块一些bug 2017-12-18 18:38:30 +08:00
ibuler 17ddb3bbbd [Feture] 使用信号解耦 2017-12-13 17:21:08 +08:00
ibuler 722863428d [Feature] 添加context_processor 2017-12-12 14:28:12 +08:00
ibuler 99b4c66b5e [Feature] 添加signals 解耦代码 2017-12-12 12:19:45 +08:00
ibuler cbc000696e [Feature] 修改adminuser systemuser cluster及他们的关系 2017-12-11 17:08:43 +08:00
ibuler 034f0a02b1 Update terminal api 2017-10-31 11:34:20 +08:00
ibuler 6903e05af1 [Bugfix] Remove pdfmake js 404 2017-09-25 21:55:48 +08:00
GuangHongwei 458989328e [Bugfix] 修改bug，使用py3编程 2017-05-15 23:39:54 +08:00
ibuler 92ebe85a3f [Fixture] 详情页添加system user 推送 2017-04-05 19:09:51 +08:00
ibuler 0983f294b7 [Fixture] 添加用户profile 2017-03-30 00:51:36 +08:00
ibuler b055144908 Merge with audits 2017-03-01 15:35:11 +08:00
ibuler a79c3dd156 [Fixture] 添加command log backends, 未来支持es 2017-02-06 23:13:27 +08:00
xiaokong1937@gmail.com f3647ea46d user-profile page 2017-01-25 21:19:16 +08:00
ibuler 0869931e67 [Bugfix] 修改了一些issue上的bug 2017-01-20 20:13:22 +08:00
ibuler 8658675f67 [Bugfix] 重命名applications导致api请求content_type不对 2017-01-09 23:12:32 +08:00
ibuler 775cd523eb Update app terminal name to applications 2016-12-25 23:10:53 +08:00
yumaojun03 046c7e21e9 Merge remote-tracking branch 'origin/master' into ops_dev 
# Conflicts:
#	requirements.txt
 2016-12-19 23:55:54 +08:00
yumaojun03 b348f7f1ce 添加了部分cron的list页面 2016-12-14 09:54:16 +08:00
ibuler d8a229c09b to Commpany 2016-11-25 08:39:24 +08:00
ibuler 205c11dfba Finish list paganation 2016-11-18 12:00:23 +08:00
ibuler a5e487441f prepare change api name 2016-11-16 17:38:03 +08:00
ibuler bd882c8bef User group detail 2016-11-15 00:48:48 +08:00
ibuler 8d358a7a68 UPdate some 2016-11-14 19:28:21 +08:00
ibuler 69f2bf664b Finish user permission revoke 2016-11-10 16:59:50 +08:00
ibuler 47090eb0f7 update some user api 2016-11-09 23:49:10 +08:00
ibuler 8d7759d22f change user api 2016-11-09 19:29:15 +08:00
ibuler 072da114db Finish system user list 2016-11-06 22:45:26 +08:00
ibuler 41337d28c3 add proxy log search 2016-11-05 01:15:25 +08:00
ibuler f437d3f883 update 2016-11-03 19:42:47 +08:00
ibuler f1dfba6a93 Update some asset issues 2016-10-31 19:31:56 +08:00
ibuler 688bfa556c Merge with audits 2016-10-27 23:04:02 +08:00
ibuler c0de35a683 Add layer and layer open command log 2016-10-27 00:52:44 +08:00
ibuler 5d3f9b4a03 Add command list 2016-10-26 19:10:14 +08:00
ibuler c2aab50c7b Add proxy log list 2016-10-25 23:23:01 +08:00
江世峰 f88c149076 asset:add assets_bulk 2016-10-25 02:16:20 +08:00
ibuler 6a510dad6c Update some bug 2016-10-24 19:32:53 +08:00
江世峰 80baecc8be Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver 
Merge
 2016-10-21 21:15:04 +08:00
江世峰 73f0199dc0 asset:add assets_bulk 2016-10-21 21:14:49 +08:00
ibuler 45dcb26123 Merge branch 'audits' 2016-10-19 15:14:07 +08:00
ibuler 303659cb0e Change app name apps => terrminal 2016-10-17 15:24:41 +08:00
江世峰 4e1f9c97a5 asset:update assets_list by tag 2016-10-16 22:35:25 +08:00
ibuler 4531157c72 may be some wrong 2016-10-16 22:12:13 +08:00
江世峰 abe09e2a85 asset:update assets_list by tag 2016-10-14 19:28:58 +08:00
江世峰 73f5891f87 asset:update assets_list by tag 2016-10-12 18:57:51 +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 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
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 4925f3227a update .gitignore 2016-09-24 21:57:24 +08:00
xiaoyu af713672fb user list page bulk action 2016-09-22 16:06:46 +08:00
ibuler ce5950ca73 Merge with asset 2016-09-20 00:43:30 +08:00
江世峰 6c7e51041f update assets_group 2016-09-19 18:01:13 +08:00
江世峰 98757aa428 update assets_group 2016-09-19 17:25:41 +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 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
ibuler 766bd3b76d Move js to jumpserver.js 2016-09-15 13:09:24 +08:00
ibuler bb8852d57e Modify some style 2016-09-15 12:20:53 +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
xiaokong1937@gmail.com 6751c5a63a reset user password and ssh pk implement 2016-09-13 21:45:10 +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 d8e6433404 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver 2016-09-07 20:06:01 +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
xiaoyu c6f875c517 temp commit 2016-09-06 16:40:44 +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 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 bb76f6c652 Add api authentication 2016-08-25 19:29:59 +08:00
ibuler 3c3fda8064 Change chosen To select2 lib 2016-08-23 14:44:06 +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 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 35abf16f7d Modify panel color 2016-08-17 00:22:33 +08:00
ibuler 7a8d4a3a59 Add delete view 2016-08-16 22:13:06 +08:00
ibuler 234684c875 Rename dir name dashboard to apps 
It's may be well
 2016-08-13 21:59:08 +08:00