Commit Graph

4358 Commits (ed5b2f8bf817734d4eaa974842f30f85a7f489df)
 

Author SHA1 Message Date
ibuler ed5b2f8bf8 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler d85c893e3a [update] 修改默认监听的端口
5 years ago
ibuler 2c46707c2b [Update] 修改websocket监听端口
5 years ago
BaiJiangJie 2ff295e3b2
Merge pull request #3292 from jumpserver/dev_bai
5 years ago
ibuler c96d165d3f Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
老广 cff009e758
Support ws (#3291)
5 years ago
BaiJiangJie e3c68071b9 [Update] Merge local branch dev to dev_bai
5 years ago
BaiJiangJie ffc8ddd92e
Merge pull request #3289 from jumpserver/v52_ldap_page
5 years ago
BaiJiangJie 587e3fdd74 [Update] LDAP 搜索分页配置默认值修改为1000
5 years ago
BaiJiangJie e4ecb19e38 [Update] LDAP 测试连接性也使用分页配置
5 years ago
BaiJiangJie 25fcbf37c3 [Update] LDAP 导入搜索添加分页配置
5 years ago
ibuler 408b27c561 [Update] Add krb-devel
5 years ago
ibuler e35ba52236 [Update] 修改jms-storage依赖版本
5 years ago
ibuler b75c525df7 [Update] 添加到 gcc到依赖,避免忘记安装
5 years ago
ibuler 77682611c1 [Update] 添加到wget gcc到依赖,避免忘记安装
5 years ago
ibuler 865cc30d16 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
老广 c75fd3c108
Bugfix (#3286)
5 years ago
ibuler 4b322fe9f6 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
老广 f87db2f4fc
Bugfix (#3284)
5 years ago
ibuler 78aba7ae87 [Update] 用户资产页面链接是 新窗口打开
5 years ago
八千流 3c12c33911 [Update] 修改当仅是当前组织审计员时,隐藏终断会话按钮 (#3275)
5 years ago
老广 118fc8c42f
Dev beta (#3281)
5 years ago
老广 9f56ac8a21
[Update] 修改可能导致的树创建问题 (#3280)
5 years ago
BaiJiangJie a8c2a348aa
Merge pull request #3279 from jumpserver/dev_asset
5 years ago
BaiJiangJie d7bc8516ff [Update] 修改资产主机名允许输入中文3
5 years ago
BaiJiangJie 26ef7b7be3
[Update] 修改资产主机名允许输入中文 (#3278)
5 years ago
老广 d3d72f85fd
[Update] 修改启动的参数,修改inventory参数名称 (#3276)
5 years ago
BaiJiangJie 40ce9256fc
Merge pull request #3274 from jumpserver/v52
5 years ago
BaiJiangJie a6d87f6de4
Merge pull request #3273 from jumpserver/v52_ldap
5 years ago
BaiJiangJie b2836b9f4f [Bugfix] 修复 LDAP 用户导入会重复显示的问题(场景:AD 用户在多个 OU 下面)
5 years ago
BaiJiangJie 864bcb27ca
Merge pull request #3270 from jumpserver/dev_v52
5 years ago
ibuler 47abac000e [Merge] with v52
5 years ago
BaiJiangJie 326f2160d5
Merge pull request #3268 from jumpserver/v52_bugfix
5 years ago
ibuler 0a13b4bb99 [Update] 修复密码匣子的bug
5 years ago
BaiJiangJie 02087e00fa
Merge pull request #3267 from jumpserver/dev_ra
5 years ago
BaiJiangJie e805e9cede [Update] 优化用户授权的 RemoteApp API 过滤逻辑
5 years ago
BaiJiangJie 3f9e2f0af7 [Bugfix] 用户远程应用页面,连接远程应用传递 type 参数
5 years ago
BaiJiangJie ffb4a26215
Merge pull request #3266 from jumpserver/bugfix
5 years ago
ibuler 5055a9f352 [Update] 修改获取资产的逻辑
5 years ago
ibuler 28afd1f6f9 [Update] 修改正则表达式
5 years ago
BaiJiangJie 11f710b30a
Merge pull request #3265 from jumpserver/dev_v
5 years ago
BaiJiangJie b8b4cc2621 [Update] 修改获取 jumpserver.js 的递增值
5 years ago
BaiJiangJie 0078089cdf [Update] 修改版本号 1.5.3
5 years ago
BaiJiangJie 715c9a1242
Merge pull request #3264 from jumpserver/dev_bai
5 years ago
BaiJiangJie d5af966623 [Update] Merge branch 'master' into dev_bai
5 years ago
BaiJiangJie cbfcc75c82
Merge pull request #3263 from jumpserver/dev_bugfix
5 years ago
BaiJiangJie 08a19550b2 [Bugfix] 修复资产授权规则去重
5 years ago
BaiJiangJie ec0cf38c3c
Merge pull request #3262 from jumpserver/dev_trans
5 years ago
BaiJiangJie 62e21d9fc0 [Update] 添加翻译
5 years ago
BaiJiangJie e7cafe86d1 [Update] 添加 js 翻译
5 years ago