github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
4,218 Commits
96 Branches
262 Tags
144 MiB
Commit Graph

4218 Commits (d8e5c648267ed17a56a4524e4b68f1cd119efccc)

Author SHA1 Message Date
Eric_Lee d8e5c64826 fix web sftp select all items display (#3162) 2019-08-26 19:09:53 +08:00
老广 ede7365da8
[Update] remote app tree添加 User (#3159) 2019-08-26 12:15:29 +08:00
BaiJiangJie 57eed7fab6
Merge pull request #3157 from jumpserver/v52_perms 
[Update] 修复创建授权规则授权节点时，系统用户不自动推送的问题
 2019-08-26 11:56:40 +08:00
BaiJiangJie fb94050732 [Update] 修复创建授权规则授权节点时，系统用户不自动推送的问题 2019-08-26 11:54:20 +08:00
BaiJiangJie f47f8a66fe
Merge pull request #3148 from jumpserver/v52_luna 
[Update] WebTerminal 跳转添加时间戳
 2019-08-22 12:40:40 +08:00
BaiJiangJie f6722c5a26 [Update] WebTerminal 跳转添加时间戳 2019-08-22 12:39:32 +08:00
BaiJiangJie 48826a9ad9
[Update] 优化切换组织时重定向页面逻辑 (#3133) 
* [Update] 优化切换组织时重定向页面逻辑

* [Update] 优化切换组织时重定向页面逻辑 2
 2019-08-16 16:33:05 +08:00
BaiJiangJie 7d1e8d258c
Merge pull request #3128 from jumpserver/v52_remoteapp 
[Bugfix] 修复remote-app应用创建/更新时，参数设置不成功的bug
 2019-08-15 19:09:29 +08:00
BaiJiangJie 50f50a4f28 [Bugfix] 修复remote-app应用创建/更新时，参数设置不成功的bug 2019-08-15 19:08:04 +08:00
BaiJiangJie 10de4f4ef8
Merge pull request #3126 from jumpserver/v52_manager 
[Update] 修复资产用户管理器获取 __name__ 的问题
 2019-08-15 15:28:40 +08:00
BaiJiangJie 214b4026ec [Update] 修复资产用户管理器获取 __name__ 的问题 2019-08-15 15:26:14 +08:00
老广 a5e59e6787
Merge pull request #3121 from jumpserver/dev 
Dev
 2019-08-14 20:26:46 +08:00
ibuler 907d93bcad [Update] 还原一些 2019-08-14 20:26:05 +08:00
ibuler c84df42ff4 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2019-08-14 20:23:26 +08:00
ibuler 8fb0d6315d [Update] 修改导入bug 2019-08-14 20:23:02 +08:00
BaiJiangJie 72e746181f
Merge pull request #3118 from jumpserver/dev_perms 
[Update] 优化资产授权详情页面，添加系统用户后自动reload页面
 2019-08-14 18:00:14 +08:00
BaiJiangJie a10fa3c55b [Update] 优化资产授权详情页面，添加系统用户后自动reload页面 2019-08-14 17:59:11 +08:00
老广 d0633adc38
Merge pull request #3109 from KubeOperator/patch-1 
Update README.md
 2019-08-12 19:15:04 +08:00
老广 d8ee6d6092
Merge pull request #3110 from jumpserver/dev 
[Update] 修改nodes
 2019-08-12 19:14:08 +08:00
ibuler a315df29ca [Update] 暂时不更改这里逻辑 2019-08-12 19:11:32 +08:00
ibuler 2e9711ae8a [Update] 修改nodes 2019-08-12 19:03:10 +08:00
KubeOperator 75f66a3809
Update README.md 2019-08-12 19:01:18 +08:00
老广 fff9f31913
Merge pull request #3108 from jumpserver/dev 
Dev
 2019-08-12 17:45:34 +08:00
老广 ef73469d5d
Merge pull request #3107 from jumpserver/bugfix 
[Update] 修改避免每次刷新asset user的可连接性
 2019-08-12 17:42:35 +08:00
ibuler 05e4e7301c [Update] 修改避免每次刷新asset user的可连接性 2019-08-12 17:41:18 +08:00
老广 2d7d9d4de7
Merge pull request #3105 from jumpserver/bugfix 
Bugfix
 2019-08-12 17:14:50 +08:00
ibuler fdef282c57 [Bugfix] 修复批量更新用户的bug, 导出字段添加 * 2019-08-12 17:05:01 +08:00
老广 39528a935b
Merge pull request #3100 from jumpserver/elfinder_theme 
fix selected item display bug
 2019-08-09 16:40:18 +08:00
Eric 22b0b77b83 fix selected item display bug 2019-08-09 16:13:31 +08:00
ibuler a188968e5d [Update] 修复Model过长的bug 2019-08-08 19:04:50 +08:00
ibuler 3c9814191d [Update] 修改缩进 2019-08-08 18:33:48 +08:00
ibuler 785b375f4a [Bugfix] 修复授权列表用户无法搜索的bug 2019-08-08 18:32:44 +08:00
ibuler fbfbfcc274 [Update] 修复磁盘显示单位问题 2019-08-08 17:59:51 +08:00
ibuler 42ff5a382a [Update] 修改设置session的时间，避免sdk等报错 2019-08-08 15:14:08 +08:00
老广 acc03f14dd
Merge pull request #3094 from jumpserver/dev 
Dev
 2019-08-08 14:27:45 +08:00
ibuler 0ee5d3b79f [Update] Add to english readme 2019-08-08 14:26:01 +08:00
ibuler 53a5c53857 [Update] 添加访问数量 2019-08-08 14:24:37 +08:00
老广 e14bbb2698
Merge pull request #3093 from jumpserver/allow_show_all_nodes 
[Update] 控制是否显示未分组节点
 2019-08-08 13:38:19 +08:00
ibuler 6b56c43a3a [Update] 控制是否显示未分组节点 2019-08-08 13:03:03 +08:00
老广 d222376b1f
Merge pull request #3075 from jumpserver/dev 
Dev
 2019-08-05 10:15:20 +08:00
ibuler c3a206b291 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2019-08-05 10:01:33 +08:00
ibuler afffb50b94 [UPdate] 修改手动模式问题 2019-08-05 10:01:03 +08:00
老广 45e06d215e
Merge pull request #3071 from jumpserver/i18n 
修改elfinder中文翻译
 2019-08-02 19:51:42 +08:00
Eric 2208320049 修改elfinder中文翻译 2019-08-02 19:49:25 +08:00
BaiJiangJie af2b6742cf
Merge pull request #3066 from jumpserver/dev 
Dev
 2019-08-01 17:13:53 +08:00
BaiJiangJie 4254775149
Bugfix (#3065) 
* [Update] 修复浏览器关闭后session不失效的问题

* [Update] 修改一些内容

* [Update] 解决命令执行找不到对象的问题

* [Update] 修改Permission判断

* [Update] 修改session

* [Update] 修改创建系统用户时没有public key
 2019-08-01 17:10:02 +08:00
BaiJiangJie 44d41e86c9
Merge pull request #3059 from jumpserver/dev_users 
[Update] 添加用户过期邮件提醒
 2019-07-31 17:07:27 +08:00
BaiJiangJie 586d6e6abb [Update] 添加用户过期邮件提醒 2019-07-31 16:57:21 +08:00
BaiJiangJie 9ab6c58676
Merge pull request #3055 from jumpserver/dev_login 
[Update] 用户登录失败次数提示
 2019-07-30 19:12:39 +08:00
BaiJiangJie 3d9c0a212e [Update] 用户登录失败次数提示 2019-07-30 19:10:06 +08:00