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

4970 Commits (8a62488cb937a04c18cf3f41e97b29b8c46e6c7c)

Author SHA1 Message Date
BaiJiangJie 9febe488b5
Merge pull request #3929 from jumpserver/lina_terminal 
[Update] add terminal model fileds
 2020-04-21 22:23:53 +08:00
Eric c8c6ba1c19 [Update] add terminal model fileds 2020-04-21 17:37:29 +08:00
老广 2df7bd8510
Merge pull request #3926 from jumpserver/fix_otp_error 
Fix otp error
 2020-04-20 17:00:54 +08:00
老广 c16a986c4b
Merge pull request #3925 from jumpserver/bugfix_many_sqlquery_perm_asset 
[Bugfix] 修复查询授权时额外查询platform的问题
 2020-04-20 16:58:14 +08:00
ibuler 44db0e8a5d [Bugfix] 修复查询授权时额外查询platform的问题 2020-04-20 16:56:47 +08:00
ibuler 91c994924f [Update] 修改报错文案 2020-04-20 10:44:45 +08:00
ibuler 61407331bc [Bugfix] 修复otp登录时导致的500 2020-04-20 10:37:07 +08:00
BaiJiangJie cc30a20b7c
Merge pull request #3921 from jumpserver/dev 
Dev
 2020-04-18 23:15:42 +08:00
