Commit Graph

2290 Commits

Author SHA1 Message Date
ibuler
097ebc2362 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-27 18:34:34 +08:00
ibuler
c0540e6787 pref: 修改 celery 2022-10-27 18:34:25 +08:00
ibuler
28f4905a81 pref: 修改 applet host 2022-10-27 16:26:15 +08:00
Jiangjie.Bai
a260da6cec refactor: 修改 ConnectionToken 关联的逻辑(1) 2022-10-27 15:47:05 +08:00
ibuler
e327c97170 pref: 修改迁移文件 2022-10-25 20:09:05 +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
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
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
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
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
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
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
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
fit2bot
33860bb955 fix: 修复资产详情 查看授权用户500问题 (#8963)
Co-authored-by: 小冯 <xiaofeng@xiaofengdeMacBook-Pro.local>
2022-10-18 10:51:51 +08:00
feng
4f16c1f92c fix: account init 500 2022-10-17 17:56:19 +08:00
ibuler
6a33129349 pref: 完成收集资产信息任务 2022-10-17 11:22:21 +08:00
ibuler
4e8e4e4bb7 pref: 修改添加 gather facts 2022-10-14 19:40:51 +08:00
ibuler
75ec9d4173 perf: 添加 gather facts automation 2022-10-14 18:59:28 +08:00
Jiangjie.Bai
c79c3f8aec Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-14 17:01:44 +08:00
Jiangjie.Bai
0e67739173 refactor: 授权添加授权账号工具,实现获取授权用户某个资产账号的功能 2022-10-14 17:01:36 +08:00
ibuler
4e2aebde6c perf: 修改改密 2022-10-14 16:33:24 +08:00
Jiangjie.Bai
18e525c943 fix: 修改命令过滤器权限 2022-10-14 10:58:06 +08:00
ibuler
0a65b9de8e perf: 重构 playbook base runner 2022-10-13 20:28:18 +08:00
ibuler
52fb55e806 pref: 修改改密 2022-10-13 17:52:25 +08:00
ibuler
8c91cd7eb6 perf: 修改改密 2022-10-13 17:47:29 +08:00
ibuler
85a6f29a0a perf: 修改 playbook 任务执行 2022-10-12 18:08:57 +08:00
feng626
22e211625e fix: platform 500 2022-10-11 10:50:39 +08:00
ibuler
21816e3a39 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-10 20:56:55 +08:00
ibuler
9198c93fcf perf: 修改 ansible change password 2022-10-10 20:56:13 +08:00
feng626
6e0d211645 perf: automation migrate 2022-10-10 17:08:06 +08:00
ibuler
1d757ec19a pref: 修改改密 2022-10-10 16:56:32 +08:00