Commit Graph

3253 Commits

Author SHA1 Message Date
xxq250 db8ab8bc22 Merge pull request '*fix Issue的中文翻译更改同步' (#308) from shenmo7192/forgeplus:master into master 2022-06-15 08:34:32 +08:00
shenmo7192 ba84cc7098 Update README.md *fix: Issue的中文翻译更改同步 2022-06-14 23:30:06 +08:00
xxq250 4a886b4bb1 Merge pull request '20220608版本' (#307) from develop into master 2022-06-08 14:44:09 +08:00
xxq250 507d63e98c Merge pull request '20220608版本' (#306) from Trustie/forgeplus:trustie_server into develop 2022-06-08 14:43:22 +08:00
xiaoxiaoqiong b3dfc72546 Merge branch 'pre_trustie_server' into trustie_server 2022-06-02 16:41:51 +08:00
xiaoxiaoqiong 6f10d4ca24 Merge branch 'standalone_develop' into pre_trustie_server 2022-06-02 16:41:27 +08:00
xiaoxiaoqiong 15a0b85ae6 通知邮件支持用户不存在时发送base_url 2022-06-01 16:11:18 +08:00
xiaoxiaoqiong a7ce3f3728 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-06-01 15:23:14 +08:00
xiaoxiaoqiong 7290cd6495 通知邮件支持用户不存在时发送 2022-06-01 15:23:05 +08:00
yystopf e69fe13745 merge from develop 2022-06-01 10:03:29 +08:00
yystopf 038df804c0 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-06-01 10:01:15 +08:00
yystopf 877948b0cd 新增: 通用消息模板后台创建 2022-06-01 10:00:57 +08:00
xiaoxiaoqiong 9a17c4865f 项目名称和描述增加敏感词检测 2022-06-01 09:27:18 +08:00
xiaoxiaoqiong 4a23878185 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-06-01 09:23:21 +08:00
xiaoxiaoqiong dc787a35d4 项目名称和描述增加敏感词检测 2022-06-01 09:23:11 +08:00
yystopf b785406ab8 Merge branch 'develop' into standalone_develop 2022-05-31 16:34:20 +08:00
yystopf 9427db3e5a 新增: 通用消息模板 2022-05-31 16:34:08 +08:00
yystopf 2d52dbfc2f Merge branch 'develop' into standalone_develop 2022-05-30 14:50:48 +08:00
yystopf 81da71d478 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-05-30 14:50:23 +08:00
yystopf 169dc84e22 新增: 组织下项目需返回是否为公有项目字段 2022-05-30 14:50:12 +08:00
xiaoxiaoqiong fe4dca2eb7 Merge branch 'pre_trustie_server' into trustie_server 2022-05-30 11:20:37 +08:00
xiaoxiaoqiong 9d0980ecfd Merge branch 'standalone_develop' into pre_trustie_server 2022-05-30 11:19:45 +08:00
xiaoxiaoqiong f66e951f31 Merge branch 'develop' into standalone_develop 2022-05-30 11:19:13 +08:00
xiaoxiaoqiong d6fd85f536 Repository.url重写,导入项目时为空 2022-05-30 11:18:24 +08:00
xiaoxiaoqiong b1d3b9ee5f Merge branch 'pre_trustie_server' into trustie_server 2022-05-30 10:44:21 +08:00
xiaoxiaoqiong 3b5da788a8 Merge branch 'standalone_develop' into pre_trustie_server 2022-05-30 10:44:00 +08:00
xiaoxiaoqiong 331dfa4b12 Merge branch 'develop' into standalone_develop 2022-05-30 10:26:35 +08:00
xiaoxiaoqiong 6448a30e03 render_error替换成tip_exception 2022-05-30 10:25:43 +08:00
xiaoxiaoqiong 17fb43cea8 render_error替换成tip_exception 2022-05-30 10:24:39 +08:00
xiaoxiaoqiong 5e5093a44c Merge branch 'pre_trustie_server' into trustie_server 2022-05-27 16:56:27 +08:00
xiaoxiaoqiong d27f55bb35 fixed ci报错200处理 2022-05-27 16:55:52 +08:00
xiaoxiaoqiong e76822eb34 fixed ci报错200处理 2022-05-27 16:54:09 +08:00
xiaoxiaoqiong 2fbd93114c Merge branch 'pre_trustie_server' into trustie_server 2022-05-27 14:47:31 +08:00
xiaoxiaoqiong d48e1a82b1 Merge branch 'standalone_develop' into pre_trustie_server 2022-05-27 14:46:26 +08:00
xiaoxiaoqiong 1220223322 rake导入项目,无语言处理 2022-05-27 14:43:16 +08:00
xiaoxiaoqiong 0b35f56212 rake导入项目,无语言处理 2022-05-27 14:31:29 +08:00
xiaoxiaoqiong 95f98710d6 rake导入项目 2022-05-27 14:26:53 +08:00
xiaoxiaoqiong 40a987116f rake导入项目 2022-05-27 14:25:16 +08:00
xiaoxiaoqiong a00b1d4530 rake导入项目 2022-05-27 14:21:00 +08:00
xiaoxiaoqiong 48cf92a2cf rake导入项目 2022-05-27 14:19:57 +08:00
yystopf bb8e8f2d94 Merge branch 'pre_trustie_server' into trustie_server 2022-05-27 10:49:39 +08:00
yystopf 6c94da3f05 Merge branch 'standalone_develop' into pre_trustie_server 2022-05-27 10:49:22 +08:00
yystopf 2a387ad997 Merge branch 'develop' into standalone_develop 2022-05-27 10:48:38 +08:00
yystopf a6e50d2a25 修复 devops无法激活项目的问题 2022-05-27 10:48:20 +08:00
yystopf f6e8f24480 Merge branch 'develop' into standalone_develop 2022-05-26 15:09:26 +08:00
yystopf bd16ca476d 增加: 退出仓库api文档 2022-05-26 15:08:42 +08:00
yystopf 6eaf491f70 Merge branch 'pre_trustie_server' into trustie_server 2022-05-25 15:49:21 +08:00
yystopf d4d00b30bf Merge branch 'standalone_develop' into pre_trustie_server 2022-05-25 11:47:55 +08:00
yystopf 19ec81e975 Merge branch 'develop' into standalone_develop 2022-05-25 11:47:44 +08:00
yystopf 2ea78b4f20 增加: 已登录用户对用户名、邮箱、电话进行校验 2022-05-25 11:47:35 +08:00