github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
7,399 Commits
87 Branches
259 Tags
138 MiB
Commit Graph

7399 Commits (4ecb0b760fa81081fb905f5dc27aaf3fdafc114b)

Author SHA1 Message Date
xinwen e339ed1fb3 [Add] audits apis 2020-05-08 17:59:58 +08:00
BaiJiangJie 2d48c8028b
Merge pull request #3975 from jumpserver/dev_master 
Dev master
 2020-05-08 16:42:32 +08:00
Bai 185c53d311 [Update] Merge from master to dev 2020-05-08 16:40:07 +08:00
BaiJiangJie 2f030c02ec
Merge pull request #3973 from jumpserver/master_org 
[Update] 优化仪表盘、组织详情页
 2020-05-08 16:27:49 +08:00
老广 f4457ff1e2
Merge pull request #3972 from jumpserver/PERM_CACHE_CONFIG 
Bugfix Perm cache config
 2020-05-08 03:04:33 -05:00
ibuler c6ed6d8acb [Update] 去掉debug信息 2020-05-08 15:58:00 +08:00
ibuler 331cfe2aed [Bugfix] 修复节点数量缓存显示不对的bug 2020-05-08 15:53:58 +08:00
Bai e48dbabef2 [Update] 修改翻译 2020-05-08 15:50:01 +08:00
Bai 181973f235 [Update] 优化仪表盘页面加载 2020-05-08 15:41:56 +08:00
ibuler 440a2ad241 Merge branch 'PERM_CACHE_CONFIG' into dev 2020-05-08 14:25:36 +08:00
ibuler 1936a6d5ee [Update] 去掉perms cache enable settings 2020-05-08 14:25:28 +08:00
老广 4517a92b2b
Merge pull request #3971 from jumpserver/add-ftp-log-api 
[Add] ftp-logs api
 2020-05-08 00:52:03 -05:00
ibuler 44a2a51f59 Merge branch 'PERM_CACHE_CONFIG' into dev 2020-05-08 13:13:47 +08:00
ibuler 2d4498578a [Update] 修改授权缓存配置的默认值 2020-05-08 13:13:38 +08:00
xinwen ac902501ec [Add] ftp-logs api 2020-05-08 12:46:18 +08:00
老广 363b5d04d9
Merge pull request #3969 from jumpserver/update-login-logs 
[Update] login-logs api 添加 `mfa_display`
 2020-05-07 22:23:37 -05:00
xinwen dec89ae5ee [Update] login-logs api 添加 `mfa_display` 2020-05-08 10:08:57 +08:00
老广 5d37269a6c
Merge pull request #3967 from jumpserver/lina_status_code 
[Update] Reponse status code from 401 to 400
 2020-05-07 04:03:34 -05:00
Eric 9a39ccd37d [Update] Reponse status code from 401 to 400 2020-05-07 16:57:57 +08:00
BaiJiangJie 5896ea9c63
Merge pull request #3963 from jumpserver/dev_oidc 
[Update] 修改依赖版本jumpserver-django-oidc-rp==0.3.7.3
 2020-05-06 21:06:27 +08:00
Bai 8323de1c07 [Update] 修改依赖版本jumpserver-django-oidc-rp==0.3.7.3 2020-05-06 21:05:23 +08:00
ibuler 8c0bf0b71b [Update] Login log 添加display field 2020-05-06 19:35:19 +08:00
老广 5812c50a33
Merge pull request #3960 from jumpserver/lina_setting 
[Update] save settings
 2020-05-06 04:05:51 -05:00
Eric 7b339df430 [Update] save settings 2020-05-06 16:36:36 +08:00
Bai aec78dc3c7 [Update] 添加组织详情->组织用户tab页，解决组织详情页面加载超时问题 2020-05-06 15:31:08 +08:00
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
BaiJiangJie a860bed34f
[Update] 修改config_example配置（openid） (#3951) 
* [Update] 修改config_example配置（openid）

* [Update] 修改config_example配置（openid）2
 2020-04-29 16:57:10 +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
BaiJiangJie 72ccaf7b1c
Merge pull request #3949 from jumpserver/dev_openid 
Dev openid
 2020-04-29 14:25:32 +08:00
Bai e4b788a012 [Update] 修改依赖版本 jumpserver-dajngo-oidc-rp (0.3.7.2) 2020-04-29 14:07:54 +08:00
Bai 6eaba4e2fb [Update] openid配置分块 2020-04-29 14:03:48 +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
Bai 23f9454e5d [Update] 修改Url name (oidc => openi) 2020-04-29 01:12:00 +08:00
Bai 9eee79f7d4 [Update] 调整openid backend顺序；openid 用户创建/更新添加日志输出 2020-04-29 00:43:54 +08:00
Bai c0089a98f4 [Update] 修改openid信号名称 2020-04-28 22:29:56 +08:00
Bai 87242c13a1 [Update] 修改信号监听kwargs 2020-04-28 21:06:13 +08:00
Bai 184432a2a6 [Update] 更新OpenID的配置项以及对应的信号监听 2020-04-28 21:00:22 +08:00