github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-08-02 07:03:40 +00:00
Code Issues Projects Releases Wiki Activity
4,944 Commits 86 Branches 259 Tags 144 MiB
6bb13a26f5
Commit Graph

4944 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ibuler
6bb13a26f5 [Update] 修改用户serializer 2020-04-30 16:58:08 +08:00
ibuler
b92137afd9 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-04-30 16:53:21 +08:00
老广
962763dc7b
Merge pull request #3954 from xuxinwen/feature-audits-apis 
[Feature] 添加 login-logs API
 2020-04-30 03:52:57 -05:00
xuxinwen
f4eca83a49 [feature] 添加 login-logs API 2020-04-30 16:40:55 +08:00
老广
02135ea04f
Merge pull request #3948 from jumpserver/settings_api 
[Update] Add settings api
 2020-04-29 18:25:10 +08:00
Eric
79eb838250 [Update] setting fields automatically generated by serializer 2020-04-29 18:10:42 +08:00
Eric
82710294f4 Merge branch 'lina' of https://github.com/jumpserver/jumpserver into settings_api 2020-04-29 17:09:50 +08:00
Eric
2d18acf6f7 [Update] settings api 2020-04-29 17:04:58 +08:00
ibuler
f8c323cf5c [Update] 优化user group serializer 2020-04-29 16:01:14 +08:00
ibuler
b6f5b335bd Merge branch 'api_perf' into lina 2020-04-29 15:47:46 +08:00
Eric
f451f8a979 Merge branch 'lina' of https://github.com/jumpserver/jumpserver into settings_api 2020-04-29 14:33:22 +08:00
ibuler
5c4dfabc48 [Update] 修改settings 2020-04-29 14:32:51 +08:00
ibuler
0c0c0e6d6f Merge branch 'dev' into lina 2020-04-29 13:00:47 +08:00
Eric
20cf7c7c52 [Update] Add settings api 2020-04-29 11:09:35 +08:00
ibuler
230d6137f3 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-04-29 10:21:06 +08:00
ibuler
aa9533eb5b [Update] Groups users字段可以显示 2020-04-29 10:19:25 +08:00
ibuler
efb5d4135a [Update] 优化api字段显示 2020-04-23 11:14:02 +08:00
ibuler
5f2c9c3801 [Update] 添加 authentication backend header 2020-04-22 15:13:04 +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
BaiJiangJie
1b1a686b96
Merge pull request #3922 from jumpserver/dev 
Dev
 2020-04-18 23:19:11 +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
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
e9fe5b3004
Merge pull request #3908 from jumpserver/dev 
Dev
 2020-04-16 18:30:54 +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
ibuler
6a2a0013a8 [Update] 去掉debug 2020-04-16 12:12:24 +08:00
ibuler
864a4c0485 [Bugfix] 修复显示未授权资产的bug 2020-04-16 12:08:52 +08:00
ibuler
3648a1458b [Update] 修改command options get view filter 2020-04-16 11:27:46 +08:00
BaiJiangJie
5001f48982
Merge pull request #3899 from jumpserver/dev 
Dev
 2020-04-14 19:46:36 +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
4eaaa2462b
Merge pull request #3897 from jumpserver/dev 
Dev
 2020-04-14 17:53:52 +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
093e3924a2
Merge pull request #3894 from jumpserver/dev 
Dev
 2020-04-14 16:00:08 +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
8fd5e6521f
Merge pull request #3892 from jumpserver/dev_bai 
Dev bai
 2020-04-14 13:20:50 +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
6cdba2e8d2
Merge pull request #3890 from jumpserver/dev_bai 
Dev bai
 2020-04-14 12:56:20 +08:00
BaiJiangJie
043aa08f23
Merge pull request #3889 from jumpserver/dev_bai 
Dev bai
 2020-04-14 12:55:35 +08:00