Commit Graph

7763 Commits

Author SHA1 Message Date
ibuler
8df15cb564 fix: 修复饮用 2022-10-31 14:29:42 +08:00
ibuler
db07cadd6e merge: with rmote 2022-10-31 11:22:47 +08:00
ibuler
d123c7f105 pref: 修改执行部署 2022-10-31 10:57:19 +08:00
feng
a11770e96d fix: automiation 2022-10-31 10:42:12 +08:00
ibuler
16e3604fcb merge: with remote 2022-10-28 19:12:37 +08:00
ibuler
f5fd674f08 pref: 修改 v3 2022-10-28 19:10:19 +08:00
feng
121ba1df07 perf: automations push ping verify 2022-10-28 18:34:12 +08:00
ibuler
12b74093e2 pref: 修改 applet host deploy 2022-10-28 18:19:44 +08:00
Eric
8f9eb64c8d perf: update playbook.yml 2022-10-28 17:32:47 +08:00
吴小白
85574b43ee perf: update playbook.yml 2022-10-28 16:28:55 +08:00
ibuler
994a484adb Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-28 16:26:00 +08:00
ibuler
084dcc7b44 pref: 修改 inventory 2022-10-28 16:25:16 +08:00
Jiangjie.Bai
bcd1d5585b refactor: ConnectionToken 修改 Model 和序列类 2022-10-28 15:58:05 +08:00
Jiangjie.Bai
2b5b4ad605 refactor: ConnectionToken 修改表字段名称 account -> account_username 2022-10-28 15:01:17 +08:00
ibuler
bd9afaba1e Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-27 20:24:01 +08:00
ibuler
a9eb4fa7dd pref: 修改 applet 2022-10-27 20:20:40 +08:00
Jiangjie.Bai
c80ef1afb1 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-27 20:06:27 +08:00
Jiangjie.Bai
3d616b01b0 refactor: ConnectionToken 添加 protocol 字段 2022-10-27 20:01:50 +08:00
Aaron3S
53b0041b09 feat: celery task api 2022-10-27 19:25:48 +08:00
Aaron3S
da911651aa feat: celery task api 2022-10-27 19:23:15 +08:00
feng
4ab14b4a59 perf: migrat 2022-10-27 19:08:51 +08:00
feng
2355d1af83 perf: gather accounts 2022-10-27 18:53:10 +08:00
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
Jiangjie.Bai
bb01a60fc1 refactor: 修改 authentication models 目录 2022-10-27 17:20:31 +08:00
Jiangjie.Bai
e4d372be32 fix: 修改默认组织 builtin 字段处理问题 2022-10-27 16:49:22 +08:00
ibuler
28f4905a81 pref: 修改 applet host 2022-10-27 16:26:15 +08:00
Jiangjie.Bai
5d37d1b7b1 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-27 15:48:02 +08:00
Jiangjie.Bai
a260da6cec refactor: 修改 ConnectionToken 关联的逻辑(1) 2022-10-27 15:47:05 +08:00
ibuler
1239247b5a pref: 修改删掉 connection token type 2022-10-26 17:56:37 +08:00
ibuler
8f88b898d0 pref: 修改 migrations 2022-10-26 17:38:32 +08:00
ibuler
651228795e pref: 修改 migrations 2022-10-26 17:25:57 +08:00
ibuler
c55f068258 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-10-26 17:22:39 +08:00
ibuler
99e4836311 pref: 添加 deploy playbook 2022-10-26 17:21:52 +08:00
Aaron3S
3977b81ea1 Merge remote-tracking branch 'origin/v3' into v3 2022-10-26 17:20:55 +08:00
Jiangjie.Bai
bd001bb262 refactor: 修改 ConnectionToken 表结构 2022-10-26 16:16:12 +08:00
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