github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
4,425 Commits
70 Branches
249 Tags
114 MiB
Commit Graph

4425 Commits (3c7fa1b60b88680eb5bc8041da31a55466811d9e)

Author SHA1 Message Date
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
BaiJiangJie ec0cf38c3c
Merge pull request #3262 from jumpserver/dev_trans 
Dev trans
 2019-09-24 11:14:27 +08:00
BaiJiangJie 62e21d9fc0 [Update] 添加翻译 2019-09-24 11:13:37 +08:00
BaiJiangJie e7cafe86d1 [Update] 添加 js 翻译 2019-09-24 11:10:02 +08:00
BaiJiangJie df429d56d5
V52 (#3158) (#3261) 
* [Update] 优化切换组织时重定向页面逻辑 (#3133)

* [Update] 优化切换组织时重定向页面逻辑

* [Update] 优化切换组织时重定向页面逻辑 2

* [Update] WebTerminal 跳转添加时间戳

* [Update] 修复创建授权规则授权节点时，系统用户不自动推送的问题
 2019-09-24 10:57:27 +08:00
BaiJiangJie 39dfbc734e
[Bugfix] 修复页面中点击删除按钮时，提示 name 信息为 undefined 的问题 (#3259) 
* [Bugfix] 修复页面中点击删除按钮时，提示 name 信息为 undefined 的问题

* [Bugfix] 修复页面中点击删除按钮时，提示 name 信息为 undefined 的问题 2
 2019-09-23 20:36:49 +08:00
BaiJiangJie 9428c186b3
Merge pull request #3258 from jumpserver/dev_ak 
Dev ak
 2019-09-23 20:13:06 +08:00
BaiJiangJie 6db57424aa [Bugfix] 修改 API key table 的前端变量名 ak_table 2019-09-23 20:11:48 +08:00
BaiJiangJie 7dc8b128d6 [Bugfix] 修复 API Key table 加载时报错（在日志审计模块中） 2019-09-23 20:05:01 +08:00
BaiJiangJie 0ed08c2f4c [Update] 修改 API Key 页面显示布局 2019-09-23 19:43:47 +08:00
BaiJiangJie afdf0062eb
Merge pull request #3257 from jumpserver/dev_perms 
[Update] 添加资产授权规则 generate_fake 方法
 2019-09-23 18:37:10 +08:00
BaiJiangJie fad842a8a0 [Update] 添加资产授权规则 generate_fake 方法 2019-09-23 18:36:02 +08:00
BaiJiangJie 02944d407c
Merge pull request #3256 from jumpserver/dev_i18n 
[Update] 添加翻译
 2019-09-23 16:50:03 +08:00
BaiJiangJie ddb34a0f59 [Update] 添加翻译 2019-09-23 16:48:59 +08:00
BaiJiangJie 1603d0f146
Merge pull request #3254 from jumpserver/dev_hostname 
[Update] 资产主机名提示、限制不被允许的特殊字符
 2019-09-23 16:40:06 +08:00
BaiJiangJie 1cba714b00 [Update] 资产主机名提示、限制不被允许的特殊字符 2019-09-23 16:37:08 +08:00
BaiJiangJie ef122ec169
Merge pull request #3253 from jumpserver/dev_session 
[Update] Session protocol 添加 telnet 选项
 2019-09-23 15:35:56 +08:00
BaiJiangJie b5f94d84f7 [Update] Session protocol 添加 telnet 选项 2019-09-23 15:31:09 +08:00
ibuler 471ed51360 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2019-09-23 14:42:03 +08:00
ibuler 86c5a0ba8b [Update] 去掉一些filter 2019-09-23 14:41:34 +08:00
BaiJiangJie 6f4d7dd6c6
Merge pull request #3251 from jumpserver/dev_bugfix 
[Bugfix] 修复改密计划菜单不高亮的问题
 2019-09-23 10:46:31 +08:00
BaiJiangJie 76e2f750ce [Bugfix] 修复改密计划菜单不高亮的问题 2019-09-23 10:45:28 +08:00
ibuler f15dc881b6 [Update] 修改requirements 2019-09-20 21:05:11 +08:00
BaiJiangJie fa7150850f
Merge pull request #3243 from jumpserver/gather_asset_user 
[Feature] 收集资产用户
 2019-09-20 12:41:04 +08:00
ibuler 6fc666e60d [Update] 优化获取系统用户 2019-09-19 22:12:53 +08:00
ibuler 89fa0658e1 [Update] 修改任务执行 2019-09-19 21:21:05 +08:00
ibuler 847e37e641 [Update] 修改一些bug 2019-09-19 17:27:49 +08:00
ibuler b7021b5ecb [Update] 支持收集资产上的用户 2019-09-19 14:48:25 +08:00
ibuler 5464c884db [Update] 修改swagger 2019-09-18 22:06:46 +08:00
BaiJiangJie dea9151abd
Merge pull request #3242 from jumpserver/v52_config 
[Update] OpenID 认证共享session配置默认值修改为 True
 2019-09-18 20:23:24 +08:00
BaiJiangJie 737f0bc512
Merge pull request #3241 from jumpserver/dev_config 
[Update] OpenID 认证共享session配置默认值修改为 True 2
 2019-09-18 20:22:35 +08:00
BaiJiangJie 36d8eebecf [Update] OpenID 认证共享session配置默认值修改为 True 2 2019-09-18 20:20:52 +08:00
BaiJiangJie ecd3317428 [Update] OpenID 认证共享session配置默认值修改为 True 2019-09-18 20:19:30 +08:00
BaiJiangJie fe5dfcf73f
Merge pull request #3240 from jumpserver/dev_config 
[Update] OpenID 认证共享session配置默认值修改为 True
 2019-09-18 20:17:12 +08:00
BaiJiangJie 9bfee3fce2 [Update] OpenID 认证共享session配置默认值修改为 True 2019-09-18 20:14:49 +08:00
BaiJiangJie c4bd35bb8a
Merge pull request #3239 from jumpserver/dev_ra 
[Update] 远程应用授权列表添加系统用户数量显示
 2019-09-18 18:40:52 +08:00
BaiJiangJie 9925a270e1 [Update] 远程应用授权列表添加系统用户数量显示 2019-09-18 18:39:07 +08:00