ibuler
|
fbc948fd7c
|
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
|
2019-07-17 12:54:44 +08:00 |
|
ibuler
|
12b2f2f499
|
[Update] 刷新session有效期
|
2019-07-17 12:54:00 +08:00 |
|
BaiJiangJie
|
37c10c6cf5
|
Merge pull request #2976 from jumpserver/dev
[Update] 解决授权资产显示禁用资产的问题 (#2975)
|
2019-07-17 12:11:40 +08:00 |
|
BaiJiangJie
|
3451c2b418
|
[Update] 解决授权资产显示禁用资产的问题 (#2975)
* [Update] 解决授权资产显示禁用资产的问题
* [Bugfix] 解决资产更新页面取消激活失败的问题
* [Bugfix] 解决资产详情页面禁用资产时会清除协议的问题
* [Bugfix] 解决创建/更新管理用户、系统用户提交密钥错误时报错的问题
|
2019-07-17 12:10:14 +08:00 |
|
BaiJiangJie
|
158e2a9112
|
Merge pull request #2973 from jumpserver/dev
Merge pull request #2972 from jumpserver/dev_bai
|
2019-07-16 19:08:15 +08:00 |
|
BaiJiangJie
|
1c7a09c9e3
|
Merge pull request #2972 from jumpserver/dev_bai
[Update] 修改CommandFilter的system_users字段为不必填
|
2019-07-16 19:05:44 +08:00 |
|
BaiJiangJie
|
28b7768601
|
Merge pull request #2971 from jumpserver/dev_bai
[Update] 修改CommandFilter的system_users字段为不必填
|
2019-07-16 18:49:33 +08:00 |
|
BaiJiangJie
|
d21bb5207b
|
[Update] 修改CommandFilter的system_users字段为不必填
|
2019-07-16 17:55:43 +08:00 |
|
BaiJiangJie
|
7a82c91bc8
|
Merge pull request #2970 from jumpserver/dev
Dev
|
2019-07-16 17:16:03 +08:00 |
|
BaiJiangJie
|
bf2ed21020
|
Merge pull request #2969 from jumpserver/dev_bai
[Update] 修改翻译
|
2019-07-16 17:14:11 +08:00 |
|
BaiJiangJie
|
560be610fe
|
[Update] 修改翻译
|
2019-07-16 17:06:33 +08:00 |
|
BaiJiangJie
|
3d1d652cfb
|
Merge pull request #2968 from jumpserver/dev
Dev
|
2019-07-16 17:00:41 +08:00 |
|
BaiJiangJie
|
f70567f44b
|
Merge pull request #2966 from jumpserver/perms_detail_delete_bug
[Bugfix] 修复资产授权详情页 删除弹出框的权限名显示不对
|
2019-07-16 16:57:26 +08:00 |
|
BaiJiangJie
|
0b9308282f
|
Merge pull request #2967 from jumpserver/dev_bai
[Update] 修改版本号
|
2019-07-16 16:54:43 +08:00 |
|
BaiJiangJie
|
2259bc5ea2
|
[Update] 修改版本号
|
2019-07-16 16:49:43 +08:00 |
|
BaiJiangJie
|
eb93e634e0
|
Merge pull request #2964 from jumpserver/dev
Dev
|
2019-07-16 15:42:23 +08:00 |
|
BaiJiangJie
|
e0802ef2c3
|
Merge pull request #2965 from jumpserver/dev_bai
[Update] 添加命令过滤器Model中字段name改为unique的迁移文件
|
2019-07-16 15:40:47 +08:00 |
|
jym503558564
|
1993dba2e0
|
[Bugfix] 修复资产授权详情页 删除弹出框的权限名显示不对
|
2019-07-16 15:40:41 +08:00 |
|
BaiJiangJie
|
018bf80930
|
[Update] 添加命令过滤器Model中字段name改为unique的迁移文件
|
2019-07-16 15:38:44 +08:00 |
|
BaiJiangJie
|
6eaa1bc3f9
|
Merge pull request #2963 from jumpserver/cmd_filter_detail_delete_bug
[Bugfix] 修复命令过滤器详情页 删除功能无效的bug
|
2019-07-16 15:33:08 +08:00 |
|
BaiJiangJie
|
d8d9174454
|
Merge pull request #2962 from jumpserver/domain_detail_delete_bug
[Bugfix] 修复网域详情页 删除功能无效的bug
|
2019-07-16 15:30:08 +08:00 |
|
BaiJiangJie
|
bd2f0168a1
|
Merge pull request #2961 from jumpserver/command_filter_model_bug
[Bugfix] 修复命令过滤器名称可重复问题
|
2019-07-16 15:27:00 +08:00 |
|
BaiJiangJie
|
a81601b0a1
|
Merge pull request #2959 from jumpserver/command_list_html_bug
[Bugfix] 修复命令记录页面的时间转换bug
|
2019-07-16 15:26:30 +08:00 |
|
jym503558564
|
3c166abd2d
|
[Bugfix] 修复命令过滤器详情页 删除功能无效的bug
|
2019-07-16 15:25:49 +08:00 |
|
BaiJiangJie
|
25d40388da
|
Merge pull request #2958 from jumpserver/cmd_detail_add_system_user_bug
[Bugfix] 修复命令过滤器详情添加不了系统用户的bug
|
2019-07-16 15:08:15 +08:00 |
|
jym503558564
|
74aa51578b
|
[Bugfix] 修复网域详情页 删除功能无效的bug
|
2019-07-16 15:06:25 +08:00 |
|
jym503558564
|
48cde91dc1
|
[Bugfix] 修复命令过滤器名称可重复问题
|
2019-07-16 14:33:27 +08:00 |
|
BaiJiangJie
|
9455a1c3c0
|
Merge pull request #2960 from jumpserver/dev_bai
[Update] 获取用户授权资产时只返回资产协议支持的系统用户
|
2019-07-16 13:33:47 +08:00 |
|
BaiJiangJie
|
f19f28cf3e
|
[Update] 获取用户授权资产时只返回资产协议支持的系统用户
|
2019-07-16 13:24:16 +08:00 |
|
jym503558564
|
59426d4aa9
|
[Bugfix] 修复命令记录页面的时间转换bug
|
2019-07-16 12:01:09 +08:00 |
|
jym503558564
|
e9e601fe45
|
[Bugfix] 修复命令过滤器详情添加不了系统用户的bug
|
2019-07-16 11:02:05 +08:00 |
|
ibuler
|
4d1da1d292
|
[Update] 给jumpserver.js添加版本号
|
2019-07-16 10:29:20 +08:00 |
|
老广
|
341b654078
|
Merge pull request #2957 from jumpserver/dev
Dev
|
2019-07-16 10:12:14 +08:00 |
|
ibuler
|
875a069a18
|
[Update] 修改校验规则
|
2019-07-16 10:09:36 +08:00 |
|
ibuler
|
106abc24f8
|
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
|
2019-07-16 10:08:06 +08:00 |
|
八千流
|
ab520ee345
|
[Bugfix] 缺少引入翻译 (#2956)
|
2019-07-16 10:03:00 +08:00 |
|
BaiJiangJie
|
e212d413dc
|
Merge pull request #2954 from jumpserver/dev_bai
[Bugfix] 修改资产列表数量显示的Bug
|
2019-07-15 19:04:14 +08:00 |
|
BaiJiangJie
|
6f2f025b04
|
[Bugfix] 修改资产列表数量显示的Bug
|
2019-07-15 19:02:00 +08:00 |
|
BaiJiangJie
|
a884d0d531
|
[Bugfix] 修改Bug (#2952)
* [Bugfix] 取消管理用户列表按资产数量字段排序
* [Bugfix] 修复后去用户资产权限动作的Bug
|
2019-07-15 18:47:17 +08:00 |
|
八千流
|
6cf11ab411
|
[Update] 优化mfa验证身份页面水平线在大屏幕无自动对其问题 (#2948)
* [Update] 优化mfa验证身份页面水平线在大屏幕无自动对其问题
* [Update] 修改小问题
|
2019-07-15 15:38:34 +08:00 |
|
老广
|
c8623c3b8c
|
Merge pull request #2947 from jumpserver/dev
Dev
|
2019-07-15 15:11:30 +08:00 |
|
老广
|
9d54baac09
|
Secure (#2946)
* [Update] 修改assets
* [Update] 添加关闭terminal注册的设置
* [Update] 去掉sql打印
|
2019-07-15 15:11:01 +08:00 |
|
BaiJiangJie
|
382bb89e8e
|
Merge pull request #2945 from jumpserver/dev_bai
[Update] 优化创建RemoteApp前端逻辑
|
2019-07-15 15:02:36 +08:00 |
|
BaiJiangJie
|
92aeecbc3e
|
[Update] 优化创建RemoteApp前端逻辑
|
2019-07-15 14:57:57 +08:00 |
|
八千流
|
9219786f2d
|
[Update] 创建/更新 远程应用 使用api (#2940)
* [Update] 创建/更新 远程应用 使用api
* [Update] 优化 params
* [Update] 修改小问题
|
2019-07-15 14:42:54 +08:00 |
|
ibuler
|
d2516cc328
|
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
|
2019-07-15 14:37:18 +08:00 |
|
老广
|
ab9744d529
|
Bugfix (#2944)
* [Update] 修改assets
* [Update] 修改nodes
|
2019-07-15 14:36:11 +08:00 |
|
ibuler
|
3ac3581622
|
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
|
2019-07-15 14:35:34 +08:00 |
|
BaiJiangJie
|
13ca70b328
|
Merge pull request #2942 from jumpserver/remote_app_perms_api
[Update] 创建/更新 远程应用授权 使用api
|
2019-07-15 14:25:06 +08:00 |
|
BaiJiangJie
|
911abeddd0
|
Merge pull request #2943 from jumpserver/dev_bai
[Bugfix] 修改授权规则详情用户组数量显示错误
|
2019-07-15 14:20:49 +08:00 |
|