github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-10-22 16:31:33 +00:00
Code Issues Projects Releases Wiki Activity
5,014 Commits 93 Branches 268 Tags
0cff6ab29b2a0197c47116192bf795a8fd89c1d0
Commit Graph

2368 Commits

Author SHA1 Message Date
Bai
0cff6ab29b [Update] Merge fromo dev to lina 2020-05-11 14:03:24 +08:00
ibuler
2680396680 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-05-09 16:08:32 +08:00
ibuler
227f97c2f5 [Update] 修改remote apps 字段 2020-05-09 16:08:09 +08:00
老广
ad3231c8a3 Merge pull request #3982 from jumpserver/update-ops-migrate 
[Update] 重建 ops 0018 迁移脚本
 2020-05-09 01:54:37 -05:00
ibuler
e39d8dce3c [Update] 修改fields 2020-05-09 14:52:44 +08:00
ibuler
0bdc425c55 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina 2020-05-09 14:51:47 +08:00
ibuler
0a7f63cc5e [Update] 修改remote app api 2020-05-09 14:51:19 +08:00
xinwen
c6e0e9a79a [Update] 重建 ops 0018 迁移脚本 2020-05-09 14:50:22 +08:00
BaiJiangJie
4cebfc7f6a [Update] 修改翻译 (#3981) 
* [Update] 修改翻译

* [Update] 修改翻译2
 2020-05-09 13:29:39 +08:00
xinwen
3ee051303a [Update] audits 模块为一些 models 字段添加 verbose 信息 2020-05-09 11:29:25 +08:00
老广
9fa31be4bf Merge pull request #3976 from jumpserver/add-audits-apis 
[Add] audits apis
 2020-05-08 08:04:14 -05:00
Eric
48b71bb11b AUTH_LDAP_USER_ATTR_MAP to Dict field 2020-05-08 20:58:13 +08:00
Bai
11b3c57c92 [Update] 修改dashboard中使用的变量名 2020-05-08 20:02:00 +08:00
xinwen
e339ed1fb3 [Add] audits apis 2020-05-08 17:59:58 +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
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
1936a6d5ee [Update] 去掉perms cache enable settings 2020-05-08 14:25:28 +08: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
xinwen
dec89ae5ee [Update] login-logs api 添加 mfa_display 2020-05-08 10:08:57 +08:00
Eric
9a39ccd37d [Update] Reponse status code from 401 to 400 2020-05-07 16:57:57 +08:00
ibuler
8c0bf0b71b [Update] Login log 添加display field 2020-05-06 19:35:19 +08: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
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
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