Commit Graph

5126 Commits (50bea5573205573e744c6a533834b88066559d32)
 

Author SHA1 Message Date
BaiJiangJie b310731ba7
Merge pull request #3990 from jumpserver/lina_dev
5 years ago
Bai 4bd2681bf0 [Update] Merge from dev to lina
5 years ago
BaiJiangJie 38e09753f4
Merge pull request #3989 from jumpserver/dev_master
5 years ago
Bai 98e3adbb11 [Update] Merge from master to dev
5 years ago
BaiJiangJie c700b101c1
Merge pull request #3988 from jumpserver/master_otp
5 years ago
Bai 7b3647e78a [Bugfix] 修复用户页面更新MFA时解除管理员强制启用的Bug
5 years ago
BaiJiangJie f4f042c407
Merge pull request #3987 from jumpserver/master_index
5 years ago
Bai 0a8eeca629 [Update] 仪表盘缓存key添加组织id
5 years ago
BaiJiangJie fdd55511a6
Merge pull request #3986 from jumpserver/lina_dev
5 years ago
Bai 0cff6ab29b [Update] Merge fromo dev to lina
5 years ago
ibuler cda677a30f [update] 修改remote apps的serializer
5 years ago
ibuler 5571651c02 [Update] 升级requirements
5 years ago
ibuler 2680396680 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
ibuler 227f97c2f5 [Update] 修改remote apps 字段
5 years ago
老广 ad3231c8a3
Merge pull request #3982 from jumpserver/update-ops-migrate
5 years ago
ibuler e39d8dce3c [Update] 修改fields
5 years ago
ibuler 0bdc425c55 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
ibuler 0a7f63cc5e [Update] 修改remote app api
5 years ago
xinwen c6e0e9a79a [Update] 重建 ops 0018 迁移脚本
5 years ago
BaiJiangJie 4cebfc7f6a
[Update] 修改翻译 (#3981)
5 years ago
老广 7fde392774
Merge pull request #3980 from jumpserver/update-audits-verbose
5 years ago
xinwen 3ee051303a [Update] audits 模块为一些 models 字段添加 verbose 信息
5 years ago
老广 9fa31be4bf
Merge pull request #3976 from jumpserver/add-audits-apis
5 years ago
老广 ae2e4049db
Merge pull request #3979 from jumpserver/lina_setting_dict_field
5 years ago
Eric 48b71bb11b AUTH_LDAP_USER_ATTR_MAP to Dict field
5 years ago
BaiJiangJie 7e4edc3c63
Merge pull request #3978 from jumpserver/dev_index
5 years ago
Bai 11b3c57c92 [Update] 修改dashboard中使用的变量名
5 years ago
xinwen e339ed1fb3 [Add] audits apis
5 years ago
BaiJiangJie 2d48c8028b
Merge pull request #3975 from jumpserver/dev_master
5 years ago
Bai 185c53d311 [Update] Merge from master to dev
5 years ago
BaiJiangJie 2f030c02ec
Merge pull request #3973 from jumpserver/master_org
5 years ago
老广 f4457ff1e2
Merge pull request #3972 from jumpserver/PERM_CACHE_CONFIG
5 years ago
ibuler c6ed6d8acb [Update] 去掉debug信息
5 years ago
ibuler 331cfe2aed [Bugfix] 修复节点数量缓存显示不对的bug
5 years ago
Bai e48dbabef2 [Update] 修改翻译
5 years ago
Bai 181973f235 [Update] 优化仪表盘页面加载
5 years ago
ibuler 440a2ad241 Merge branch 'PERM_CACHE_CONFIG' into dev
5 years ago
ibuler 1936a6d5ee [Update] 去掉perms cache enable settings
5 years ago
老广 4517a92b2b
Merge pull request #3971 from jumpserver/add-ftp-log-api
5 years ago
ibuler 44a2a51f59 Merge branch 'PERM_CACHE_CONFIG' into dev
5 years ago
ibuler 2d4498578a [Update] 修改授权缓存配置的默认值
5 years ago
xinwen ac902501ec [Add] ftp-logs api
5 years ago
老广 363b5d04d9
Merge pull request #3969 from jumpserver/update-login-logs
5 years ago
xinwen dec89ae5ee [Update] login-logs api 添加 `mfa_display`
5 years ago
老广 5d37269a6c
Merge pull request #3967 from jumpserver/lina_status_code
5 years ago
Eric 9a39ccd37d [Update] Reponse status code from 401 to 400
5 years ago
BaiJiangJie 5896ea9c63
Merge pull request #3963 from jumpserver/dev_oidc
5 years ago
Bai 8323de1c07 [Update] 修改依赖版本jumpserver-django-oidc-rp==0.3.7.3
5 years ago
ibuler 8c0bf0b71b [Update] Login log 添加display field
5 years ago
老广 5812c50a33
Merge pull request #3960 from jumpserver/lina_setting
5 years ago