github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
12,406 Commits
88 Branches
258 Tags
129 MiB
Commit Graph

515 Commits (pr@dev@fix_third_mfa)

Author SHA1 Message Date
fit2bot 160293365a
perf: Regularly delete useless password change push records (#14026) 
* perf: If the user Home page does not exist, push will fail

* perf: Change secret add uid parameter

* perf: Regularly delete useless password change push records

---------

Co-authored-by: feng <1304903146@qq.com>
 2024-08-30 15:01:40 +08:00
wangruidong 7a19007aba perf: ldap import user error msg 2024-08-30 14:55:22 +08:00
Bai 7c2e50435d perf: i18n for ldap user import 2024-08-15 15:50:56 +08:00
wangruidong c10db2ab0f perf: LDAP import user Translate 2024-08-15 14:35:06 +08:00
wangruidong 5d3e633e83 perf: ldap import msg modify 2024-08-07 19:12:42 +08:00
feng bd3909ad27 perf: Third-party user login settings default organization 2024-08-02 15:52:05 +08:00
feng 8d83c953d3 perf: Support WeCom DingTalk FeiShu Lark Slack attribute mapping 2024-07-30 17:48:26 +08:00
halo 88037b2038 perf: Email service authentication username is optional 2024-07-26 11:23:15 +08:00
feng 6a7896b712 perf: Gpt3 to gpt-4o-mini 2024-07-19 11:56:07 +08:00
feng 836adab5d0 perf: Feishu lark support attributes settings 2024-07-17 16:59:57 +08:00
fit2bot e36d51cc0b
perf: country code api (#13672) 
* perf: remove notification migrations

* perf: country code api

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2024-07-09 19:23:41 +08:00
Bai 5a57c296a1 feat: add db table data analyzer util 2024-07-09 18:49:51 +08:00
fit2bot 9654add528
perf: Translate (#13633) 
Co-authored-by: feng <1304903146@qq.com>
 2024-07-08 15:43:56 +08:00
ibuler 772c9b385c perf: lang setting from core 2024-06-28 16:40:25 +08:00
wangruidong 0e8833cce3 perf: Translate Client connection 2024-06-27 11:27:43 +08:00
fit2bot 5a1389a187
perf: Translate (#13504) 
Co-authored-by: feng <1304903146@qq.com>
 2024-06-25 19:10:32 +08:00
Bai dfde50c768 Merge v4 to dev 2024-06-24 15:43:40 +08:00
wangruidong ad95adc833 perf: trans LDAP msg 2024-06-24 14:24:06 +08:00
fit2bot ae7dbbedcc
perf: Edit rbac perms (#13468) 
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
 2024-06-21 19:08:37 +08:00
fit2bot e06f9a03d6
perf: System setting perm (#13463) 
Co-authored-by: feng <1304903146@qq.com>
 2024-06-20 19:19:14 +08:00
fit2bot 5b548d8d57
perf: Translate (#13450) 
Co-authored-by: feng <1304903146@qq.com>
 2024-06-19 14:48:48 +08:00
fit2bot afdf777386
perf: Translate account (#13445) 
Co-authored-by: feng <1304903146@qq.com>
 2024-06-18 19:39:27 +08:00
fit2bot 50ceca9f06
perf: Perms system settings (#13435) 
Co-authored-by: feng <1304903146@qq.com>
 2024-06-17 17:40:03 +08:00
wangruidong 7ad4d9116a fix: LDAP定时同步任务设置多个通知人，消息内容分除第一个正常，其它人都不正常 2024-06-11 18:24:43 +08:00
wangruidong 9439035b86 fix: 账号备份，云同步定时任务不执行 2024-06-07 18:33:46 +08:00
wangruidong 0ea2339ad5 perf: notification i18n 2024-05-27 15:24:31 +08:00
Bai c4e30737a4 perf: i18n bai 2024-05-27 11:34:53 +08:00
Bai a1e9382275 perf: i18n bai 2024-05-27 11:13:13 +08:00
Bai 564ad40b99 perf: i18n System Settings End 2024-05-24 14:41:28 +08:00
Bai e7f92ec0d7 merged: Merge to v4 (bai) 2024-05-22 18:12:35 +08:00
Bai 79449a8a02 perf: i18n System Settings -> Authentication-OIDC 2024-05-22 17:51:45 +08:00
Bai 4a5205c5ac perf: i18n System Settings -> Features 2024-05-21 16:11:13 +08:00
Bai 5ab55b823c perf: i18n System Settings -> General,Org,Notifications 2024-05-20 18:39:57 +08:00
Eric 79edff5fca perf: 支持 loki log 2024-05-16 19:00:47 +08:00
wangruidong da0c017c4f fix: ldap定时任务未执行 2024-05-15 14:16:33 +08:00
fit2bot 313202fe41
perf: 合并 migrations (#13187) 
* perf: 修改 Migrations

* perf: 合并 migrations

* perf: remove unuse

* perf: change to file

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2024-05-11 11:22:01 +08:00
fit2bot 92b6286feb
fix: ldap更换OU后无法登录 (#13172) 
* fix: ldap更换OU后无法登录

* perf: 翻译

---------

Co-authored-by: wangruidong <940853815@qq.com>
 2024-05-08 14:23:20 +08:00
wangruidong dc39cbf037 fix: ldap定时任务未执行 2024-05-07 10:27:44 +08:00
Bai cb4402c610 merge: into dev from v4 2024-04-29 11:07:43 +08:00
feng626 fbc4cb9046
Revert "perf: remove ticket model" (#13145) 
This reverts commit 94567b86f0.
 2024-04-28 18:26:49 +08:00
feng 94567b86f0 perf: remove ticket model 2024-04-28 18:02:57 +08:00
wangruidong 5135186961 perf: 社区版去掉一些东西 2024-04-28 15:58:14 +08:00
wangruidong 46a23afbec perf: 创建、更新用户时MFA选项根据系统设置选项进行动态渲染 2024-04-26 11:35:56 +08:00
wangruidong 5755d281d7 perf: ldap测试登录前端不需要先测试连接 2024-04-16 18:13:45 +08:00
Bai 3b70b4cf9e feat: LDAP User Auth support cache user_dn 2024-04-09 20:09:50 +08:00
fit2bot 611d0b71e8
fix: 修复用户下线失败问题 SESSION_EXPIRE_AT_BROWSER_CLOSE 可配置 (#12936) 
Co-authored-by: feng <1304903146@qq.com>
 2024-04-03 16:41:37 +08:00
fit2bot d499b94e04
fix: gpt 配置取消长度限制 (#12907) 
Co-authored-by: feng <1304903146@qq.com>
 2024-03-29 18:53:24 +08:00
feng 470a088a9f feat: 拆分 feishu lark 2024-03-26 17:10:25 +08:00
jiangweidong ccd4f3ada4 fix: tcpdump想捕捉所有ip时，空ip被解析成0.0.0.0，导致捕捉不到的问题 2024-03-22 17:31:03 +08:00
Bai fb02095568 perf: Remove settigns.LITE 2024-03-19 19:22:29 +08:00
wangruidong 80a506e99f perf:LDAP报错信息不对 2024-03-18 15:56:57 +08:00
fit2bot b3e4c10bc2
perf: 用户个人设置操作记录翻译 (#12788) 
Co-authored-by: feng <1304903146@qq.com>
 2024-03-11 15:10:15 +08:00
ibuler 327cdc8604 perf: 修改翻译 2024-03-11 14:33:14 +08:00
Bai 46d57f02e7 perf: i18n settings-systemtask done. 2024-03-07 17:29:03 +08:00
ibuler e57512f4fe perf: 添加配置支持 Lite 2024-03-04 19:18:26 +08:00
fit2bot 82aa4a65ab
perf: account translate (#12723) 
Co-authored-by: feng <1304903146@qq.com>
Co-authored-by: feng626 <57284900+feng626@users.noreply.github.com>
 2024-02-28 17:32:29 +08:00
Bai e308812429 perf: i18n settings-Security done. 2024-02-27 19:20:48 +08:00
Bai 9e1a3598ab perf: i18n settings-Components done. 2024-02-27 16:43:44 +08:00
Bai c8b274031f perf: i18n settings-Auth done. 2024-02-27 11:25:42 +08:00
Bai 10394dbb1c perf: i18n settings-Auth done. 2024-02-26 16:53:40 +08:00
Bai 859bb91fc7 perf: i18n settings-Features done. 2024-02-26 15:47:05 +08:00
fit2bot 0fd0d33704
perf: i18n settings-notifications done. (#12702) 
Co-authored-by: Bai <baijiangjie@gmail.com>
Co-authored-by: Bryan <jiangjie.bai@fit2cloud.com>
 2024-02-23 18:09:18 +08:00
wangruidong d4721e90d5 fix: LDAP用户导入会超时 2024-02-22 11:37:30 +08:00
jiangweidong ba127c506d feat: 支持工单链接直接免密审批 2024-02-21 11:39:01 +08:00
wangruidong eaca296bd0 perf: 支持改密日志记录保留天数 2024-02-05 18:09:45 +08:00
ibuler b284bb60f5 merge: with dev 2024-02-05 09:49:43 +08:00
wangruidong f606dd8920 perf: 增加国际电话区号选择 2024-02-04 14:52:15 +08:00
fit2bot 46fde2f1aa
perf: 整合翻译 (#12630) 
* stash

* stash

* perf: 整合翻译

* perf: 整理了一遍

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2024-02-01 16:02:31 +08:00
fit2bot 00256f86df
perf: OAuth2协议获取token支持配置json或者data (#12602) 
* perf: OAuth2协议获取token支持配置json或者data

* perf: 优化注释

---------

Co-authored-by: jiangweidong <weidong.jiang@fit2cloud.com>
 2024-01-25 14:00:13 +08:00
wangruidong 37a0d831da perf:ldap sync add no user msg 2024-01-18 10:31:53 +00:00
fit2bot 9968617758
perf: 修改优化结构 (#12554) 
* perf: 修改优化结构

* perf: 修改结构

---------

Co-authored-by: ibuler <ibuler@qq.com>
 2024-01-17 11:08:39 +08:00
wangruidong 6cd3672604 fix: sync LDAP notification error 2024-01-15 23:08:55 -07:00
fit2bot fdaec3c959
perf: Modify i18n for settings module. (#12543) 
Co-authored-by: Bai <baijiangjie@gmail.com>
 2024-01-15 04:41:50 -07:00
wangruidong e428eb351b feat: 同步ldap用户消息通知 2024-01-12 11:17:23 +05:00
ibuler 00d6effd69 pref: stash 2024-01-11 18:33:52 +08:00
ibuler c06c68d5da perf: 统一翻译 2024-01-11 14:40:44 +08:00
jiangweidong 9ede3670a7 perf: 邮箱支持exchange协议 2024-01-08 12:35:01 +05:00
fit2bot eb5a53b91b
perf: 翻译 (#12487) 
Co-authored-by: feng <1304903146@qq.com>
 2024-01-03 11:25:45 +08:00
feng 4dd72b109f feat: 历史账号定期删除 可设置保留数量 2024-01-03 07:52:24 +05:00
wangruidong e80a0e41ba fix: 同步LDAP用户时，用户组只移除LDAP同步过来的 2024-01-02 12:04:25 +05:00
Bai 6ac956c626 fix: 修复 api/docs 报错问题 2023-12-25 19:04:44 +08:00
fit2bot b6774aa749
perf: 更新全局组织名字 添加唯一性校验 (#12399) 
Co-authored-by: feng <1304903146@qq.com>
 2023-12-21 16:07:11 +08:00
Eric d03ba7c391 perf: 页面配置是否启用 Vitual App 2023-12-20 13:01:50 +05:00
feng 59d9a3d4ec fix: chatAI代理配置错误，服务器报错500 2023-12-19 15:39:22 +08:00
wangruidong 6955a3db11 perf: ldap测试登录提示优化&上产文件名长度限制 2023-12-15 18:06:47 +08:00
feng 32178b2344 perf: 修改默认prompt顺序 2023-12-15 10:48:04 +08:00
feng 6cf05435bf feat: chat prompt 2023-12-14 17:39:15 +08:00
wangruidong 65718c5a84 perf: 接口返回上传文件大小限制 2023-12-14 11:26:44 +08:00
feng 2c7ad90524 fix: chat ai测试可连接性时失败 2023-12-12 19:14:13 +08:00
feng 87a24991f1 perf: 翻译 2023-12-12 15:34:13 +08:00
feng 8b05260a6c perf: PublicSetting API 添加GPT参数 2023-12-08 17:46:40 +08:00
feng cc7220a4ad perf: 翻译 2023-12-08 16:17:20 +08:00
fit2bot d2429f7883
feat: 支持 virtual app (#12199) 
* feat: 支持 virtual app

* perf: 增加 virtual host

* perf: 新增 virtual app 上传接口

* perf: 更名为 app provider

* perf: 优化代码

---------

Co-authored-by: Eric <xplzv@126.com>
 2023-12-05 16:52:11 +08:00
fit2bot a91cb1afd5
feat: 系统设置可配置gpt (#12207) 
* feat: 系统设置可配置gpt

* perf: 添加gpt的terminal config

---------

Co-authored-by: feng <1304903146@qq.com>
 2023-12-05 10:58:19 +08:00
fit2bot 0fdae00722
perf: 支持slack通知和认证 (#12193) 
* perf: 支持slack通知和认证

* perf: 生成迁移文件

* perf: 优化获取access_token逻辑

---------

Co-authored-by: jiangweidong <weidong.jiang@fit2cloud.com>
 2023-11-29 17:45:44 +08:00
wangruidong 6b7119ea74 perf: ldap接口请求换成websocket连接 2023-11-22 16:56:31 +08:00
wangruidong 314257f790 perf: 作业中心执行历史增加保留天数配置 2023-10-23 04:13:35 -05:00
fit2bot 4aa4c6854b
perf: 更新ops ticket announcement settings 权限 (#11911) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-19 15:15:02 +08:00
fit2bot d3a283232f
perf: 优化 xpack license 检查 (#11885) 
Co-authored-by: ibuler <ibuler@qq.com>
 2023-10-18 01:10:24 -05:00
fit2bot c917d8f346
fix: 系统设置 安全设置权限为错误 (#11860) 
Co-authored-by: feng <1304903146@qq.com>
 2023-10-16 19:33:13 +08:00