Commit Graph

5244 Commits (89496baae5f5ea33ade68a8a57d28497c5bd3111)
 

Author SHA1 Message Date
Bai d878089ebd [Update] 用户资产详情Modal添加comment
5 years ago
BaiJiangJie 9d32285446
Merge pull request #3997 from jumpserver/dev_bai
5 years ago
Bai 4658a4c90f [Update] 修改向导文案
5 years ago
Bai d06ea2944e [Update] 修改Dashboard API
5 years ago
wojiushixiaobai d50ea83f40 [Fix]修改文档链接
5 years ago
ibuler 154aad1e22 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
ibuler 17163dd909 [Update] 用户Profile添加在当前组织的角色
5 years ago
BaiJiangJie b789a8bb05
Merge pull request #3994 from jumpserver/lina_assetuser
5 years ago
Bai 9341ce9f84 [Update] 修复AssetUserViewSet 使用Option方法时error
5 years ago
ibuler 4d0f7d0254 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler 195cbbbe42 [Update] 修改profile serialzier
5 years ago
xinwen 6e5e340a25
Merge pull request #3993 from jumpserver/update-assets-filter
5 years ago
xinwen eb74d13059 [Update] Asset filter 添加 platform__base 字段
5 years ago
老广 16f916c40a
Merge pull request #3992 from jumpserver/update-assets-filter
5 years ago
xinwen 4dd6d4498b [Update] Asset filter 添加 platform__name 字段
5 years ago
ibuler dd5bf546df [Update] 修改serialzier_class
5 years ago
ibuler d6debde566 Merge branch 'lina' of github.com:jumpserver/jumpserver into lina
5 years ago
ibuler efc66cc7ee [Update] 默认关闭debug
5 years ago
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