github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
4,283 Commits
64 Branches
246 Tags
105 MiB
Commit Graph

4283 Commits (ef122ec16920fabf396fd25e9ed0cd1e2cb39174)

Author SHA1 Message Date
BaiJiangJie 277bbc0798
Merge pull request #2996 from jumpserver/dev 
Dev
 2019-07-19 13:13:01 +08:00
BaiJiangJie d97654b851
Merge pull request #2995 from jumpserver/bugfix 
Bugfix
 2019-07-19 13:12:32 +08:00
BaiJiangJie 7ec82cbc60 [Update] 修改列表日期2 2019-07-19 13:10:34 +08:00
BaiJiangJie 63c2343d2c [Update] 修改列表日期 2019-07-19 12:55:43 +08:00
ibuler d93fe11373 [Bugfix] 修复date format错误 2019-07-19 12:01:17 +08:00
BaiJiangJie fedfbba30c
Merge pull request #2991 from jumpserver/dev 
Dev
 2019-07-18 18:02:48 +08:00
ibuler 49ccba85a2 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2019-07-18 16:33:18 +08:00
ibuler 9903adf71b [Update] 修改cache policy 开关 2019-07-18 16:32:46 +08:00
BaiJiangJie 48cfc4d4ce
Merge pull request #2990 from jumpserver/dev 
Dev
 2019-07-18 13:58:47 +08:00
BaiJiangJie 1f5cc1eef1
Merge pull request #2989 from jumpserver/dev_bai 
[Update] 解决授权资产页面资产重复的问题
 2019-07-18 13:57:05 +08:00
BaiJiangJie ce1bb66f23 [Update] 解决授权资产页面资产重复的问题 2019-07-18 13:56:08 +08:00
BaiJiangJie 6f9528d78d
Merge pull request #2987 from jumpserver/dev 
Dev
 2019-07-18 13:42:37 +08:00
BaiJiangJie fc01b952b3
Merge pull request #2986 from jumpserver/dev_trans 
[Update] 修改翻译
 2019-07-18 13:23:40 +08:00
BaiJiangJie 51f4c1cde0 [Update] 修改翻译 2019-07-18 13:21:10 +08:00
ibuler 8bb82d168b Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2019-07-18 13:01:38 +08:00
ibuler 1ef16d55ef [Update] 优化详情页获取nodes 2019-07-18 13:01:07 +08:00
BaiJiangJie a242bdd3b1
Merge pull request #2983 from jumpserver/dev 
Dev
 2019-07-18 11:20:09 +08:00
BaiJiangJie 97bc3d5e7c
Merge pull request #2984 from jumpserver/gateway_conn_bug 
[Bugfix] 修复网关测试连接失败未捕获导致报500的bug
 2019-07-18 11:16:36 +08:00
jym503558564 dbb27a7771 [Bugfix] 修复网关测试连接失败未捕获导致报500的bug 2019-07-18 11:13:58 +08:00
八千流 ea11aa4abb [Bugfix] 修改排序，去掉标签 (#2982) 
* [Update] 修改排序，去掉标签

* [Bugfix] 修改排序

* [Bugfix] 修改小问题

* [Bugfix] 修改小问题
 2019-07-18 11:01:28 +08:00
ibuler 1af40b6ca0 [Update] 支持etag 2019-07-17 22:14:39 +08:00
老广 1b220326bf
Merge pull request #2981 from jumpserver/dev 
Bugfix (#2980)
 2019-07-17 19:55:29 +08:00
老广 8ed3bb8586
Bugfix (#2980) 
* [Update] 修改排序，去掉标签

* [Update] 修改批量更新后刷新页面

* [Update] 修改面包屑

* [Update] 修改用户排序

* [Update] 处理未登录主机显示为负数

* [Update] 支持单个资产的搜索
 2019-07-17 19:52:33 +08:00
老广 887cda3287
Merge pull request #2978 from jumpserver/dev 
Dev 修改private key校验
 2019-07-17 13:46:04 +08:00
ibuler 40de7d64c6 [Update] 修改private创建 2019-07-17 13:41:26 +08:00
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