Commit Graph

4508 Commits (f40d51c84f5704008f2d3606dedf921a82e06aa5)
 

Author SHA1 Message Date
ibuler f40d51c84f Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler 46a2311e30 [Update] 暂时关闭celery处理请求数量
5 years ago
BaiJiangJie 76e59f5bcd
Merge pull request #3430 from jumpserver/dev_auth_info
5 years ago
BaiJiangJie e731c01cc4 [Update] 修改 sytem-user-asset-auth-info API 的权限(只允许 App)访问
5 years ago
BaiJiangJie 6067dbcf21
Merge pull request #3429 from jumpserver/dev_auth_info
5 years ago
BaiJiangJie 4057064b7f [Update] 修改获取系统用户-资产-认证信息API,添加 NeedMFAVerify 权限类
5 years ago
BaiJiangJie 200ca65dc5
Merge pull request #3426 from jumpserver/dev_ldap2
5 years ago
BaiJiangJie 78a7bfbd30 [Update] 修复取消 LDAP 同步用户任务失败的问题
5 years ago
BaiJiangJie fc58906bce [Update] 修改翻译信息
5 years ago
BaiJiangJie e0d7a0e239 [Update] 重构 LDAP/AD 同步功能,添加缓存机制 4
5 years ago
BaiJiangJie 82077f4a0e [Update] 重构 LDAP/AD 同步功能,添加缓存机制 3
5 years ago
BaiJiangJie c31b56ddd9 [Update] Merge local branch dev to dev_ldap2
5 years ago
BaiJiangJie 0a08ba3b9c [Update] 修改翻译信息
5 years ago
BaiJiangJie 2ea3ad4ca5 [Update] 重构 LDAP/AD 同步功能,添加缓存机制 2
5 years ago
老广 0d2fc27a97
Merge pull request #3420 from jumpserver/bugfix
5 years ago
BaiJiangJie 596e5a6dd1 [Update] 重构 LDAP/AD 同步功能,添加缓存机制
5 years ago
ibuler f4136decde [Update] Stash
5 years ago
ibuler fb9e2ac9f6 [Update] 修改用户和用户组关系发生变化时,刷新权限
5 years ago
ibuler ed5a57042a [Update] windows跳过手动输入密码
5 years ago
ibuler eedaaddbf5 [Update] 用户创建支持修改source
5 years ago
ibuler bae4387068 [Update] tree出现滚动条
5 years ago
BaiJiangJie cf65e9bfe3
Merge pull request #3408 from jumpserver/dev_nodes
5 years ago
BaiJiangJie b51ad05a4b [Update] 修复初始化 Default 节点的 Bug(原因:在其他组织下 Default 节点默认的 key 1 已经存在)5
5 years ago
BaiJiangJie ca178c534e [Update] 修复初始化 Default 节点的 Bug(原因:在其他组织下 Default 节点默认的 key 1 已经存在)4
5 years ago
BaiJiangJie d7948425df [Update] 修复初始化 Default 节点的 Bug(原因:在其他组织下 Default 节点默认的 key 1 已经存在)3
5 years ago
BaiJiangJie a0be7333fb [Update] 修复初始化 Default 节点的 Bug(原因:在其他组织下 Default 节点默认的 key 1 已经存在)2
5 years ago
BaiJiangJie fde8702916 [Update] 修复初始化 Default 节点的 Bug(原因:在其他组织下 Default 节点默认的 key 1 已经存在)
5 years ago
BaiJiangJie 3dfb2d6af2
Merge pull request #3405 from jumpserver/bugfix
5 years ago
ibuler c25335cf95 [Update] 修改authbook
5 years ago
ibuler ebbe49fab2 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler 28ad362b8d [Update] 修改设置最新版本
5 years ago
BaiJiangJie b595ac9bc5
Merge pull request #3403 from jumpserver/dev_ops
5 years ago
BaiJiangJie 4f7ab69508 [Bugfix] 修复执行任务,没有保存 history 的问题
5 years ago
ibuler 87247da0ec [Bugfix] 修复获取数量是报错
5 years ago
BaiJiangJie c163427db2
Merge pull request #3397 from jumpserver/dev_bai
5 years ago
BaiJiangJie c7ecfd7943 [Bugfix] 修复当终端设置包含多个命令存储时,访问 /docs/ 页面错误的问题
5 years ago
BaiJiangJie db5ff0f922 [Update] 修改用户 LDAP/AD Source 时排除 admin 用户
5 years ago
BaiJiangJie c29381e657
Merge pull request #3395 from jumpserver/dev_loginlog
5 years ago
BaiJiangjie ff62968bf6 [Update] 登录日志导出按照组织进行过滤
5 years ago
BaiJiangJie 4e1e60046a
Merge pull request #3392 from jumpserver/api_key_table
5 years ago
jym503558564 82c4705350 [Update] 修改api_key_table显示不友好问题
5 years ago
BaiJiangJie f6d2ac9b7b
Merge pull request #3388 from jumpserver/dev_bai
5 years ago
BaiJiangJie 98a8ef1526 [Update] 优化 config_example.py 中 AUTH_LDAP 配置项
5 years ago
BaiJiangJie 4167987d67
Merge pull request #3387 from jumpserver/dev_ldap
5 years ago
BaiJiangJie ef41ba3117 [Update] LDAP 认证添加配置项 OPT_REFERRALS(解决问题: In order to perform this operation a successful bind must be completed on the connection)
5 years ago
ibuler d22f60364a [Update] 修改js
5 years ago
ibuler 90321ab68c [Update] 修改js
5 years ago
ibuler a5814c8100 [Update] 修改js
5 years ago
ibuler fbe4f4c119 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler 4d53b6f078 [Update] 去掉debug信息
5 years ago