BaiJiangJie 0379e5160c
[Bugfix] 修复真实组织下，新建的用户角色显示不稳定的问题2 (#3919) 
* [Bugfix] 修复真实组织下，新建的用户角色显示不稳定的问题2

* [Bugfix] 修复真实组织下，新建的用户角色显示不稳定的问题3

* [Bugfix] 修复真实组织下，新建的用户角色显示不稳定的问题4
 2020-04-18 23:14:25 +08:00
BaiJiangJie 386ce629ac
Merge pull request #3918 from jumpserver/fix_connectivity 
[Update] 修复资产页面可连接性
 2020-04-18 10:42:55 +08:00
BaiJiangJie 5677bf0995
Merge pull request #3915 from jumpserver/dev 
Dev
 2020-04-18 01:27:09 +08:00
BaiJiangJie c17dc26f8c
Merge pull request #3916 from jumpserver/dev_org 
[Bugfix] 修复真实组织下，新建的用户角色显示不稳定的问题
 2020-04-18 01:24:21 +08:00
Bai b4cc2bbff9 [Bugfix] 修复真实组织下，新建的用户角色显示不稳定的问题 2020-04-18 01:22:48 +08:00
BaiJiangJie e74289b223
[Update] 修改用户密码重置页面错误信息提示2 (#3914) 2020-04-17 23:41:50 +08:00
ibuler 98afa032a7 [Update] 修复资产页面可连接性 2020-04-17 16:32:38 +08:00
BaiJiangJie 0d3fab216b
Merge pull request #3910 from jumpserver/dev_user 
[Update] 修改用户密码重置页面错误信息提示
 2020-04-17 11:27:26 +08:00
Bai 081f4b1c0a [Update] 修改用户密码重置页面错误信息提示 2020-04-17 11:26:29 +08:00
BaiJiangJie 1de2923dd3
Merge pull request #3907 from jumpserver/dev_user 
[Update] 修改忘记密码页面的错误信息提示
 2020-04-16 18:30:07 +08:00
Bai 6890d549ed [Update] 修改忘记密码页面的错误信息提示 2020-04-16 18:29:02 +08:00
老广 9426f58a6b
Merge pull request #3904 from jumpserver/dev 
[Bugfix] 修复显示未授权资产的bug
 2020-04-15 23:17:08 -05:00
ibuler 6a2a0013a8 [Update] 去掉debug 2020-04-16 12:12:24 +08:00
ibuler 864a4c0485 [Bugfix] 修复显示未授权资产的bug 2020-04-16 12:08:52 +08:00
BaiJiangJie 8fa08d7ea3
Merge pull request #3902 from jumpserver/dev 
Dev
 2020-04-16 11:31:38 +08:00
ibuler 3648a1458b [Update] 修改command options get view filter 2020-04-16 11:27:46 +08:00
BaiJiangJie 93bf15adc9
Merge pull request #3898 from jumpserver/dev_email 
[Update] 修改测试邮件后，配置获取不稳定的Bug（显示给settings赋值导致）
 2020-04-14 19:45:06 +08:00
Bai 83eb8f77d1 [Update] 修改测试邮件后，配置获取不稳定的Bug（显示给settings赋值导致） 2020-04-14 19:40:56 +08:00
BaiJiangJie 0910236f12
Merge pull request #3896 from jumpserver/dev_bai 
Dev bai
 2020-04-14 17:52:49 +08:00
Bai 77149bf36c [Update] 修改监控多个会话时，总是覆盖同一个tab页 2020-04-14 17:50:47 +08:00
Bai 6337d0d0a1 [Update] 修改会话can_join为property 2020-04-14 16:12:24 +08:00
BaiJiangJie e143408e57
Merge pull request #3893 from jumpserver/dev_req 
[Update] 修改依赖版本jms-storage=0.0.29
 2020-04-14 15:58:24 +08:00
Bai dfdf33bbb5 [Update] 修改依赖版本jms-storage=0.0.29 2020-04-14 15:54:59 +08:00
BaiJiangJie 6a2b9cd9bf
Merge pull request #3891 from jumpserver/dev_bai 
[Update] 修复系统设置-终端设置-资产排序设置不生效的Bug
 2020-04-14 13:19:57 +08:00
Bai 55fa5800b1 [Update] 修复系统设置-终端设置-资产排序设置不生效的Bug 2020-04-14 13:18:33 +08:00
BaiJiangJie 043aa08f23
Merge pull request #3889 from jumpserver/dev_bai 
Dev bai
 2020-04-14 12:55:35 +08:00
Bai 63519ec076 [Update] 修改命令记录/操作/改密日志搜索字段没清空的问题 2020-04-14 12:51:13 +08:00
Bai 48fa26a3bc [Update] 修改操作日志搜索字段没清空的问题 2020-04-14 11:03:12 +08:00
Bai d969563e43 [Update] 修复自定义平台列表在详情页删除失败的bug 2020-04-14 10:42:40 +08:00
BaiJiangJie 287236a447
Merge pull request #3885 from jumpserver/dev_trans 
[Update] 更新翻译
 2020-04-13 19:23:38 +08:00
Bai 4fb4a9f622 [Update] 更新翻译 2020-04-13 19:21:53 +08:00
BaiJiangJie 508d1c2c1f
Merge pull request #3883 from jumpserver/master_bai 
Master bai
 2020-04-13 18:23:43 +08:00
BaiJiangJie 600ea42633
Merge pull request #3882 from jumpserver/master_bai 
[Update] 修改OpenID用户获取username的问题
 2020-04-13 18:22:23 +08:00
Bai 41cbd3e0f6 [Update] 修改OpenID用户获取username的问题 2020-04-13 18:21:49 +08:00
BaiJiangJie e593ccb01c
Merge pull request #3879 from jumpserver/dev_bai 
Dev bai
 2020-04-13 14:22:31 +08:00
Bai d5e1ca7908 [Update] 添加翻译 2020-04-13 14:19:42 +08:00
Bai 06fb502a1d [Update] 修改文案: 加入 -> 监控 2020-04-13 14:17:08 +08:00
Bai 3f6d7637c3 [Update] 更新用户添加CAS来源选项 2020-04-13 13:40:13 +08:00
BaiJiangJie 27ffed1be9
Merge pull request #3868 from jumpserver/dev_user 
[Update] 修改用户ViewSet序列类返回的admin_orgs（解决组织管理员登录的Bug)
 2020-04-10 12:40:12 +08:00
Bai af9d42695f [Update] 修改用户ViewSet序列类返回的admin_orgs（解决组织管理员登录的Bug) 2020-04-10 12:38:05 +08:00
BaiJiangJie 422b4424fe
Merge pull request #3867 from jumpserver/dev_ab 
[Update] 修复AuthBook删除失败的Bug
 2020-04-09 23:40:18 +08:00
Michael Bai dc172e1ef0 [Update] 修复AuthBook删除失败的Bug 2020-04-09 23:39:17 +08:00