8241 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jiangjie.Bai	fb6f51b9cb	merge: dev	2022-10-26 16:15:22 +08:00
Jiangjie.Bai	13279c9d2a	refactor: 修改 ConnectionToken 表结构	2022-10-26 16:09:07 +08:00
Aaron3S	77436724b4	Merge remote-tracking branch 'origin/v3' into v3	2022-10-25 20:10:06 +08:00
ibuler	e327c97170	pref: 修改迁移文件	2022-10-25 20:09:05 +08:00
Aaron3S	c10d7f554e	Merge remote-tracking branch 'origin/v3' into v3	2022-10-25 20:05:47 +08:00
Aaron3S	e7a114a31d	feat: celery 任务api	2022-10-25 20:02:23 +08:00
ibuler	c018055d5f	pref: 修改migrations	2022-10-25 19:58:14 +08:00
ibuler	350c9e4a80	Merge branch 'v3' of github.com:jumpserver/jumpserver into v3	2022-10-25 19:38:40 +08:00
ibuler	82aca6b843	pref: 修改 applet	2022-10-25 19:31:13 +08:00
Jiangjie.Bai	11eb505c78	refactor: 修改 ConnectionToken 表结构	2022-10-25 19:10:12 +08:00
Jiangjie.Bai	901270e6ad	Merge branch 'v3' of github.com:jumpserver/jumpserver into v3	2022-10-25 18:45:33 +08:00
Jiangjie.Bai	6ed946541d	merge: local	2022-10-25 18:45:13 +08:00
feng	4dd4c29e12	perf: gather facts	2022-10-25 18:43:34 +08:00
Aaron3S	2509b801c6	Merge remote-tracking branch 'origin/v3' into v3 ... # Conflicts: # apps/rbac/const.py	2022-10-25 18:09:26 +08:00
feng	a445e47f3d	perf: account add platform_id	2022-10-25 15:07:51 +08:00
feng	d95ced5109	fix: 修复change account perm 问题	2022-10-25 14:26:56 +08:00
ibuler	8fd6cabcab	Merge branch 'v3' of github.com:jumpserver/jumpserver into v3	2022-10-25 13:00:20 +08:00
ibuler	5606082ca3	pref: 添加 applet 创建 api	2022-10-25 12:57:34 +08:00
feng	f743dea1fd	perf: mysql postgresql	2022-10-24 20:24:56 +08:00
Aaron3S	64e03a4412	feat: 增加异步任务api	2022-10-24 20:14:18 +08:00
ibuler	1372d6322d	perf: 合并代码	2022-10-22 11:37:51 +08:00
ibuler	943b130035	feat: 添加远程应用	2022-10-22 11:17:02 +08:00
feng	64daacce63	fix: 修复自动化修改密码bug	2022-10-21 18:19:09 +08:00
feng	091bffa626	perf: automation change secret linux	2022-10-21 11:24:05 +08:00
ibuler	3e7004d784	Merge branch 'v3' of github.com:jumpserver/jumpserver into v3	2022-10-20 20:35:34 +08:00
ibuler	c6dfc06003	perf: 修改翻译	2022-10-20 20:34:44 +08:00
feng	7255cf68a9	perf: automation change secret linux	2022-10-20 20:34:15 +08:00
ibuler	168de45da5	pref: 优化 device api	2022-10-20 20:06:58 +08:00
Jiangjie.Bai	104dd9721b	perf: 优化smart匹配数据库端口数量失败时的错误提示信息	2022-10-20 17:38:15 +08:00
Jiangjie.Bai	cdcfdeefc5	perf: 优化smart匹配数据库端口数量失败时的错误提示信息	2022-10-20 17:38:15 +08:00
ibuler	a450ceee91	pref: 修改 migrations 名称	2022-10-20 16:44:15 +08:00
ibuler	ef04e6ffcc	Merge branch 'v3' of github.com:jumpserver/jumpserver into v3	2022-10-20 16:39:55 +08:00
ibuler	c55d3c0b6c	perf: 添加 histories	2022-10-20 16:39:11 +08:00
Jiangjie.Bai	c6a3a141bb	perf: 优化Magnus Ports端口映射配置项	2022-10-19 20:14:20 +08:00
feng	26278cc9e0	perf: change secret automation	2022-10-19 18:58:45 +08:00
ibuler	1a2193d091	perf: 资产 api 返回特有属性	2022-10-19 18:56:46 +08:00
Jiangjie.Bai	93e5a0ba5c	fix: 修改初始化 DB Port Mapper 时的日志输出	2022-10-19 17:54:10 +08:00
ibuler	eb16e3c7cb	perf: 修改翻译	2022-10-19 14:56:27 +08:00
ibuler	076afb2b8b	pref: 修改 automations	2022-10-19 11:39:11 +08:00
ibuler	d6e36c873d	pref: 修改 filter	2022-10-19 10:21:05 +08:00
ibuler	8c92a9934b	Merge branch 'v3' of github.com:jumpserver/jumpserver into v3	2022-10-18 20:38:03 +08:00
ibuler	9b44ed55c2	pref: 修改 secret encrypt	2022-10-18 20:37:17 +08:00
Jiangjie.Bai	62c57d2fdf	fix: 修复创建目录时指定权限为 755	2022-10-18 18:09:57 +08:00
Jiangjie.Bai	4711813af8	fix: 修复创建目录时指定权限为 755	2022-10-18 18:09:57 +08:00
Jiangjie.Bai	152749c872	refactor: 重构资产授权工具、资产授权账号工具类;删除Model中的处理逻辑;增加用户组、资产授权账号的获取方式	2022-10-18 16:42:32 +08:00
Jiangjie.Bai	2c04ad6465	refactor: 重构资产授权工具、资产授权账号工具类	2022-10-18 16:04:45 +08:00
Jiangjie.Bai	c41e0148d9	refactor: 重构资产授权工具、资产授权账号工具类	2022-10-18 15:21:44 +08:00
fit2bot	33860bb955	fix: 修复资产详情 查看授权用户500问题 (#8963) ... Co-authored-by: 小冯 <xiaofeng@xiaofengdeMacBook-Pro.local>	2022-10-18 10:51:51 +08:00
feng	1b795791de	fix: swagger 500	2022-10-18 10:43:51 +08:00
feng	4f16c1f92c	fix: account init 500	2022-10-17 17:56:19 +08:00