github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
9,531 Commits
70 Branches
249 Tags
114 MiB
Commit Graph

9531 Commits (4683ae8c09c41831547b7c4a5cd43bc27537b091)

Author SHA1 Message Date
jiangweidong 4683ae8c09 perf: 修改迁移文件中的字段信息 2023-06-13 13:54:59 +08:00
jiangweidong af018ea262 perf: 字段含义和Session model保持一致 2023-06-13 13:18:50 +08:00
jiangweidong a991a6c56c perf: 优化变量名 2023-06-13 11:36:32 +08:00
jiangweidong 9a29cda210 fix: 提供给luna的录像地址不能为本地local地址，应该为url 2023-06-13 11:36:32 +08:00
老广 aee20a6c05
Merge pull request #10686 from jumpserver/pr@dev@perf_applet_import 
perf: 优化 applet 导入
 2023-06-13 10:04:02 +08:00
老广 499c52800e
Merge pull request #10689 from jumpserver/pr@dev@perf_ticket_request_login 
perf: 优化登录 ticket 创建
 2023-06-13 10:03:36 +08:00
ibuler 4a2f7d21f6 perf: 优化登录 ticket 创建 2023-06-13 09:54:03 +08:00
ibuler 44d92b9dec perf: 修改 acl user review 2023-06-12 19:12:11 +08:00
ibuler 1e9310bf0c perf: 优化 applet 导入 2023-06-12 19:00:59 +08:00
老广 1b750cf51d
Merge pull request #10682 from jumpserver/pr@dev@allow_chrome_some_shortcut 
perf: 放行快捷键 ctrl-c-v
 2023-06-12 18:36:16 +08:00
ibuler e9125d1228 perf: 修改 chrome error 2023-06-12 18:35:27 +08:00
老广 c85df4cf42
Merge pull request #10685 from jumpserver/pr@dev@fix_command_filter_acls_error 
perf: 优化命令过滤 acl 获取
 2023-06-12 18:28:52 +08:00
