Commit Graph

4630 Commits (907703d911ed491fd57c0a765cd80f10a9028b10)
 

Author SHA1 Message Date
BaiJiangJie a6d87f6de4
Merge pull request #3273 from jumpserver/v52_ldap
5 years ago
BaiJiangJie b2836b9f4f [Bugfix] 修复 LDAP 用户导入会重复显示的问题(场景:AD 用户在多个 OU 下面)
5 years ago
BaiJiangJie 864bcb27ca
Merge pull request #3270 from jumpserver/dev_v52
5 years ago
ibuler 47abac000e [Merge] with v52
5 years ago
BaiJiangJie 326f2160d5
Merge pull request #3268 from jumpserver/v52_bugfix
5 years ago
ibuler 0a13b4bb99 [Update] 修复密码匣子的bug
5 years ago
BaiJiangJie 02087e00fa
Merge pull request #3267 from jumpserver/dev_ra
5 years ago
BaiJiangJie e805e9cede [Update] 优化用户授权的 RemoteApp API 过滤逻辑
5 years ago
BaiJiangJie 3f9e2f0af7 [Bugfix] 用户远程应用页面,连接远程应用传递 type 参数
5 years ago
BaiJiangJie ffb4a26215
Merge pull request #3266 from jumpserver/bugfix
5 years ago
ibuler 5055a9f352 [Update] 修改获取资产的逻辑
5 years ago
ibuler 28afd1f6f9 [Update] 修改正则表达式
5 years ago
BaiJiangJie 11f710b30a
Merge pull request #3265 from jumpserver/dev_v
5 years ago
BaiJiangJie b8b4cc2621 [Update] 修改获取 jumpserver.js 的递增值
5 years ago
BaiJiangJie 0078089cdf [Update] 修改版本号 1.5.3
5 years ago
BaiJiangJie 715c9a1242
Merge pull request #3264 from jumpserver/dev_bai
5 years ago
BaiJiangJie d5af966623 [Update] Merge branch 'master' into dev_bai
5 years ago
BaiJiangJie cbfcc75c82
Merge pull request #3263 from jumpserver/dev_bugfix
5 years ago
BaiJiangJie 08a19550b2 [Bugfix] 修复资产授权规则去重
5 years ago
BaiJiangJie ec0cf38c3c
Merge pull request #3262 from jumpserver/dev_trans
5 years ago
BaiJiangJie 62e21d9fc0 [Update] 添加翻译
5 years ago
BaiJiangJie e7cafe86d1 [Update] 添加 js 翻译
5 years ago
BaiJiangJie df429d56d5
V52 (#3158) (#3261)
5 years ago
BaiJiangJie 39dfbc734e
[Bugfix] 修复页面中点击删除按钮时,提示 name 信息为 undefined 的问题 (#3259)
5 years ago
BaiJiangJie 9428c186b3
Merge pull request #3258 from jumpserver/dev_ak
5 years ago
BaiJiangJie 6db57424aa [Bugfix] 修改 API key table 的前端变量名 ak_table
5 years ago
BaiJiangJie 7dc8b128d6 [Bugfix] 修复 API Key table 加载时报错(在日志审计模块中)
5 years ago
BaiJiangJie 0ed08c2f4c [Update] 修改 API Key 页面显示布局
5 years ago
BaiJiangJie afdf0062eb
Merge pull request #3257 from jumpserver/dev_perms
5 years ago
BaiJiangJie fad842a8a0 [Update] 添加资产授权规则 generate_fake 方法
5 years ago
BaiJiangJie 02944d407c
Merge pull request #3256 from jumpserver/dev_i18n
5 years ago
BaiJiangJie ddb34a0f59 [Update] 添加翻译
5 years ago
BaiJiangJie 1603d0f146
Merge pull request #3254 from jumpserver/dev_hostname
5 years ago
BaiJiangJie 1cba714b00 [Update] 资产主机名提示、限制不被允许的特殊字符
5 years ago
BaiJiangJie ef122ec169
Merge pull request #3253 from jumpserver/dev_session
5 years ago
BaiJiangJie b5f94d84f7 [Update] Session protocol 添加 telnet 选项
5 years ago
ibuler 471ed51360 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler 86c5a0ba8b [Update] 去掉一些filter
5 years ago
BaiJiangJie 6f4d7dd6c6
Merge pull request #3251 from jumpserver/dev_bugfix
5 years ago
BaiJiangJie 76e2f750ce [Bugfix] 修复改密计划菜单不高亮的问题
5 years ago
ibuler f15dc881b6 [Update] 修改requirements
5 years ago
BaiJiangJie fa7150850f
Merge pull request #3243 from jumpserver/gather_asset_user
5 years ago
ibuler 6fc666e60d [Update] 优化获取系统用户
5 years ago
ibuler 89fa0658e1 [Update] 修改任务执行
5 years ago
ibuler 847e37e641 [Update] 修改一些bug
5 years ago
ibuler b7021b5ecb [Update] 支持收集资产上的用户
5 years ago
ibuler 5464c884db [Update] 修改swagger
5 years ago
BaiJiangJie dea9151abd
Merge pull request #3242 from jumpserver/v52_config
5 years ago
BaiJiangJie 737f0bc512
Merge pull request #3241 from jumpserver/dev_config
5 years ago
BaiJiangJie 36d8eebecf [Update] OpenID 认证共享session配置默认值修改为 True 2
5 years ago