github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-06-24 14:02:01 +00:00
Code Issues Projects Releases Wiki Activity
4,997 Commits 84 Branches 257 Tags 137 MiB
6804f23b51
Commit Graph

4997 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
BaiJiangJie
4994a4a387
Dev bai (#3865) 
* [Update] 更新config-example（CAS)

* [Update] 更新config-example（CAS)2

* [Update] 更新config-example（CAS)3
 2020-04-09 13:39:11 +08:00
BaiJiangJie
e26eba9919
Merge pull request #3864 from jumpserver/1.5.8 
1.5.8
 2020-04-09 11:36:38 +08:00
Bai
44cd82f3e1 [Update] 修改翻译 2020-04-09 10:59:00 +08:00
Bai
adf14b0f2e [Update] 修改版本号 2020-04-09 10:46:24 +08:00
Bai
f5a7c4131d [Update] 修改校验join session的url-name 2020-04-09 10:43:25 +08:00
Bai
ef27188f86 [Update] 修改Bug: CommandViewSet的Option方法Error 2020-04-08 18:08:22 +08:00
BaiJiangJie
a7734812fc
Merge pull request #3860 from jumpserver/1.5.8_bai 
[Update] 命令记录导出: 只导出满足搜索条件的数据
 2020-04-08 01:35:16 +08:00
Michael Bai
fb62fbde6c [Update] 命令记录导出: 只导出满足搜索条件的数据 2020-04-08 01:34:10 +08:00
BaiJiangJie
521f4ea86b
Merge pull request #3857 from jumpserver/1.5.8_bai 
1.5.8 bai
 2020-04-07 12:32:54 +08:00
Bai
e9827c8b25 [Update] 添加会话加入校验API 2020-04-07 12:26:47 +08:00
Bai
29b099efc0 [Update] 添加加入会话按钮 2020-04-02 19:45:56 +08:00
Bai
e9fc56c056 [Update] 修改日志日期显示问题 2020-04-02 16:02:55 +08:00
Bai
e9103ee608 [Update] 对自定义MetaDict字段值进行strip 2020-04-02 15:14:30 +08:00
BaiJiangJie
52c6244b2b
Merge pull request #3842 from jumpserver/dev 
Dev
 2020-03-28 21:36:54 +08:00
BaiJiangJie
7977294c5c
Merge pull request #3841 from jumpserver/dev 
Dev
 2020-03-28 21:36:09 +08:00
BaiJiangJie
e1331084e5
Merge pull request #3840 from jumpserver/dev_readme 
Dev readme
 2020-03-28 21:35:23 +08:00
Michael Bai
5268c0faae [Update] OpenID登录成功后，如果用户没有email字段则构造默认的email 2020-03-28 21:34:17 +08:00
Michael Bai
b2d9b69874 [Update] 修改readme 2020-03-28 21:26:27 +08:00
BaiJiangJie
336589af98
Merge pull request #3836 from jumpserver/1.5.8_cap 
1.5.8 cap
 2020-03-27 11:28:39 +08:00
Bai
5087c0e06f Merge branch 'dev' into 1.5.8_cap 2020-03-27 11:26:09 +08:00
BaiJiangJie
43ecd39d0e
Merge pull request #3835 from jumpserver/dev 
Dev
 2020-03-27 11:09:09 +08:00
BaiJiangJie
209b23c5ce
Merge pull request #3834 from jumpserver/dev_req 
[Update] 修改依赖jms-storage==0.0.28
 2020-03-27 11:08:42 +08:00
Bai
7e7d4401e6 [Update] 修改依赖jms-storage==0.0.28 2020-03-27 11:07:55 +08:00