github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
9,864 Commits
64 Branches
246 Tags
105 MiB
Commit Graph

9864 Commits (665c833479089761aded313b913f008c49294550)

Author SHA1 Message Date
Bai ad311c15ca fix: 增加 TypeError 捕获 2023-07-11 10:19:31 +08:00
老广 b10623c970
Merge pull request #10879 from jumpserver/pr@dev@feat_chatgpt_support 
feat: 支持 chatgpt 资产
 2023-07-11 09:59:04 +08:00
Bai 7d17c1a450 fix: 修复 beat 定时任务重复执行的问题 2023-07-10 19:28:19 +08:00
老广 100b1553b6
Merge pull request #10931 from jumpserver/pr@dev@perf_change_platform 
perf: 修改 Platform 约束
 2023-07-07 19:48:15 +08:00
ibuler 76af71bbbe perf: 修改 Platform 约束 2023-07-07 19:47:12 +08:00
fit2bot 9607ab5164
perf: 修改支持 AD (#10926) 
* stash

* perf: 修改支持 AD

* perf: 优化 default

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2023-07-07 16:15:32 +08:00
Eric 61078ee2ed perf: 更新 Chrome 的 ChangeLog 路径 2023-07-06 19:41:11 +08:00
Eric 6a720cde0a perf: 更新 chrome 支持匿名账号 2023-07-06 19:41:11 +08:00
老广 a2a5d5e08b
Merge pull request #10925 from jumpserver/pr@dev@wechat 
perf: 去除readme 中的微信
 2023-07-06 18:27:03 +08:00
feng 9c2cc65ce8 perf: 去除readme 中的微信 2023-07-06 18:26:05 +08:00
feng ee3cdcd9e4 fix: 有默认值 required 为false 2023-07-06 10:33:36 +08:00
feng 89492410aa fix: 推送账号 不填写home 推送失败 2023-07-06 10:33:36 +08:00
dependabot[bot] b324c6cc8a
build(deps): bump django from 3.2.19 to 3.2.20 in /requirements 
Bumps [django](https://github.com/django/django) from 3.2.19 to 3.2.20.
- [Commits](https://github.com/django/django/compare/3.2.19...3.2.20)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-07-05 23:26:55 +00:00
Bai 6b189e6162 fix: 修复导入LDAP数据库超时导致 Lock wait timeout 的问题 2023-07-05 18:49:01 +08:00
吴小白 a07cab9ae7
Merge pull request #10910 from jumpserver/pr@dev@perf_chrome 
perf: 修正 Chrome driver 路径
 2023-07-05 18:38:18 +08:00
Eric 751bd35349 perf: 修正 Chrome driver 路径 2023-07-05 18:28:31 +08:00
Bai d6aaf23abb fix: 修复用户导入时手机号为dict类型报错的问题 2023-07-05 16:49:52 +08:00
Eric f096014d03 perf: 移除针对端点 host 的校验 2023-07-05 15:39:54 +08:00
Eric 7f03639c34 perf: 更新翻译 2023-07-04 19:14:53 +08:00
Eric 3963881226 perf: 日文翻译更正 2023-07-04 19:14:53 +08:00
Eric fb279dbc39 perf: 新增 SFTP 会话类型 2023-07-04 19:14:53 +08:00
fangfang.dong 785e4cc3e4 perf: 接口sql优化 /api/v1/perms/asset-permissions/<uuid:pk>/assets/all/ 2023-07-04 19:14:21 +08:00
jiangweidong dd846d4183 feat: 云同步支持公有云 2023-07-04 18:48:07 +08:00
Eric_Lee 9169f3546a Revert "perf: rdp7 可使用 web gui方式连接" 2023-07-04 18:09:33 +08:00
Eric_Lee 7e2c0d0a2d
Merge pull request #10896 from jumpserver/revert-10880-pr@dev@perf_xrdp_rdp7 
Revert "perf: add xrdp rdp7 port 3390"
 2023-07-04 17:57:33 +08:00
老广 66c60ef5be
Revert "perf: add xrdp rdp7 port 3390" 2023-07-04 17:35:58 +08:00
fit2bot f095998096
perf: 改密与推送保持一致 (#10812) 
* perf: 改密与推送保持一致

* perf: 增加 i18n

---------

Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: Bai <baijiangjie@gmail.com>
 2023-07-04 17:34:31 +08:00
老广 d06e5d0001
Merge pull request #10826 from jumpserver/pr@dev@perf_account_template 
perf: 接口sql优化 /api/v1/accounts/account-templates/su-from-account-templates/
 2023-07-04 13:42:04 +08:00
老广 c8f420f62d
Merge pull request #10893 from jumpserver/pr@dev@perf_rdp7_web 
perf: rdp7 可使用 web gui方式连接
 2023-07-04 13:39:28 +08:00
Eric 02550b38f8 perf: rdp7 可使用 web gui方式连接 2023-07-04 12:52:36 +08:00
老广 50531d3b97
Merge pull request #10829 from jumpserver/pr@dev@perf_support_anonymous_account 
perf: web 和 自定义类型资产支持匿名账号
 2023-07-04 11:46:24 +08:00
ibuler db7ad81103 merge: 合并 dev 2023-07-04 11:45:20 +08:00
ibuler d72ec653f4 merge: 合并 dev 2023-07-04 11:43:33 +08:00
老广 7950718582
Merge pull request #10825 from jumpserver/pr@dev@perf_asset_node 
perf: 接口sql优化 /api/v1/assets/nodes/children/tree/
 2023-07-04 11:28:45 +08:00
老广 998321f090
Merge pull request #10882 from jumpserver/pr@dev@perf_dockerfile 
feat: 合并 Dockerfile
 2023-07-04 11:26:23 +08:00
老广 1fa258da3e
Merge pull request #10889 from jumpserver/pr@dev@perf_connectiontoken 
perf: 修复 ConnectionToken 中 account id 的问题
 2023-07-04 11:18:25 +08:00
ibuler 8dbe61100b perf: 优化协议，支持 port from addr 2023-07-04 10:29:27 +08:00
Eric d7f9f3b670 perf: 修复 ConnectionToken 中 account id 的问题 2023-07-03 19:19:25 +08:00
老广 8b18f46613
Merge pull request #10880 from jumpserver/pr@dev@perf_xrdp_rdp7 
perf: add xrdp rdp7 port 3390
 2023-07-03 16:29:06 +08:00
吴小白 eb49beaf46 fix: 修正 oracle 路径 2023-07-03 10:37:42 +08:00
吴小白 3971fce561 feat: 合并 Dockerfile 2023-07-03 10:28:25 +08:00
Eric 2f81196874 perf: 更新 rdp7 protocol 设置 2023-07-03 10:22:49 +08:00
Eric 411102ed85 perf: 完善 protocol 匹配 2023-07-03 10:14:39 +08:00
Eric 125dc2adf5 perf: 针对 rdp7 端口特殊处理 2023-07-03 10:14:39 +08:00
Eric 6001175629 perf: add xrdp rdp7 port 3390 2023-07-03 10:14:39 +08:00
ibuler 41e39c9614 perf: 修改 chatgpt 协议 2023-06-30 18:33:18 +08:00
ibuler 19de79fadf feat: 支持 chatgpt 资产 2023-06-30 17:35:49 +08:00
老广 6b7df10d50
Merge pull request #10877 from jumpserver/pr@dev@perf_applet_chrome 
perf: 更新 Python
 2023-06-30 16:01:18 +08:00
吴小白 ce269e315a perf: 更新 Python 2023-06-30 15:58:20 +08:00
老广 dfc8654d96
Merge pull request #10876 from jumpserver/pr@dev@perf_applet_chrome 
perf: 更新 Chrome
 2023-06-30 15:58:18 +08:00