github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
8,423 Commits
95 Branches
262 Tags
144 MiB
Commit Graph

8423 Commits (46a91f041a725a6ff9e65a8e8883da90a3e5d9f8)

Author SHA1 Message Date
老广 46a91f041a
Revert "chore(deps): bump certifi from 2018.1.18 to 2022.12.7 in /requirements" 2023-01-16 07:51:12 +05:30
老广 ef04c92223
Merge pull request #9173 from jumpserver/dependabot/pip/requirements/certifi-2022.12.7 
chore(deps): bump certifi from 2018.1.18 to 2022.12.7 in /requirements
 2023-01-10 13:46:31 +08:00
老广 38f078205d Update README.md 2023-01-03 13:12:18 +08:00
老广 ce0632f49b
Merge pull request #9250 from jumpserver/v3 
v3 to dev
 2022-12-28 13:26:25 +08:00
吴小白 b01c466d6d
Merge pull request #9249 from jumpserver/pr@v3@chore_cryptography 
chore(deps): bump cryptography from 36.0.2 to 38.0.4 in /requirements
 2022-12-28 13:18:11 +08:00
吴小白 6f36242a7d chore(deps): bump cryptography from 36.0.2 to 38.0.4 in /requirements 2022-12-28 13:01:30 +08:00
feng 7094df3527 remove rbac redundant perms 2022-12-28 11:25:12 +08:00
Bai dbad0851e3 perf: 修改翻译 内部的 -> 内置 2022-12-27 19:00:32 +08:00
ibuler 1b1c91bab0 t po v3 
:wqMerge branch 'v3' of github.com:jumpserver/jumpserver into v3
 2022-12-27 18:26:24 +08:00
Bai 52b5c8beee fix: 删除 AssetSerializer 中 enabled_info 字段 (已放到 AssetDetailSerializer 中). 2022-12-27 17:57:22 +08:00
feng ccc766df8d perf: account source 2022-12-27 17:54:34 +08:00
fit2bot c81f36cc27
perf: remove gather model (#9246) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-27 17:45:41 +08:00
Bai 0328fd1bb0 merge: v3 2022-12-27 17:13:29 +08:00
ibuler da61b4e201 perf: 修改 asset api 2022-12-27 17:06:00 +08:00
Aaron3S 1cfe8d9cc8 feat: 支持超时时间设置 2022-12-27 16:59:32 +08:00
Aaron3S ddca4dce41 feat: 支持pyhton脚本 2022-12-27 16:59:32 +08:00
ibuler 1b9aad594c perf: remove push account 2022-12-27 16:54:47 +08:00
ibuler 411d199e18 perf: 修改 asset serializer 2022-12-27 16:53:23 +08:00
Bai 825bea5ea5 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-27 16:21:38 +08:00
Bai ba9123b1c4 perf: 修改资产序列类字段翻译 2022-12-27 16:21:32 +08:00
ibuler 3336f2ba67 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-27 15:28:32 +08:00
ibuler 3da9efc3fd perf: 修改账号推送 2022-12-27 15:27:33 +08:00
fit2bot 1e0bfbf8a8
perf: permission (#9244) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-27 14:48:00 +08:00
ibuler 795e952dc1 perf: change tree api 2022-12-27 13:20:18 +08:00
Bai bb23c2a9fa perf: 修改翻译组织ID 2022-12-26 20:30:10 +08:00
Bai a7be8bf365 perf: 修改翻译组织ID 2022-12-26 20:29:56 +08:00
Bai ed35ac2930 perf: 修改 OPTION 获取字段 org_id label 为 Organization ID 2022-12-26 19:32:07 +08:00
Bai 7f6d13a5a6 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-26 19:16:18 +08:00
Bai d0f70f4316 perf: 修改用户序列类 can_public_key_auth 类型; 修改 OPTION 获取字段 id label 为 ID 2022-12-26 19:16:11 +08:00
Aaron3S 9ba792cf1c feat: ops 支持节点和资产 2022-12-26 19:03:59 +08:00
ibuler dd630f0e14 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-26 18:58:48 +08:00
ibuler 3145582f0b perf: 修改 accounts 2022-12-26 18:58:21 +08:00
Bai d2ba7a98ea perf: 修改授权序列类字段翻译信息 2022-12-26 16:15:44 +08:00
Bai c924f48d79 perf: gitignore add .fleet/ 2022-12-26 15:33:43 +08:00
ibuler 3172e954a8 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-26 15:02:27 +08:00
ibuler 6d4914fbd5 perf: 修改翻译 2022-12-26 15:01:51 +08:00
fit2bot ed82249fd1
perf: asset perm (#9240) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-23 19:01:29 +08:00
Aaron3S e32d51253a feat: 批量命令api 2022-12-23 18:23:20 +08:00
ibuler 213ae65b9a Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-23 16:15:56 +08:00
feng 8de2ffe5f4 perf: rbac asset 2022-12-23 16:10:04 +08:00
ibuler 4bd913b585 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-23 16:00:11 +08:00
ibuler 6bf4de8134 perf: 修改登录页面 2022-12-23 15:59:34 +08:00
fit2bot 7530afe368
perf: 翻译 (#9239) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-23 15:49:32 +08:00
吴小白 db22a68786
Merge pull request #9235 from jumpserver/pr@v3@perf_check_celery 
perf: 更新 celery 健康检测
 2022-12-23 15:00:17 +08:00
Bai 4f8e0fc28e fix: 修改授权树API，连续刷新3次转为强制刷新；修改异步授权树一级节点的资产显示问题； 2022-12-23 13:19:38 +08:00
ibuler 047ba34238 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-23 11:12:31 +08:00
ibuler ffa30fdb69 perf: 修改 Logo 2022-12-23 11:11:56 +08:00
fit2bot c5edb9981e
perf: rbac tree (#9237) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-22 20:09:20 +08:00
Bai 3443b06a28 fix: 修复异步加载luna资产授权树时根节点下资产没有返回的问题 2022-12-22 19:17:52 +08:00
Bai 4aed287efc Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-12-22 18:57:04 +08:00