Commit Graph

4411 Commits (ccdb7709721dca6a1ad30a4bbeec7d7444e0bec2)
 

Author SHA1 Message Date
BaiJiangJie ccdb770972
Merge pull request #3344 from jumpserver/dev_ug
5 years ago
BaiJiangJie 8fcfcf7ad3 [Update] 更新创建/更新用户组是取消按钮->重置按钮(避免引起歧义)
5 years ago
ibuler 31280a3869 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler 70a4f137b8 [Update] 添加脚本
5 years ago
BaiJiangJie ad3524f942
Merge pull request #3337 from jumpserver/dev_cmds_es
5 years ago
BaiJiangJie 1a1f20920d [Bugfix] 修改终端命令类型 MAPPING(elasticsearch -> es)
5 years ago
BaiJiangJie b4d164954d [Bugfix] 修复命令记录从 es 中获取失败(原因:时间日期格式不匹配)
5 years ago
ibuler 52d0961519 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
5 years ago
ibuler e093475351 [Update] 修改jms stop
5 years ago
BaiJiangJie 13822cbf6d
Merge pull request #3334 from jumpserver/dev_su_asset
5 years ago
BaiJiangJie b732f4e32c [Bugfix] 修改调用系统用户资产 API 时 Connectivity is not JSON serializable 的 Bug
5 years ago
BaiJiangJie c0d1bf8ecc
Merge pull request #3332 from jumpserver/dev_char
5 years ago
BaiJiangJie 1f5cdc3fa4 [Update] 添加翻译: 限制 组织/系统用户名称 中的特殊字符
5 years ago
BaiJiangJie 21b17ca41a [Update] 系统用户 name 限制使用特殊字符
5 years ago
BaiJiangJie 70713af95a [Update] 限制组织名称中使用的特殊字符
5 years ago
BaiJiangJie 2f2b0b28b3
Merge pull request #3325 from jumpserver/dev_assets
5 years ago
BaiJiangJie 7574966ccf [Bugfix] 修复组织管理员在资产详情页面不显示(删除/更新)按钮的问题
5 years ago
BaiJiangJie 3986bbf7ac
Merge pull request #3323 from jumpserver/dev_nodes
5 years ago
BaiJiangJie 4102dc6842
Merge pull request #3324 from jumpserver/dev_ldap
5 years ago
BaiJiangJie d1dc3342a2 [Update] 配置项 AUTH_LDAP_USER_LOGIN_ONLY_IN_USERS 添加到 config_example.yml 中
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 ca50c0a9b3
Merge pull request #3319 from jumpserver/dev_muiltselect
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 230b3edf7b
Merge pull request #3315 from jumpserver/dev_bai
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 87d5b6c473 [Update] 修改启动脚本
5 years ago
ibuler 6b377ec5ef [Update] 修改启动脚本
5 years ago
BaiJiangJie aebb98189c
Merge pull request #3311 from jumpserver/dev_email
5 years ago
BaiJiangJie c9ca81e80f [Update] 邮件设置添加测试邮件收件人配置项
5 years ago
BaiJiangJie 90ec6a2962 [Bugfix] 修复创建资产节点的Bug (#3308)
5 years ago
BaiJiangJie 16d2b0f1f3
Merge pull request #3298 from jumpserver/dev_readme
5 years ago
BaiJiangJie 87e485bfe2 [Update] 删除 README 访问量统计图标信息
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