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

6161 Commits (c047ee07809e56e854d497d4d8b745849fa7c9d1)

Author SHA1 Message Date
ibuler ed5b2f8bf8 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2019-09-27 10:36:25 +08:00
ibuler d85c893e3a [update] 修改默认监听的端口 2019-09-27 10:36:06 +08:00
ibuler 2c46707c2b [Update] 修改websocket监听端口 2019-09-27 10:20:20 +08:00
BaiJiangJie 2ff295e3b2
Merge pull request #3292 from jumpserver/dev_bai 
[Update] LDAP 搜索添加分页配置
 2019-09-26 19:23:12 +08:00
ibuler c96d165d3f Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2019-09-26 19:22:32 +08:00
老广 cff009e758
Support ws (#3291) 
* [Update] add ws support

* [Update] 修改log使用websocket

* [Update] 修复 资产用户 右侧动作菜单，字体颜色

* [Update] 修改Dockerfile

* [Bugfix] 修复settings中WSG_APPLICATION
 2019-09-26 19:22:17 +08:00
BaiJiangJie e3c68071b9 [Update] Merge local branch dev to dev_bai 2019-09-26 19:21:15 +08:00
BaiJiangJie ffc8ddd92e
Merge pull request #3289 from jumpserver/v52_ldap_page 
V52 LDAP Page
 2019-09-26 19:15:28 +08:00
BaiJiangJie 587e3fdd74 [Update] LDAP 搜索分页配置默认值修改为1000 2019-09-26 19:02:26 +08:00
BaiJiangJie e4ecb19e38 [Update] LDAP 测试连接性也使用分页配置 2019-09-26 18:58:39 +08:00
BaiJiangJie 25fcbf37c3 [Update] LDAP 导入搜索添加分页配置 2019-09-26 18:55:20 +08:00
ibuler 408b27c561 [Update] Add krb-devel 2019-09-26 16:35:56 +08:00
ibuler e35ba52236 [Update] 修改jms-storage依赖版本 2019-09-26 15:50:41 +08:00
ibuler b75c525df7 [Update] 添加到 gcc到依赖，避免忘记安装 2019-09-26 15:42:46 +08:00
ibuler 77682611c1 [Update] 添加到wget gcc到依赖，避免忘记安装 2019-09-26 15:42:13 +08:00
ibuler 865cc30d16 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2019-09-26 15:09:21 +08:00
老广 c75fd3c108
Bugfix (#3286) 
* [Update] 用户资产页面链接是 新窗口打开

* [Bugfix] 修复切换组织时， refer为空导致的bug

* [Update] 修复执行命令时报错

* [Bugfix] 修复用户树节点资产数量不对的问题

* [Update] 修改初始化tree
 2019-09-26 15:09:10 +08:00
老广 8387c8dbe4
Merge pull request #3285 from jumpserver/dev 
Bugfix (#3284)
 2019-09-26 10:33:15 +08:00
ibuler 4b322fe9f6 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2019-09-26 10:32:49 +08:00
老广 f87db2f4fc
Bugfix (#3284) 
* [Update] 用户资产页面链接是 新窗口打开

* [Bugfix] 修复切换组织时， refer为空导致的bug

* [Update] 修复执行命令时报错
 2019-09-26 10:32:39 +08:00
ibuler 78aba7ae87 [Update] 用户资产页面链接是 新窗口打开 2019-09-25 18:08:58 +08:00
老广 91f64eccda
Merge pull request #3283 from jumpserver/dev 
Dev
 2019-09-25 17:23:00 +08:00
八千流 3c12c33911 [Update] 修改当仅是当前组织审计员时，隐藏终断会话按钮 (#3275) 
* [Update] 修改会话列表中终断按钮，批量终断，SessionViewSet 的权限控制
 2019-09-25 16:58:40 +08:00
老广 118fc8c42f
Dev beta (#3281) 
* [Update] 修改发送command日志

* [Update] 修复用户树显示资产数量不对的bug
 2019-09-25 16:31:58 +08:00
老广 9f56ac8a21
[Update] 修改可能导致的树创建问题 (#3280) 2019-09-25 16:31:18 +08:00
BaiJiangJie a8c2a348aa
Merge pull request #3279 from jumpserver/dev_asset 
[Update] 修改资产主机名匹配正则表达式
 2019-09-25 15:31:21 +08:00
BaiJiangJie d7bc8516ff [Update] 修改资产主机名允许输入中文3 2019-09-25 15:29:59 +08:00
BaiJiangJie 26ef7b7be3
[Update] 修改资产主机名允许输入中文 (#3278) 
* [Update] 修改资产主机名允许输入中文

* [Update] 修改资产主机名允许输入中文2
 2019-09-25 15:14:43 +08:00
老广 d3d72f85fd
[Update] 修改启动的参数，修改inventory参数名称 (#3276) 2019-09-25 14:40:19 +08:00
BaiJiangJie 40ce9256fc
Merge pull request #3274 from jumpserver/v52 
V52
 2019-09-25 12:38:08 +08:00
BaiJiangJie a6d87f6de4
Merge pull request #3273 from jumpserver/v52_ldap 
[Bugfix] 修复 LDAP 用户导入会重复显示的问题（场景：AD 用户在多个 OU 下面）
 2019-09-25 12:37:27 +08:00
BaiJiangJie b2836b9f4f [Bugfix] 修复 LDAP 用户导入会重复显示的问题（场景：AD 用户在多个 OU 下面） 2019-09-25 12:34:12 +08:00
BaiJiangJie 09565375b5
Merge pull request #3260 from jumpserver/dev 
Dev
 2019-09-24 18:42:16 +08:00
BaiJiangJie 864bcb27ca
Merge pull request #3270 from jumpserver/dev_v52 
Dev v52
 2019-09-24 18:19:26 +08:00
ibuler 47abac000e [Merge] with v52 2019-09-24 18:17:44 +08:00
BaiJiangJie 326f2160d5
Merge pull request #3268 from jumpserver/v52_bugfix 
[Update] 修复密码匣子的bug
 2019-09-24 18:11:52 +08:00
ibuler 0a13b4bb99 [Update] 修复密码匣子的bug 2019-09-24 18:06:50 +08:00
BaiJiangJie 02087e00fa
Merge pull request #3267 from jumpserver/dev_ra 
[Update] 优化用户授权 RemoteApp API 逻辑
 2019-09-24 16:38:36 +08:00
BaiJiangJie e805e9cede [Update] 优化用户授权的 RemoteApp API 过滤逻辑 2019-09-24 16:36:46 +08:00
BaiJiangJie 3f9e2f0af7 [Bugfix] 用户远程应用页面，连接远程应用传递 type 参数 2019-09-24 16:16:52 +08:00
BaiJiangJie ffb4a26215
Merge pull request #3266 from jumpserver/bugfix 
[Update] 修改正则表达式
 2019-09-24 15:31:03 +08:00
ibuler 5055a9f352 [Update] 修改获取资产的逻辑 2019-09-24 15:18:12 +08:00
ibuler 28afd1f6f9 [Update] 修改正则表达式 2019-09-24 15:00:32 +08:00
BaiJiangJie 11f710b30a
Merge pull request #3265 from jumpserver/dev_v 
[Update] 修改版本号
 2019-09-24 13:13:58 +08:00
BaiJiangJie b8b4cc2621 [Update] 修改获取 jumpserver.js 的递增值 2019-09-24 13:12:39 +08:00
BaiJiangJie 0078089cdf [Update] 修改版本号 1.5.3 2019-09-24 13:05:43 +08:00
BaiJiangJie 715c9a1242
Merge pull request #3264 from jumpserver/dev_bai 
Dev bai
 2019-09-24 11:40:56 +08:00
BaiJiangJie d5af966623 [Update] Merge branch 'master' into dev_bai 2019-09-24 11:39:43 +08:00
BaiJiangJie cbfcc75c82
Merge pull request #3263 from jumpserver/dev_bugfix 
[Bugfix] 修复资产授权规则去重
 2019-09-24 11:36:41 +08:00
BaiJiangJie 08a19550b2 [Bugfix] 修复资产授权规则去重 2019-09-24 11:35:57 +08:00