Commit Graph

2148 Commits (ac2ba63856e48c5a4f64da3cb106669f49dc7c6a)

Author SHA1 Message Date
BaiJiangJie 5f3583279c [Update] 优化登录日志时间范围 2
5 years ago
BaiJiangJie 950358f5ba [Update] 优化登录日志时间范围
5 years ago
BaiJiangJie 84b3e29db6
Merge pull request #3366 from jumpserver/bugfix
5 years ago
ibuler a33d5cc53b [Update] 修改返回asset tree带上组织
5 years ago
jym503558564 3c7fa1b60b [Update] 修改小问题
5 years ago
jym503558564 f4fc757379 [Bugfix] 修改导出登录日志的日期选择从开始时间的00:00:00,到结束时间的23:59:59
5 years ago
ibuler 87deb18791 [Update] 修改command 批量执行左侧选择系统用户
5 years ago
ibuler 82a6369568 [Update] 修改term大小
5 years ago
ibuler 3a10fd4160 [Update] 修改查看auth info可以关闭mfa
5 years ago
ibuler a2f8f43321 [Update] 修改查看auth info可以关闭mfa
5 years ago
ibuler 6ebe8e16bd [Update] 修改读取日志时可能解码失败
5 years ago
ibuler 86522627d3 [Update] 优化提交api报错时滚动到,优化table页面某些列宽度
5 years ago
BaiJiangJie 0930716a54 [Update] 优化用户组详情,用户选择下拉列表使用异步加载;命令过滤详情绑定到系统用户点击不关闭;
5 years ago
ibuler f984acf1b2 [Bugfix] 修复导致favorite 和 empty 同时出现
5 years ago
ibuler 87c7452d19 [Update] 修改email msg
5 years ago
ibuler 792fc3b0f0 [Update] 添加koko访问错误说明
5 years ago
ibuler 673ebbec1b [Update] Merge with dev
5 years ago
ibuler c2f78b1170 [Update] 修改jumpserver,支持url前缀
5 years ago
BaiJiangJie a7ae132b2b [Update] 优化收藏资产功能,不刷新页面的情况下,可以在收藏资产列表取消收藏
5 years ago
BaiJiangJie a978bf990d
Merge pull request #3342 from jumpserver/perms_assets_search_bug
5 years ago
BaiJiangJie a6531fedb5 [Bugfix] 修复 TreeNode bug
5 years ago
BaiJiangJie e5250294b0 Dev export (#3355)
5 years ago
BaiJiangJie f3dc9b886b Asset favor (#3352)
5 years ago
jym503558564 70664d435f [Update] 修改小问题
5 years ago
jym503558564 ee97144a10 [Bugfix] 修复资产授权列表 节点搜索报500错误
5 years ago
ibuler 9870d3aa85 [Bugfix] 修复判断问题
5 years ago
ibuler c3699889e2 [Update] 修改session支持protocol搜索
5 years ago
ibuler 237d51cff9 [Update] 拆分filter org
5 years ago
BaiJiangJie 8fcfcf7ad3 [Update] 更新创建/更新用户组是取消按钮->重置按钮(避免引起歧义)
5 years ago
jym503558564 01ead7c8e1 [Bugfix] 修复资产授权列表搜索 无效的 出现500错误
5 years ago
BaiJiangJie 1a1f20920d [Bugfix] 修改终端命令类型 MAPPING(elasticsearch -> es)
5 years ago
BaiJiangJie b4d164954d [Bugfix] 修复命令记录从 es 中获取失败(原因:时间日期格式不匹配)
5 years ago
BaiJiangJie b732f4e32c [Bugfix] 修改调用系统用户资产 API 时 Connectivity is not JSON serializable 的 Bug
5 years ago
BaiJiangJie 1f5cdc3fa4 [Update] 添加翻译: 限制 组织/系统用户名称 中的特殊字符
5 years ago
BaiJiangJie 21b17ca41a [Update] 系统用户 name 限制使用特殊字符
5 years ago
BaiJiangJie 70713af95a [Update] 限制组织名称中使用的特殊字符
5 years ago
BaiJiangJie 7574966ccf [Bugfix] 修复组织管理员在资产详情页面不显示(删除/更新)按钮的问题
5 years ago
BaiJiangJie 3986bbf7ac
Merge pull request #3323 from jumpserver/dev_nodes
5 years ago
BaiJiangJie dfedfc7e7a [Update] LDAP 登录认证添加配置项:只有在用户列表中的用户会被允许认证
5 years ago
BaiJiangJie 7ff6391801 [Update] 修改删除节点 API 返回的状态码
5 years ago
BaiJiangJie 5f96f8c229 [Update] 优化节点删除 API,添加删除失败原因
5 years ago
老广 7e7583e4fc
Merge pull request #3321 from jumpserver/bugfix
5 years ago
ibuler 74b4ff4993 [Update] 修改celery log
5 years ago
BaiJiangJie cea6ea4826 [Update] 更新 select2 js/css 依赖版本(4.0.10):解决多选下拉框自动回跳到顶部的问题
5 years ago
BaiJiangJie 3bd3564b2b
Merge pull request #3317 from jumpserver/bugfix
5 years ago
ibuler 9ee9be3339 Merge remote-tracking branch 'origin/bugfix' into bugfix
5 years ago
ibuler ce530e417c [Update] 修改cmd filter rules pattern
5 years ago
BaiJiangJie c8cade622a [Update] 优化 LDAP 导入/搜索 逻辑
5 years ago
BaiJiangJie 670e8afe76 [Update] 更新定时测试管理用户可连接性 PERIOD_TASK_ENABLED 判断
5 years ago
ibuler e52178811c [Update] 修改command显示
5 years ago
ibuler 74ab311d3e [Update] 修改ldap和command
5 years ago
ibuler dc5598f8dc [Update] 修改settings
5 years ago
ibuler c6fef20390 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler 6b377ec5ef [Update] 修改启动脚本
5 years ago
BaiJiangJie c9ca81e80f [Update] 邮件设置添加测试邮件收件人配置项
5 years ago
BaiJiangJie 90ec6a2962 [Bugfix] 修复创建资产节点的Bug (#3308)
5 years ago
BaiJiangJie 2f48595cd8
Merge pull request #3295 from jumpserver/dev_ldap_sync_timing
5 years ago
BaiJiangJie fa1a167f8e [Feature] 添加同步 LDAP/AD 用户的定时任务3
5 years ago
BaiJiangJie 8b7c5b1545 [Feature] 添加同步 LDAP/AD 用户的定时任务2(添加同步参数配置项)
5 years ago
ibuler 44f8b978f9 [Update] 添加failover ws
5 years ago
BaiJiangJie 8081a864da Merge branch 'dev' into dev_ldap_sync_timing
5 years ago
ibuler 1a82b8586d [Update] 修改 access key文档地址引用
5 years ago
ibuler 9e12f3cd17 [Update] 表单中用户使用异步
5 years ago
BaiJiangJie 4b7cd79682 [Feature] 添加同步 LDAP/AD 用户的定时任务1
5 years ago
ibuler ed5b2f8bf8 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler d85c893e3a [update] 修改默认监听的端口
5 years ago
ibuler 2c46707c2b [Update] 修改websocket监听端口
5 years ago
BaiJiangJie 2ff295e3b2
Merge pull request #3292 from jumpserver/dev_bai
5 years ago
老广 cff009e758
Support ws (#3291)
5 years ago
BaiJiangJie e3c68071b9 [Update] Merge local branch dev to dev_bai
5 years ago
BaiJiangJie 587e3fdd74 [Update] LDAP 搜索分页配置默认值修改为1000
5 years ago
BaiJiangJie e4ecb19e38 [Update] LDAP 测试连接性也使用分页配置
5 years ago
BaiJiangJie 25fcbf37c3 [Update] LDAP 导入搜索添加分页配置
5 years ago
老广 c75fd3c108
Bugfix (#3286)
5 years ago
老广 f87db2f4fc
Bugfix (#3284)
5 years ago
八千流 3c12c33911 [Update] 修改当仅是当前组织审计员时,隐藏终断会话按钮 (#3275)
5 years ago
老广 118fc8c42f
Dev beta (#3281)
5 years ago
老广 9f56ac8a21
[Update] 修改可能导致的树创建问题 (#3280)
5 years ago
BaiJiangJie d7bc8516ff [Update] 修改资产主机名允许输入中文3
5 years ago
BaiJiangJie 26ef7b7be3
[Update] 修改资产主机名允许输入中文 (#3278)
5 years ago
老广 d3d72f85fd
[Update] 修改启动的参数,修改inventory参数名称 (#3276)
5 years ago
BaiJiangJie 40ce9256fc
Merge pull request #3274 from jumpserver/v52
5 years ago
BaiJiangJie b2836b9f4f [Bugfix] 修复 LDAP 用户导入会重复显示的问题(场景:AD 用户在多个 OU 下面)
5 years ago
ibuler 47abac000e [Merge] with v52
5 years ago
ibuler 0a13b4bb99 [Update] 修复密码匣子的bug
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 b8b4cc2621 [Update] 修改获取 jumpserver.js 的递增值
5 years ago
BaiJiangJie 0078089cdf [Update] 修改版本号 1.5.3
5 years ago
BaiJiangJie 08a19550b2 [Bugfix] 修复资产授权规则去重
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 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 fad842a8a0 [Update] 添加资产授权规则 generate_fake 方法
5 years ago
BaiJiangJie ddb34a0f59 [Update] 添加翻译
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 76e2f750ce [Bugfix] 修复改密计划菜单不高亮的问题
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 36d8eebecf [Update] OpenID 认证共享session配置默认值修改为 True 2
5 years ago
BaiJiangJie ecd3317428 [Update] OpenID 认证共享session配置默认值修改为 True
5 years ago
BaiJiangJie 9925a270e1 [Update] 远程应用授权列表添加系统用户数量显示
5 years ago
BaiJiangJie 124e042565 [Bugfix] 修复用户组创建页面Bug
5 years ago
ibuler 0db3e41bde [Update] 拆分asset tasks
5 years ago
ibuler 3681bfc015 [Update] 修改用户组授权api
5 years ago
BaiJiangJie 0625c8121e [Bugfix] 修复授权规则列表显示重复问题
5 years ago
八千流 82b00008d9 [Update] 修改更新资产的协议组,不能删除协议的问题 (#3228)
5 years ago
老广 1457281b73
Bugfix (#3232)
5 years ago
BaiJiangJie 4797f99f60 [Bugfix] 修复用户认证序列类获取 request 的问题
5 years ago
BaiJiangJie f4c080dd19 [Update] API允许批量删除用户,修改前端提示信息逻辑
5 years ago
BaiJiangJie 354c3c563b [Update] 修改perms迁移文件之间的依赖关系,添加迁移文件
5 years ago
八千流 a2376d3afd 超级管理员可创建超级审计员并可设置审计员为组织审计员 (#3141)
5 years ago
ibuler 5f23c358da [Update] 修改remote app tree node
5 years ago
BaiJiangJie bdcf9ba153 Dev remoteapp (#3205)
5 years ago
ibuler df9ef23034 [Update] 去掉asset permission中不用的代码
5 years ago
ibuler ec0bdcce9e [Update] 修改id cache api mixin
5 years ago
ibuler 1ba6fa65e0 [Update] 修改翻译
5 years ago
ibuler a8ac99f642 [Update] 修改asset modal table
5 years ago
ibuler 8ddda8e5af [Update] 修复页面bug和popover的问题
5 years ago
ibuler 444f494c0b [Update] 修改节点资产数量的bug
5 years ago
ibuler 3fdec62e25 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler 80415afa9f [Update] 修改asset 过滤资产api
5 years ago
老广 9bcc325c1e
Bugfix (#3216)
5 years ago
老广 c1d274028f
[Update] 添加 asset permission默认排序,去掉node permission model (#3214)
5 years ago
int32bit 041bab88c0 Assure group when push system user to asset (#3155)
5 years ago
Eric_Lee 996da2d90e upgrade elfinder jquery related files (#3212)
5 years ago
老广 dbb441dfb6
Perm cache (#3211)
5 years ago
BaiJiangJie 9f2e49c9e9 [Bugfix] 修改初始化一些节点时,assets_node表不存在的问题
5 years ago
老广 c0afeba215
Merge pull request #3208 from jumpserver/dev_serializer
5 years ago
BaiJiangJie 1eb2038ec4 [Bugfix] 解决批量创建系统用户等资源时,initial_data.get() 失败的问题
5 years ago
老广 c2ea867d95
Merge pull request #3204 from jumpserver/dev_session
5 years ago
BaiJiangJie 1b7294f714 [Update] 在线会话列表允许终端 RDP session
5 years ago
ibuler d1f37d4bbf [Update] 修改 remote app api
5 years ago
老广 de43980ee2
Dev beta2 (#3177)
5 years ago
BaiJiangJie d5dcab15a8
Dev v52 (#3171)
5 years ago
BaiJiangJie f08d317bfd
[Update] 更新翻译(批量改密) (#3170)
5 years ago
老广 8cd8f41cb0
Dev beta (#3167)
5 years ago
Eric_Lee d8e5c64826 fix web sftp select all items display (#3162)
5 years ago
老广 ede7365da8
[Update] remote app tree添加 User (#3159)
5 years ago
BaiJiangJie fb94050732 [Update] 修复创建授权规则授权节点时,系统用户不自动推送的问题
5 years ago
老广 1fe18e8073
Bugfix (#3153)
5 years ago
BaiJiangJie de1a08a52f
[Update] WebTerminal 跳转添加时间戳 (#3149)
5 years ago
BaiJiangJie f6722c5a26 [Update] WebTerminal 跳转添加时间戳
5 years ago
老广 164f48e131
Dev beta (#3048)
5 years ago
BaiJiangJie 48826a9ad9
[Update] 优化切换组织时重定向页面逻辑 (#3133)
5 years ago
BaiJiangJie 50f50a4f28 [Bugfix] 修复remote-app应用创建/更新时,参数设置不成功的bug
5 years ago
BaiJiangJie 214b4026ec [Update] 修复资产用户管理器获取 __name__ 的问题
5 years ago
ibuler 907d93bcad [Update] 还原一些
5 years ago
ibuler c84df42ff4 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler 8fb0d6315d [Update] 修改导入bug
5 years ago
BaiJiangJie a10fa3c55b [Update] 优化资产授权详情页面,添加系统用户后自动reload页面
5 years ago
ibuler a315df29ca [Update] 暂时不更改这里逻辑
5 years ago
ibuler 2e9711ae8a [Update] 修改nodes
5 years ago
ibuler 05e4e7301c [Update] 修改避免每次刷新asset user的可连接性
5 years ago
老广 2d7d9d4de7
Merge pull request #3105 from jumpserver/bugfix
5 years ago
ibuler fdef282c57 [Bugfix] 修复批量更新用户的bug, 导出字段添加 *
5 years ago
Eric 22b0b77b83 fix selected item display bug
5 years ago
ibuler a188968e5d [Update] 修复Model过长的bug
5 years ago
ibuler 3c9814191d [Update] 修改缩进
5 years ago
ibuler 785b375f4a [Bugfix] 修复授权列表用户无法搜索的bug
5 years ago
ibuler fbfbfcc274 [Update] 修复磁盘显示单位问题
5 years ago
ibuler 42ff5a382a [Update] 修改设置session的时间,避免sdk等报错
5 years ago
ibuler 6b56c43a3a [Update] 控制是否显示未分组节点
5 years ago
ibuler c3a206b291 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler afffb50b94 [UPdate] 修改手动模式问题
5 years ago
Eric 2208320049 修改elfinder中文翻译
5 years ago
BaiJiangJie 4254775149
Bugfix (#3065)
5 years ago
BaiJiangJie 586d6e6abb [Update] 添加用户过期邮件提醒
5 years ago
BaiJiangJie 9ab6c58676
Merge pull request #3055 from jumpserver/dev_login
5 years ago
BaiJiangJie 3d9c0a212e [Update] 用户登录失败次数提示
5 years ago
老广 bb235f3e88
[Update] 修改获取资产时使用in (#3053)
5 years ago
ibuler c706a410a2 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler d0c74a7704 [Bugfix] 修复只设置公钥不推送的问题
5 years ago
BaiJiangJie a7066a5c85 [Update] htmlEscape
5 years ago
BaiJiangJie 637fc91413 [Update] 密码过期邮件发送(密码未过期用户&有效用户)
5 years ago
BaiJiangJie b5aa69db61
Merge pull request #3045 from jumpserver/dev_bai
5 years ago
BaiJiangJie 89a98be6ce [Update] 修改翻译(Cloud)
5 years ago
老广 c6ec00e84d
[Update] 修改collect static file机制 (#3044)
5 years ago
BaiJiangJie 3cdabaf883
[Update] 系统用户资产管理页面获取相关的所有资产 (#3038)
5 years ago
BaiJiangJie 947f16e371 [Update] 是否允许用户更改/使用密钥登录,根据settings配置进行控制
5 years ago
BaiJiangJie 69841a4198 [Feature] 资产授权规则页面添加刷新授权缓存按钮 (#3032)
5 years ago
BaiJiangJie 31c220605e [Update] 授权资产变动过期所有缓存(cache_key和cache_meta_key)
5 years ago
BaiJiangJie f4c835d47a [Bugfix] 解决用户登录日志记录错误的问题(coco端登录记录类型为Web)
5 years ago
BaiJiangJie c929c1a87e [Bugfix] 解决下载导入模版时KeyError的问题(数据为空时) (#3017)
5 years ago
老广 421e98696c
Bugfix (#3014)
5 years ago