Commit Graph

  • 41ee6a64bd Merge remote-tracking branch 'origin/v3' into v3 Aaron3S 2022-10-31 19:29:50 +08:00
  • 5fa852c61d fix: 删除不管用的序列化字段 Aaron3S 2022-10-31 19:28:15 +08:00
  • 5bd40fcd22 fix: swagger feng 2022-10-31 19:27:45 +08:00
  • a5244ee68f Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 Jiangjie.Bai 2022-10-31 18:50:14 +08:00
  • 81e3809435 refactor: 修改 ConnectionToken API 结构 Jiangjie.Bai 2022-10-31 18:47:12 +08:00
  • 4f2250b7a8 perf: gather account windows feng 2022-10-31 18:32:07 +08:00
  • 094e144a51 perf: history secret feng 2022-10-31 17:37:54 +08:00
  • ead824a03c feat: 支持部署在Redis哨兵集群上 jiangweidong 2022-10-25 11:02:44 +08:00
  • 8df15cb564 fix: 修复饮用 ibuler 2022-10-31 14:29:42 +08:00
  • db07cadd6e merge: with rmote ibuler 2022-10-31 11:22:47 +08:00
  • d123c7f105 pref: 修改执行部署 ibuler 2022-10-31 10:57:19 +08:00
  • a11770e96d fix: automiation feng 2022-10-31 10:42:12 +08:00
  • 16e3604fcb merge: with remote ibuler 2022-10-28 19:12:37 +08:00
  • f5fd674f08 pref: 修改 v3 ibuler 2022-10-28 19:10:19 +08:00
  • 121ba1df07 perf: automations push ping verify feng 2022-10-28 18:28:41 +08:00
  • 12b74093e2 pref: 修改 applet host deploy ibuler 2022-10-28 18:19:44 +08:00
  • 8f9eb64c8d perf: update playbook.yml Eric 2022-10-28 17:12:18 +08:00
  • 50be7c6fc8 fix: rdp客户端拉起后窗口标题中文乱码 halo 2022-10-28 14:10:22 +08:00
  • 85574b43ee perf: update playbook.yml 吴小白 2022-10-26 19:25:34 +08:00
  • 994a484adb Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 ibuler 2022-10-28 16:26:00 +08:00
  • 084dcc7b44 pref: 修改 inventory ibuler 2022-10-28 16:25:16 +08:00
  • bcd1d5585b refactor: ConnectionToken 修改 Model 和序列类 Jiangjie.Bai 2022-10-28 15:58:05 +08:00
  • 2b5b4ad605 refactor: ConnectionToken 修改表字段名称 account -> account_username Jiangjie.Bai 2022-10-28 15:01:17 +08:00
  • bd9afaba1e Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 ibuler 2022-10-27 20:24:01 +08:00
  • a9eb4fa7dd pref: 修改 applet ibuler 2022-10-27 20:20:40 +08:00
  • c80ef1afb1 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 Jiangjie.Bai 2022-10-27 20:06:27 +08:00
  • 3d616b01b0 refactor: ConnectionToken 添加 protocol 字段 Jiangjie.Bai 2022-10-27 20:01:50 +08:00
  • 53b0041b09 feat: celery task api Aaron3S 2022-10-27 19:25:48 +08:00
  • da911651aa feat: celery task api Aaron3S 2022-10-27 19:23:15 +08:00
  • 4ab14b4a59 perf: migrat feng 2022-10-27 19:03:42 +08:00
  • 2355d1af83 perf: gather accounts feng 2022-10-27 18:53:10 +08:00
  • 097ebc2362 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 ibuler 2022-10-27 18:34:34 +08:00
  • c0540e6787 pref: 修改 celery ibuler 2022-10-27 18:34:25 +08:00
  • bb01a60fc1 refactor: 修改 authentication models 目录 Jiangjie.Bai 2022-10-27 17:20:31 +08:00
  • e4d372be32 fix: 修改默认组织 builtin 字段处理问题 Jiangjie.Bai 2022-10-27 16:49:22 +08:00
  • 28f4905a81 pref: 修改 applet host ibuler 2022-10-27 16:26:15 +08:00
  • 5d37d1b7b1 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 Jiangjie.Bai 2022-10-27 15:48:02 +08:00
  • a260da6cec refactor: 修改 ConnectionToken 关联的逻辑(1) Jiangjie.Bai 2022-10-27 15:47:05 +08:00
  • 1239247b5a pref: 修改删掉 connection token type ibuler 2022-10-26 17:56:37 +08:00
  • 8f88b898d0 pref: 修改 migrations ibuler 2022-10-26 17:38:32 +08:00
  • 651228795e pref: 修改 migrations ibuler 2022-10-26 17:25:57 +08:00
  • c55f068258 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 ibuler 2022-10-26 17:22:39 +08:00
  • 99e4836311 pref: 添加 deploy playbook ibuler 2022-10-26 17:21:52 +08:00
  • 3977b81ea1 Merge remote-tracking branch 'origin/v3' into v3 Aaron3S 2022-10-26 17:20:55 +08:00
  • bd001bb262 refactor: 修改 ConnectionToken 表结构 Jiangjie.Bai 2022-10-26 16:16:12 +08:00
  • fb6f51b9cb merge: dev Jiangjie.Bai 2022-10-26 16:15:22 +08:00
  • 13279c9d2a refactor: 修改 ConnectionToken 表结构 Jiangjie.Bai 2022-10-26 16:09:07 +08:00
  • 77436724b4 Merge remote-tracking branch 'origin/v3' into v3 Aaron3S 2022-10-25 20:10:06 +08:00
  • e327c97170 pref: 修改迁移文件 ibuler 2022-10-25 20:09:05 +08:00
  • c10d7f554e Merge remote-tracking branch 'origin/v3' into v3 Aaron3S 2022-10-25 20:05:47 +08:00
  • e7a114a31d feat: celery 任务api Aaron3S 2022-10-25 20:02:23 +08:00
  • c018055d5f pref: 修改migrations ibuler 2022-10-25 19:58:14 +08:00
  • 350c9e4a80 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 ibuler 2022-10-25 19:38:40 +08:00
  • 82aca6b843 pref: 修改 applet ibuler 2022-10-25 19:31:13 +08:00
  • 11eb505c78 refactor: 修改 ConnectionToken 表结构 Jiangjie.Bai 2022-10-25 19:10:12 +08:00
  • 901270e6ad Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 Jiangjie.Bai 2022-10-25 18:45:33 +08:00
  • 6ed946541d merge: local Jiangjie.Bai 2022-10-25 18:45:13 +08:00
  • 4dd4c29e12 perf: gather facts feng 2022-10-25 18:43:34 +08:00
  • 2509b801c6 Merge remote-tracking branch 'origin/v3' into v3 Aaron3S 2022-10-25 18:09:26 +08:00
  • a445e47f3d perf: account add platform_id feng 2022-10-25 15:07:51 +08:00
  • d95ced5109 fix: 修复change account perm 问题 feng 2022-10-25 14:26:56 +08:00
  • 8fd6cabcab Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 ibuler 2022-10-25 13:00:20 +08:00
  • 5606082ca3 pref: 添加 applet 创建 api ibuler 2022-10-25 12:57:34 +08:00
  • f743dea1fd perf: mysql postgresql feng 2022-10-24 20:24:56 +08:00
  • 64e03a4412 feat: 增加异步任务api Aaron3S 2022-10-24 20:14:18 +08:00
  • 1372d6322d perf: 合并代码 ibuler 2022-10-22 11:37:51 +08:00
  • 943b130035 feat: 添加远程应用 ibuler 2022-10-22 11:17:02 +08:00
  • 64daacce63 fix: 修复自动化修改密码bug feng 2022-10-21 18:19:09 +08:00
  • 091bffa626 perf: automation change secret linux feng 2022-10-20 20:34:15 +08:00
  • bab4562820 Merge pull request #8980 from jumpserver/dev v2.27.0 Jiangjie.Bai 2022-10-20 20:39:39 +08:00
  • 3e7004d784 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 ibuler 2022-10-20 20:35:34 +08:00
  • c6dfc06003 perf: 修改翻译 ibuler 2022-10-20 20:34:44 +08:00
  • 7255cf68a9 perf: automation change secret linux feng 2022-10-20 20:34:15 +08:00
  • 168de45da5 pref: 优化 device api ibuler 2022-10-20 20:06:58 +08:00
  • 104dd9721b perf: 优化smart匹配数据库端口数量失败时的错误提示信息 Jiangjie.Bai 2022-10-20 17:37:25 +08:00
  • cdcfdeefc5 perf: 优化smart匹配数据库端口数量失败时的错误提示信息 Jiangjie.Bai 2022-10-20 17:24:36 +08:00
  • a450ceee91 pref: 修改 migrations 名称 ibuler 2022-10-20 16:44:15 +08:00
  • ef04e6ffcc Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 ibuler 2022-10-20 16:39:55 +08:00
  • c55d3c0b6c perf: 添加 histories ibuler 2022-10-20 16:39:11 +08:00
  • 613a7d63b5 Merge pull request #8973 from jumpserver/dev Jiangjie.Bai 2022-10-19 20:30:13 +08:00
  • c6a3a141bb perf: 优化Magnus Ports端口映射配置项 Jiangjie.Bai 2022-10-19 20:03:06 +08:00
  • 26278cc9e0 perf: change secret automation feng 2022-10-19 17:05:21 +08:00
  • 1a2193d091 perf: 资产 api 返回特有属性 ibuler 2022-10-19 18:56:46 +08:00
  • 93e5a0ba5c fix: 修改初始化 DB Port Mapper 时的日志输出 Jiangjie.Bai 2022-10-19 17:42:29 +08:00
  • eb16e3c7cb perf: 修改翻译 ibuler 2022-10-19 14:56:27 +08:00
  • 076afb2b8b pref: 修改 automations ibuler 2022-10-19 11:39:11 +08:00
  • d6e36c873d pref: 修改 filter ibuler 2022-10-19 10:21:05 +08:00
  • 129c0e1bf4 Merge pull request #8968 from jumpserver/dev Jiangjie.Bai 2022-10-18 20:48:37 +08:00
  • 8c92a9934b Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 ibuler 2022-10-18 20:38:03 +08:00
  • 9b44ed55c2 pref: 修改 secret encrypt ibuler 2022-10-18 20:37:17 +08:00
  • 62c57d2fdf fix: 修复创建目录时指定权限为 755 Jiangjie.Bai 2022-10-18 18:00:04 +08:00
  • 4711813af8 fix: 修复创建目录时指定权限为 755 Jiangjie.Bai 2022-10-18 17:47:13 +08:00
  • 152749c872 refactor: 重构资产授权工具、资产授权账号工具类;删除Model中的处理逻辑;增加用户组、资产授权账号的获取方式 Jiangjie.Bai 2022-10-18 16:42:32 +08:00
  • 2c04ad6465 refactor: 重构资产授权工具、资产授权账号工具类 Jiangjie.Bai 2022-10-18 16:04:45 +08:00
  • c41e0148d9 refactor: 重构资产授权工具、资产授权账号工具类 Jiangjie.Bai 2022-10-18 15:21:44 +08:00
  • 384873b4cb Merge pull request #8964 from jumpserver/dev Jiangjie.Bai 2022-10-18 11:19:59 +08:00
  • 33860bb955 fix: 修复资产详情 查看授权用户500问题 (#8963) fit2bot 2022-10-18 10:51:51 +08:00
  • 1b795791de fix: swagger 500 feng 2022-10-18 10:43:51 +08:00
  • 4f16c1f92c fix: account init 500 feng 2022-10-17 17:56:19 +08:00
  • 6a33129349 pref: 完成收集资产信息任务 ibuler 2022-10-17 11:22:21 +08:00