ibuler 09a5b63240 perf: 修改 acl filter 2023-06-12 18:28:04 +08:00
ibuler f9bc7ec4aa perf: 优化命令过滤 acl 获取 2023-06-12 18:20:30 +08:00
fit2bot d59a293bb9
perf: 修改用户组添加全部用户api的权限位 (#10683) 
Co-authored-by: feng <1304903146@qq.com>
 2023-06-12 18:16:09 +08:00
ibuler cb2b8bb70b perf: 放行快捷键 ctrl-c-v 2023-06-12 16:37:12 +08:00
老广 86c81c42de
Merge pull request #10681 from jumpserver/pr@dev@perf_global_acl 
perf: 优化 manager 和 acl 的 组织
 2023-06-12 16:02:45 +08:00
ibuler 5c2b54ad3b perf: 优化 manager 和 acl 的 组织 2023-06-12 16:00:14 +08:00
Eric b79aaff4a0 perf: 资产根据 ssh 协议过滤是否启用 sftp 2023-06-12 15:42:24 +08:00
jiangweidong 3fd8e5755d fix: 修改变量 2023-06-12 15:41:25 +08:00
jiangweidong 3604ef4228 fix: 解决录像无法在线观看的问题 2023-06-12 15:41:25 +08:00
Bai 24272d3162 fix: 修复 Token API 获取命令过滤器失败的问题 2023-06-12 14:11:44 +08:00
ibuler a99d22708c perf: 修改 migrations 2023-06-12 14:10:37 +08:00
ibuler dc35a8c52b perf: 优化 acl 默认排序和manager 2023-06-12 14:10:37 +08:00
老广 fc90ced2b0
Merge pull request #10675 from jumpserver/pr@dev@json_field_add_requirement 
perf: m2m json field 字段必填
 2023-06-12 13:41:34 +08:00
老广 7bfe8816a3
Merge pull request #10674 from jumpserver/pr@dev@perf_config 
perf: 优化配置
 2023-06-12 13:36:49 +08:00
Bai b4008338c6 perf: 优化配置 2023-06-12 11:24:12 +08:00
ibuler 6058f1bdc0 perf: m2m json field 字段必填 2023-06-12 11:03:04 +08:00
ibuler 5708e57631 perf: m2m json field 字段必填 2023-06-12 10:25:14 +08:00
老广 ba353271ad
Merge pull request #10667 from jumpserver/pr@dev@fix_login_regex_error 
perf: 修复 正则匹配的 bug
 2023-06-09 18:35:23 +08:00
ibuler adfc22ae85 perf: 修复 正则匹配的 bug 2023-06-09 18:32:56 +08:00
jiangweidong ef2ecb225a fix: 资产登录规则操作日志显示优化 2023-06-09 18:25:00 +08:00
ibuler 9574d03c12 fix: 修复连接方式选择 2023-06-09 18:22:35 +08:00
Bai 00d3caf80c perf: 删除不用代码 2023-06-09 18:22:04 +08:00
fit2bot 2333a29a56
perf: 优化数据库改密原子性 (#10663) 
Co-authored-by: feng <1304903146@qq.com>
 2023-06-09 16:52:54 +08:00
fit2bot b3c5674213
fix: 资产用模版创建账号无切换至 (#10662) 
Co-authored-by: feng <1304903146@qq.com>
 2023-06-09 16:23:44 +08:00
老广 f372f1e417
Merge pull request #10659 from jumpserver/pr@dev@perf_applet 
perf: 添加 edition 字段
 2023-06-09 16:05:10 +08:00
ibuler a86378601a perf: 修改插件 2023-06-09 15:58:30 +08:00
ibuler 6a73cd6b77 perf: 添加 edition 字段 2023-06-09 15:40:41 +08:00
Eric 3022ca983c perf: Dockerfile 增加依赖 2023-06-08 22:09:37 +08:00
老广 8f8e781376
Merge pull request #10655 from jumpserver/pr@dev@fix_login_acl_uniq 
perf: 优化 LoginACL 迁移，避免 uniq error
 2023-06-08 18:35:23 +08:00
ibuler 998505e999 perf: 修改 acl 登录 2023-06-08 18:33:43 +08:00
ibuler 1c95b67154 perf: 优化 LoginACL 迁移，避免 uniq error 2023-06-08 18:19:32 +08:00
jiangweidong 2837dcf40e
feat: 支持文件上传下载备份 (#10438) 
* feat: 支持文件上传下载备份

* perf: 抽离replay和ftpfile存储代码

* perf: FTPLog增加session字段

* fix: 修改变量名
 2023-06-08 18:04:07 +08:00
ibuler 271ec1bfe0 perf: 优化刚才修改导致的 acls 过滤没有过滤组织 2023-06-08 18:03:49 +08:00
老广 41e147d4b2 Revert "chore(deps): bump cryptography from 38.0.4 to 41.0.0 in /requirements" 
This reverts commit 0025b2483e.
 2023-06-08 14:57:34 +08:00
老广 d2f1309900
Merge pull request #10644 from jumpserver/pr@dev@perf_acls_connect_methods 
perf: 优化 connect method acls 和登录 acls
 2023-06-08 14:52:10 +08:00
dependabot[bot] 0025b2483e chore(deps): bump cryptography from 38.0.4 to 41.0.0 in /requirements 
Bumps [cryptography](https://github.com/pyca/cryptography) from 38.0.4 to 41.0.0.
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pyca/cryptography/compare/38.0.4...41.0.0)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-08 14:19:06 +08:00
fangfang.dong a6d586efb4 feat: 系统设置 - 短信服务 - 多平台配置测试手机号: 增加区号显示与修改功能 2023-06-08 11:01:55 +08:00
jiangweidong f0c0ba3653 fix: 解决lina不显示json格式参数，优化DictSerializer改为JSONSerialzer， 2023-06-08 10:26:33 +08:00