github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
8,396 Commits
67 Branches
246 Tags
107 MiB
Commit Graph

525 Commits (bb23c2a9fab32bf1755a1ee07a97bae9f3ab14de)

Author SHA1 Message Date
ibuler 6bf4de8134 perf: 修改登录页面 2022-12-23 15:59:34 +08:00
“huailei000” 65387ebff4 perf: 调整登录页面布局 2022-12-22 15:42:45 +08:00
fit2bot c304a58c05
perf: 修改k8s 树 (#9228) 
Co-authored-by: feng <1304903146@qq.com>
 2022-12-21 17:17:54 +08:00
ibuler 58909ee67d perf: 修改基础 model，继承同一个 2022-12-20 20:23:42 +08:00
ibuler 24da1e7d91 perf: 修改 connect token, 获取 applet info 2022-12-20 11:05:00 +08:00
ibuler cb7b31e8b8 perf: perm account 返回 alias 2022-12-15 16:02:34 +08:00
jiangweidong c121ac6b1d perf: OpenID支持PKCE方式对接 2022-12-13 15:30:08 +08:00
Eric 1af86ccdfe perf: change secret_type to LabeledChoiceField 2022-12-13 12:31:20 +08:00
ibuler da36ce9dfd perf: merge connect token rdp option 2022-12-07 15:13:32 +08:00
ibuler dbee3ed30d feat: connect token 添加 Rdp options 2022-12-07 15:09:01 +08:00
“huailei000” b6afe77bc0 perf: 调整登录页样式 2022-12-06 17:43:08 +08:00
Jiangjie.Bai 7842e3e5ab
Merge: v3 to dev (#9160) 
* fix: 修改 ConnectionTokenSecretSerializer

* perf: connect token secret (#9155)

Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: Jiangjie.Bai <bugatti_it@163.com>

* feat: 作业迁移至个人级别

* perf: asset enabled (#9157)

Co-authored-by: feng <1304903146@qq.com>

* perf: 修改ConnectionTokenSecret Gateway数据结构; 修改Domain Gateway Model方法

* perf: ConnectionTokenSecret  返回 domain 信息

* refactor: 移动 Gateway Model 到 asset 目录下

* refactor: 移动 Gateway Model 单独到 gateway 文件中

* perf: 修改 GatewaySerializer 目录

* perf: 修改 GatewaySerializer 目录

Co-authored-by: fit2bot <68588906+fit2bot@users.noreply.github.com>
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
 2022-12-06 11:03:14 +08:00
ibuler daf279304a perf: 修改完冲突了 2022-12-05 18:54:12 +08:00
ibuler e91cbb9c97 merge: with v3 2022-12-05 15:03:21 +08:00
ibuler 873afd239e chore: relove conflict 2022-12-05 13:41:28 +08:00
ibuler 80e550b71a fix: 修复 supertoken 创建 2022-12-05 13:37:37 +08:00
Bai 1a9f520c1f Merge to local v3 2022-12-05 13:32:33 +08:00
Bai cc7424dbfe perf: 修改 CommandFilterACL, CommandGroup Model 的 Meta 内部类; 修改 Command Model 的 system_user -> account 字段; 修改 ConnectionToken 的 command_filter_acls 返回字段; 2022-12-05 13:27:51 +08:00
ibuler ca228074e3 perf: 修改 migrations 依赖 2022-12-05 12:58:09 +08:00
ibuler 38b1701b33 perf: 修改 migrations， 修改 Connect token 2022-12-05 12:42:15 +08:00
ibuler d25d580ba4 perf: 合并 connect token 2022-12-05 11:06:50 +08:00
ibuler 669ccb502f perf: 修改 connect token 2022-12-05 10:48:19 +08:00
Bai a69b762f13 fix: 修改 ACL ActionChoices review, accept, reject 引用 2022-12-04 12:08:44 +08:00
Bai 2b5bd558f3 perf: 修改命令过滤相关的Model, CommandFilterACL, CommandGroup; 修改Model QuerySet 相关的方法; 2022-12-04 00:04:39 +08:00
Bai a70f85e346 fix: 修改 ConnectionToken Serializer 2022-12-02 18:09:07 +08:00
Bai c8c5aca355 fix: 修改 ConnectionToken Serializer 命令过滤器 2022-12-02 17:48:44 +08:00
ibuler a18f544cf8 perf: 修改 acl 2022-12-02 11:12:14 +08:00
fit2bot edae6942ac
perf: connection token client add protocol (#9134) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-30 20:02:13 +08:00
ibuler 0ffea3855b perf: 修改 connect token api 2022-11-30 16:39:27 +08:00
ibuler ed77d05bd8 pref: conneect token 支持 su from 2022-11-30 16:33:22 +08:00
ibuler 4b61790a92 fix: 修复 connect token remote app 错误 2022-11-29 21:50:48 +08:00
ibuler 44ee80b05a perf: 去掉 connect token endpoint protocol 2022-11-29 21:41:33 +08:00
ibuler 6593648554 perf: 修改 connect token 2022-11-29 18:36:42 +08:00
Eric 426900145e perf: connect token asset add specific 2022-11-29 17:08:22 +08:00
ibuler 3ac952f735 perf: 修改 connect token 拉起 2022-11-29 15:47:35 +08:00
ibuler 9412c5d42d perf: 修改 connect token 数据结构 2022-11-29 14:45:29 +08:00
ibuler 0981cd1ed1 perf: 修改 Connect token 数据结构 2022-11-29 14:42:04 +08:00
feng e4edf3be02 perf: migrate 2022-11-29 09:34:43 +08:00
ibuler cb76cad6de Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-28 22:59:17 +08:00
ibuler f6bdc7f81c pref: 暂存 客户端连接方式 2022-11-28 22:58:43 +08:00
fit2bot 11636dafd8
perf: history account secret perm (#9128) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-28 18:43:58 +08:00
Eric 3c5b459ab7 fix: connect token serializer 2022-11-28 15:31:00 +08:00
ibuler a1d72a1746 pref: 修改 connect token 一些 Url 2022-11-28 15:01:16 +08:00
ibuler 211f560400 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-27 18:31:34 +08:00
ibuler 23f3f903f5 perf: 修改 connect token 2022-11-27 18:31:28 +08:00
Bai 8a3bc51faa 解决 authentication 迁移文件冲突 2022-11-26 09:52:04 +08:00
ibuler 5e503ec5b8 Merge branch 'v3' of github.com:jumpserver/jumpserver into v3 2022-11-25 23:11:28 +08:00
ibuler 0f35b3dd58 pref: 修改 connect token 2022-11-25 23:09:55 +08:00
fit2bot d44d475cae
perf: gateway (#9115) 
Co-authored-by: feng <1304903146@qq.com>
 2022-11-23 18:39:05 +08:00
ibuler abfd472a0a perf: 修改 connect token 2022-11-23 16:11:17 +08:00