Commit Graph

503 Commits

Author SHA1 Message Date
8d18149537 Merge branch 'standalone_develop' into pre_trustie_server 2022-02-10 14:11:06 +08:00
8050af23fc Merge branch 'develop' into standalone_develop 2022-02-10 14:10:54 +08:00
298abdd1b1 fix: devops organization bug 2022-02-10 14:08:14 +08:00
b9e2a6edf1 Merge branch 'standalone_develop' into pre_trustie_server 2022-01-24 17:27:21 +08:00
e0f5337fdd Merge branch 'develop' into standalone_develop 2022-01-24 14:26:36 +08:00
380ca3a066 fix: projects query rule 2022-01-24 14:26:24 +08:00
7d19849968 Merge branch 'develop' into standalone_develop 2022-01-24 10:44:59 +08:00
237b0afb08 fix: team user build use find or create by 2022-01-24 10:44:46 +08:00
05f5982a53 Merge branch 'standalone_develop' into pre_trustie_server 2022-01-07 18:04:55 +08:00
f76dad680a Merge pull request '上传头像、组织团队限制、文件下载问题修复、branch简化数据、webhook问题修复' (#298) from develop into standalone_develop 2022-01-07 18:03:57 +08:00
84f12adce8 fix: webhook tasks list error delay 2022-01-06 14:29:31 +08:00
4f63caa86c Merge branch 'standalone_develop' into pre_trustie_server 2021-12-28 16:10:44 +08:00
96b0f2d167 Merge branch 'develop' into standalone_develop 2021-12-28 16:10:16 +08:00
12edc620df fix: complete profile condition 2021-12-24 16:15:59 +08:00
4ce03145df fix 2021-12-23 14:33:31 +08:00
3e04a37ece add: team remove and joined template message 2021-12-23 14:26:40 +08:00
26ae9b35df fix: change member role and change team user team 2021-12-22 11:32:40 +08:00
8e79b43aaf add: member bind team user 2021-12-22 11:16:27 +08:00
bec98bbc9d Merge branch 'standalone_develop' into pre_trustie_server 2021-12-17 15:45:57 +08:00
af160084c4 fix: merge from develop 2021-12-17 15:45:28 +08:00
da4fd3a762 fix: 易修 to 疑修 2021-12-17 15:35:30 +08:00
96d1a7440d Merge branch 'standalone_develop' into pre_trustie_server 2021-12-14 10:20:54 +08:00
8a34699acd fix: merge from develop 2021-12-14 10:20:35 +08:00
xiaoxiaoqiong
efc82b9841 fix: issue is collaborators 2021-12-14 10:17:15 +08:00
xiaoxiaoqiong
9e64a4842d Merge branch 'standalone_develop' into pre_trustie_server 2021-12-08 15:32:47 +08:00
93dd5b5d84 Merge pull request '易修声明功能' (#284) from starlee/forgeplus:lzx-claim-2.0 into standalone_develop 2021-12-08 15:12:15 +08:00
xiaoxiaoqiong
2116af759d Merge branch 'standalone_develop' into pre_trustie_server 2021-12-07 16:40:18 +08:00
xiaoxiaoqiong
38862b9843 fixed owner 2021-12-07 16:40:01 +08:00
xiaoxiaoqiong
d4663e410d Merge branch 'standalone_develop' into pre_trustie_server 2021-12-07 16:27:52 +08:00
xiaoxiaoqiong
5c445b9ea0 merge develop 2021-12-07 16:27:17 +08:00
xiaoxiaoqiong
36286d9003 fixed:educode项目 2021-12-07 16:20:05 +08:00
xiaoxiaoqiong
f12b10fa23 merge 测试环境standalone_develop 2021-12-01 10:05:00 +08:00
6ffc702209 Merge pull request '提交最新代码到预上线环境' (#272) from develop into standalone_develop 2021-11-29 15:44:51 +08:00
22f3371090 fix: change issues priority id default value 2021-11-29 11:05:33 +08:00
7c765817c9 Merge pull request 'merge develop to standalone_develop' (#267) from develop into standalone_develop 2021-11-26 14:21:53 +08:00
72553dec57 Merge pull request '一些功能修改以及bug修复' (#263) from yystopf/forgeplus:hh_hotfix into develop 2021-11-26 09:39:58 +08:00
starlee
e25e2fdd77 add the claim mechanism 2021-11-25 13:33:32 +08:00
xiaoxiaoqiong
399558550e fix 验证码过期等#53446,#50806,#50880 2021-11-24 18:13:15 +08:00
1a9ed1425e fix: destroy decrement forked count 2021-11-23 13:48:09 +08:00
72ec7bc213 fix: change email default rule 2021-11-19 10:57:25 +08:00
55ab694505 fix: change email default rule 2021-11-19 10:21:09 +08:00
jasder
651bf34cfc FIX code review and conflict 2021-11-14 20:50:22 +08:00
jasder
e216d7da70 Merge branch 'develop' of https://git.trustie.net/Gitlink/forgeplus into develop 2021-11-11 18:09:26 +08:00
jasder
03beee6cae FIX code review 2021-11-11 18:03:30 +08:00
49c7827f87 fix 2021-11-10 16:40:11 +08:00
937603d0f2 fix: change params is blank not sent email 2021-11-10 10:05:35 +08:00
2e35fb92a9 fix: change message template email title 2021-11-09 17:04:45 +08:00
jasder
9d05973700 FIX 解决featrue_homepage分支代码冲突 2021-11-08 15:07:35 +08:00
jasder
7ad3789fe2 FIX 解决develop分支代码冲突 2021-11-08 14:59:06 +08:00
jasder
e3588291b2 Merge pull request '首页api数据以及后台管理' (#240) from yystopf/forgeplus:hh_home_index into featrue_homepage 2021-11-08 14:35:19 +08:00