Commit Graph

5123 Commits (087ba9ae9598e37783170979cd4d5a2b7065b2f3)
 

Author SHA1 Message Date
ibuler b92137afd9 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
老广 962763dc7b
Merge pull request #3954 from xuxinwen/feature-audits-apis
5 years ago
xuxinwen f4eca83a49 [feature] 添加 login-logs API
5 years ago
老广 02135ea04f
Merge pull request #3948 from jumpserver/settings_api
5 years ago
Eric 79eb838250 [Update] setting fields automatically generated by serializer
5 years ago
Eric 82710294f4 Merge branch 'lina' of https://github.com/jumpserver/jumpserver into settings_api
5 years ago
Eric 2d18acf6f7 [Update] settings api
5 years ago
BaiJiangJie a860bed34f
[Update] 修改config_example配置(openid) (#3951)
5 years ago
ibuler f8c323cf5c [Update] 优化user group serializer
5 years ago
ibuler b6f5b335bd Merge branch 'api_perf' into lina
5 years ago
Eric f451f8a979 Merge branch 'lina' of https://github.com/jumpserver/jumpserver into settings_api
5 years ago
ibuler 5c4dfabc48 [Update] 修改settings
5 years ago
BaiJiangJie 72ccaf7b1c
Merge pull request #3949 from jumpserver/dev_openid
5 years ago
Bai e4b788a012 [Update] 修改依赖版本 jumpserver-dajngo-oidc-rp (0.3.7.2)
5 years ago
Bai 6eaba4e2fb [Update] openid配置分块
5 years ago
ibuler 0c0c0e6d6f Merge branch 'dev' into lina
5 years ago
Eric 20cf7c7c52 [Update] Add settings api
5 years ago
ibuler 230d6137f3 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
ibuler aa9533eb5b [Update] Groups users字段可以显示
5 years ago
Bai 23f9454e5d [Update] 修改Url name (oidc => openi)
5 years ago
Bai 9eee79f7d4 [Update] 调整openid backend顺序;openid 用户创建/更新添加日志输出
5 years ago
Bai c0089a98f4 [Update] 修改openid信号名称
5 years ago
Bai 87242c13a1 [Update] 修改信号监听kwargs
5 years ago
Bai 184432a2a6 [Update] 更新OpenID的配置项以及对应的信号监听
5 years ago
BaiJiangJie 555861c319
Merge pull request #3943 from jumpserver/dev_conf
5 years ago
Bai a505995f49 [Update] 修改config_example(openid)
5 years ago
BaiJiangJie b477b649f5
Merge pull request #3942 from jumpserver/dev_docker
5 years ago
Michael Bai 6e18383531 [Update] 修改Dockerfile pypi 镜像源(阿里=>清华)
5 years ago
BaiJiangJie 7833ff6671
Dev oidc (#3941)
5 years ago
BaiJiangJie 5d433456d4
Merge pull request #3937 from jumpserver/dev_index
5 years ago
Bai fc5ec3f21c [Update] 更新仪表盘数据显示问题
5 years ago
ibuler efb5d4135a [Update] 优化api字段显示
5 years ago
ibuler 5f2c9c3801 [Update] 添加 authentication backend header
5 years ago
BaiJiangJie 56f38e57bc
Merge pull request #3932 from jumpserver/dev_oidc
5 years ago
Bai 586c04cba6 [Update] 添加oidc-op配置信息
5 years ago
Bai 306605915c [Update] 添加依赖 django-oidc-rp==0.3.4
5 years ago
BaiJiangJie 272701a8fd
Dev oidc (#3930)
5 years ago
BaiJiangJie 9febe488b5
Merge pull request #3929 from jumpserver/lina_terminal
5 years ago
Eric c8c6ba1c19 [Update] add terminal model fileds
5 years ago
老广 2df7bd8510
Merge pull request #3926 from jumpserver/fix_otp_error
5 years ago
老广 c16a986c4b
Merge pull request #3925 from jumpserver/bugfix_many_sqlquery_perm_asset
5 years ago
ibuler 44db0e8a5d [Bugfix] 修复查询授权时额外查询platform的问题
5 years ago
ibuler 91c994924f [Update] 修改报错文案
5 years ago
ibuler 61407331bc [Bugfix] 修复otp登录时导致的500
5 years ago
BaiJiangJie 1b1a686b96
Merge pull request #3922 from jumpserver/dev
5 years ago
BaiJiangJie cc30a20b7c
Merge pull request #3921 from jumpserver/dev
5 years ago
BaiJiangJie 0379e5160c
[Bugfix] 修复真实组织下,新建的用户角色显示不稳定的问题2 (#3919)
5 years ago
BaiJiangJie 386ce629ac
Merge pull request #3918 from jumpserver/fix_connectivity
5 years ago
BaiJiangJie 5677bf0995
Merge pull request #3915 from jumpserver/dev
5 years ago
BaiJiangJie c17dc26f8c
Merge pull request #3916 from jumpserver/dev_org
5 years ago