github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
8,495 Commits
68 Branches
246 Tags
108 MiB
Commit Graph

8495 Commits (6b4dbe655484e134cdb5ddd849e25cec01c356ee)

Author SHA1 Message Date
ibuler 6390b9c203 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-02 11:53:45 +08:00
ibuler a6aafaec05 perf: 修改 command filter 2022-12-02 11:53:07 +08:00
fit2bot 541358978d
fix: gateway (#9145) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-02 11:45:05 +08:00
ibuler 19c3f98e8f pref: 修改 migrations 冲突 2022-12-02 11:14:29 +08:00
ibuler fdbaa0afe1 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-02 11:12:25 +08:00
ibuler a18f544cf8 perf: 修改 acl 2022-12-02 11:12:14 +08:00
老广 1165ea817f
Merge pull request #9035 from jumpserver/pr@v3@feat_db_automations 
[v3] feat: 支持Oracle、MongoDB、SQLServer数据库自动化操作部分功能
 2022-12-02 10:53:29 +08:00
jiangweidong 85aad7ba62 feat: 解决冲突 2022-12-02 10:52:31 +08:00
老广 017a674f63
Merge pull request #9143 from jumpserver/pr@v3@perf_gunicorn 
perf: 去掉 gunicorn threads
 2022-12-02 10:47:16 +08:00
吴小白 709b6e5b0d perf: 去掉 gunicorn threads 2022-12-02 10:45:12 +08:00
老广 a68e2e29f4
Merge pull request #9110 from jumpserver/dependabot/pip/requirements/pillow-9.3.0 
build(deps): bump pillow from 9.1.1 to 9.3.0 in /requirements
 2022-12-02 10:45:11 +08:00
老广 11a786d858
Merge pull request #9076 from jumpserver/v3_async_ws 
perf: asyncio ws task log
 2022-12-02 10:44:24 +08:00
老广 07f2e66546
Merge pull request #9138 from jumpserver/pr@dev@fix_csrf_403_error 
fix: 增加CSRF_TRUSTED_ORIGINS参数，解决CSRF报错
 2022-12-02 10:40:55 +08:00
老广 a6b1052767
Merge pull request #9139 from jumpserver/pr@v3@perf_gunicorn 
perf: 控制 gunicorn 启动进程
 2022-12-02 10:40:09 +08:00
老广 ab4c8402c3
Merge pull request #9119 from jumpserver/pr@v3@feat_support_clear_private_key 
feat: 支持账号更新界面清空存在的秘钥信息
 2022-12-02 10:35:43 +08:00
老广 bcf509ab07
Merge branch 'v3' into pr@v3@feat_support_clear_private_key 2022-12-02 10:35:20 +08:00
Eric 10e3100d3c fix: LoginAssetACL confirm action 2022-12-01 22:09:16 +08:00
Bai 2401c241f2 fix: 修改 random_string 方法，支持只生成随机数字 2022-12-01 20:12:51 +08:00
ibuler 1fb0b0849d Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-01 19:41:42 +08:00
ibuler cb3877bbda perf: 修改 acl 添加命令过滤 acl 2022-12-01 19:41:18 +08:00
feng fa0382fc5e perf: gateway manager 2022-12-01 18:22:41 +08:00
吴小白 ce3ec85147 fix: 去掉默认值 2022-12-01 16:22:26 +08:00
吴小白 2bc47c87d1 perf: 修正错误 2022-12-01 16:12:10 +08:00
ibuler 8162a1b17e perf: 优化 gateway 2022-12-01 15:21:53 +08:00
吴小白 7a475fc029 perf: 控制 gunicorn 启动进程 2022-12-01 14:54:57 +08:00
halo 269c087bac fix: 增加CSRF_TRUSTED_ORIGINS参数，解决CSRF报错 2022-12-01 13:47:25 +08:00
fit2bot d1461b33c5
perf: gather account mysql (#9136) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-01 13:12:31 +08:00
Bai d5d770e4ac Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-01 12:03:08 +08:00
Bai b55b755e8e fix: 修复 LoginAssetACL Check API 获取 account_username 失败的问题 2022-12-01 12:03:01 +08:00
Bai 592d79c0f8 perf: 合并授权规则用户相关的 API URL，统一使用 /<str:user>/ 格式 2022-12-01 12:02:20 +08:00
feng 26efc42e8b perf: type to assets 2022-12-01 10:23:04 +08:00
Eric d198dfcba9 perf: granted asset add specific field 2022-12-01 00:36:02 +08:00
Bai a430b0f1a9 perf: 优化 Login Asset ACL Serializer reviewers 字段 2022-11-30 23:05:20 +08:00
Bai 3b1c8a2327 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-30 21:13:56 +08:00
Bai 2aa1d664a6 perf: 处理 acl filter 逻辑放到 queryset 中 2022-11-30 21:13:50 +08:00
feng a0df39ad28 fix: 修改connection token 对接client的username 2022-11-30 20:38:22 +08:00
feng 314b63cec8 perf: connection token launch command 2022-11-30 20:21:23 +08:00
fit2bot edae6942ac
perf: connection token client add protocol (#9134) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-30 20:02:13 +08:00
Eric 142348b055 perf: 增加资产过滤 2022-11-30 18:16:52 +08:00
fit2bot 4083df07cc
perf: audit navigation (#9133) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-30 18:13:15 +08:00
Bai d524e9885d Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-30 17:11:43 +08:00
Bai 2dea891b15 perf: 处理 acl 后台 check 逻辑 2022-11-30 17:11:36 +08:00
吴小白 6bb706efcf perf: 添加代码构建测试 actions 2022-11-30 17:06:52 +08:00
ibuler 0ffea3855b perf: 修改 connect token api 2022-11-30 16:39:27 +08:00
ibuler 6f02b239db Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-30 16:33:52 +08:00
ibuler ed77d05bd8 pref: conneect token 支持 su from 2022-11-30 16:33:22 +08:00
Aaron3S dcbdb0af4d feat: 支持执行目录切换,修改字段显示 2022-11-30 16:25:31 +08:00
Bai 25b9739ce3 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-30 16:24:21 +08:00
Bai 48d2949404 perf: 修改 acl assets name/address 2022-11-30 16:21:27 +08:00
ibuler 307cf97ccb perf: 授权的资产支持过滤 2022-11-30 15:39:27 +08:00