Commit Graph

224 Commits

Author SHA1 Message Date
“xxq250” d51bb7030f Merge remote-tracking branch 'origin/develop' into standalone_develop
# Conflicts:
#	app/views/users/get_user_info.json.jbuilder
2022-08-30 18:14:17 +08:00
“xxq250” 4b7c58b13f Merge remote-tracking branch 'origin/develop' into develop 2022-08-30 18:10:33 +08:00
“xxq250” 7148957368 nps用户调研 2022-08-30 18:10:27 +08:00
yystopf 43a41399ac 新增:添加全部或者移除全部团队项目 2022-08-30 10:35:43 +08:00
yystopf 0f41cabe71 新增:添加全部或者移除全部团队项目 2022-08-30 10:23:35 +08:00
“xxq250” eac06382fe fixed reposyncer logs routes 2022-08-05 11:41:13 +08:00
“xxq250” 9d385845a6 fixed 评审标记为已读和未读 2022-08-02 15:27:16 +08:00
“xxq250” 321f367e3e Merge remote-tracking branch 'origin/develop' into standalone_develop 2022-07-28 16:46:27 +08:00
“xxq250” 4ccf8ea5ff CloudIDEA文件标记已读未读 2022-07-28 16:42:21 +08:00
“xxq250” 6f9db6b314 Merge remote-tracking branch 'origin/develop' into standalone_develop
# Conflicts:
#	app/models/pull_request.rb
2022-07-26 10:49:49 +08:00
“xxq250” 1bbde165c2 reposyncer同步仓库接口 2022-07-26 10:44:12 +08:00
xiaoxiaoqiong ed0655452c 增加从webhook接收仓库日志记录 2022-07-18 09:34:56 +08:00
xiaoxiaoqiong e919b03e90 Merge remote-tracking branch 'origin/standalone_develop' into standalone_develop 2022-07-11 15:52:57 +08:00
xiaoxiaoqiong 4fa1a433fa 增加从webhook接收仓库日志记录 2022-07-11 15:52:38 +08:00
yystopf f8b63ff02e merge from develop 2022-07-07 13:47:47 +08:00
xiaoxiaoqiong abfefdf8eb oauth2 code授权方式登录 2022-07-05 14:38:11 +08:00
yystopf 76cc185a1d 新增: 合并请求审核model 2022-06-29 17:16:29 +08:00
yystopf fb2e2d9534 merge from develop 2022-06-24 14:18:53 +08:00
yystopf aefd6c08dc 新增: gitea-client引入以及路由定义 2022-06-21 17:39:11 +08:00
yystopf 7e5d5e31e5 merge from develop 2022-06-20 10:21:10 +08:00
yystopf 45b7f70d9f 新增:项目邀请链接增加时间限制,以及show_link接口新增 2022-06-20 10:16:39 +08:00
yystopf 1ebb6cb561 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-06-20 09:34:29 +08:00
xiaoxiaoqiong 1f9caeece5 auth2接入 2022-06-17 17:02:24 +08:00
yystopf c42f3d5928 新增:邀请用户链接生成 2022-06-17 14:06:59 +08:00
yystopf e69fe13745 merge from develop 2022-06-01 10:03:29 +08:00
yystopf 877948b0cd 新增: 通用消息模板后台创建 2022-06-01 10:00:57 +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
yystopf 9979c87d0c 修复: 合并从develop 2022-05-24 17:27:24 +08:00
yystopf 8e8ec821f2 新增: 根据邮箱来获取用户 2022-05-24 17:26:10 +08:00
yystopf fb43268444 fix: merge from develop 2022-05-24 11:03:54 +08:00
yystopf c27cc063e6 add: new update user info simple and sync gitea 2022-05-24 10:59:52 +08:00
yystopf 59db914bcc change route position 2022-05-12 09:42:59 +08:00
yystopf 72a32ed8c4 rename namespace 2022-05-12 09:42:59 +08:00
yystopf 12cc37443e add: trace controller and router 2022-05-12 09:42:59 +08:00
yystopf 52c94effdc Merge branch 'develop' into standalone_develop 2022-05-05 10:18:19 +08:00
yystopf 7c88ea3d67 add: quit repo 2022-05-05 10:00:02 +08:00
yystopf 246b484ad8 fix merge from develop 2022-04-18 14:14:48 +08:00
yystopf fc3cf01d3f add: get user image action 2022-04-18 13:49:08 +08:00
yystopf 8aa935ad5c add: glcc news management and api data 2022-04-07 16:13:32 +08:00
yystopf 1c660213a7 fix: claims is losed 2022-03-10 09:36:51 +08:00
xiaoxiaoqiong 664b806c0a routes合并 2022-03-03 15:06:56 +08:00
yystopf 3091593d14 add: standalone admin menu 2022-03-02 10:48:21 +08:00
xiaoxiaoqiong 28d07d5c54 fixed 合并冲突 2022-02-22 17:49:14 +08:00
yystopf f2f2ce8252 merge from develop 2022-02-22 10:38:42 +08:00
xiaoxiaoqiong 9ba00b21c9 竞赛通知api 2022-02-17 18:28:32 +08:00
yystopf f76dad680a Merge pull request '上传头像、组织团队限制、文件下载问题修复、branch简化数据、webhook问题修复' (#298) from develop into standalone_develop 2022-01-07 18:03:57 +08:00
yystopf f339df699e add: user upload image 2022-01-03 22:32:09 +08:00
xxq250 93dd5b5d84 Merge pull request '易修声明功能' (#284) from starlee/forgeplus:lzx-claim-2.0 into standalone_develop 2021-12-08 15:12:15 +08:00
starlee e25e2fdd77 add the claim mechanism 2021-11-25 13:33:32 +08:00