Commit Graph

3142 Commits

Author SHA1 Message Date
38d6519381 fix 2021-12-09 11:08:54 +08:00
16418675ac fix 2021-12-09 11:08:10 +08:00
102858bc8c fix: educoder entries file use hash 2021-12-09 11:06:49 +08:00
0d64768e4b fix: educoder file visit delay 2021-12-09 09:37:28 +08:00
beccac652f fix 2021-12-08 18:25:31 +08:00
30eb1958c1 fix 2021-12-08 18:23:29 +08:00
33e17e8439 fix: educoder sub_entries and commit author 2021-12-08 18:18:19 +08:00
5445206716 Merge branch 'standalone_develop' into pre_trustie_server 2021-12-08 16:26:15 +08:00
1c19c05fd8 fix 2021-12-08 16:26:06 +08:00
957980fc71 Merge branch 'standalone_develop' into pre_trustie_server 2021-12-08 16:23:21 +08:00
657e2cf169 fix: merge from develop 2021-12-08 16:22:34 +08:00
e0c47c2abd fix: educoder clone url 2021-12-08 16:18:13 +08:00
xiaoxiaoqiong
9e64a4842d Merge branch 'standalone_develop' into pre_trustie_server 2021-12-08 15:32:47 +08:00
xiaoxiaoqiong
ba9e74f373 fixed db:migrate 2021-12-08 15:32:28 +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
422549f9e7 fix 2021-12-08 15:01:33 +08:00
0358229b95 fix: educoder api delay 2021-12-08 14:47:15 +08:00
c4586fbb36 fix: remove detail language and contributors 2021-12-08 14:11:37 +08:00
xiaoxiaoqiong
0a5a75dc0d Merge branch 'pre_trustie_server' into trustie_server 2021-12-07 17:03:32 +08:00
xiaoxiaoqiong
d4ee468435 Merge branch 'standalone_develop' into pre_trustie_server 2021-12-07 17:03:02 +08:00
xiaoxiaoqiong
a26d8be0b0 fixed educode not owner 2021-12-07 17:02:35 +08:00
xiaoxiaoqiong
f94006abfd fixed educode not owner 2021-12-07 16:59:04 +08:00
xiaoxiaoqiong
5618887e7a Merge branch 'pre_trustie_server' into trustie_server 2021-12-07 16:50:05 +08:00
xiaoxiaoqiong
3480e15c48 Merge branch 'standalone_develop' into pre_trustie_server 2021-12-07 16:49:21 +08:00
xiaoxiaoqiong
d85a446edc Merge branch 'develop' into standalone_develop 2021-12-07 16:48:52 +08:00
xiaoxiaoqiong
4d61e7618a fixed detail 2021-12-07 16:46:06 +08:00
xiaoxiaoqiong
9a8ddffb5a Merge branch 'pre_trustie_server' into trustie_server 2021-12-07 16:40:37 +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
f889849b6b Merge branch 'pre_trustie_server' into trustie_server 2021-12-07 16:35:05 +08:00
xiaoxiaoqiong
3501ff6bd4 Merge branch 'standalone_develop' into pre_trustie_server 2021-12-07 16:34:29 +08:00
xiaoxiaoqiong
badd950ff9 merge develop 2021-12-07 16:34:11 +08:00
xiaoxiaoqiong
8f70d4f604 Merge branch 'standalone_develop' into pre_trustie_server 2021-12-07 16:32:33 +08:00
xiaoxiaoqiong
20bfbdc06f fixed owner 404 2021-12-07 16:32:14 +08:00
xiaoxiaoqiong
b7bebcd736 Merge branch 'pre_trustie_server' into trustie_server 2021-12-07 16:28:47 +08:00
xiaoxiaoqiong
d4663e410d Merge branch 'standalone_develop' into pre_trustie_server 2021-12-07 16:27:52 +08:00
xiaoxiaoqiong
1b385f4377 Merge branch 'standalone_develop' of https://git.trustie.net/Gitlink/forgeplus into standalone_develop 2021-12-07 16:27:25 +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
f533a6253b Merge pull request '解决冲突,合并到测试环境' (#283) from yystopf/forgeplus:standalone_develop into standalone_develop 2021-12-07 14:41:37 +08:00
0f9d33e755 merge from develop 2021-12-07 14:39:11 +08:00
51356da7f3 fix: owners not return 404 2021-12-07 14:34:57 +08:00
ebe893022f fix: api doc logo 2021-12-07 14:34:57 +08:00
c5f22e6c70 fix: org delete status error 2021-12-07 14:34:57 +08:00
xiaoxiaoqiong
30135ccad7 Merge branch 'pre_trustie_server' into trustie_server 2021-12-01 17:45:31 +08:00
xiaoxiaoqiong
eac97c6698 关闭项目精选筛选 2021-12-01 17:45:02 +08:00
xiaoxiaoqiong
8ee52440c7 关闭项目精选 2021-12-01 17:43:43 +08:00
xiaoxiaoqiong
d9925db510 Merge branch 'trustie_server' of https://git.trustie.net/Gitlink/forgeplus into trustie_server 2021-12-01 17:23:38 +08:00
xiaoxiaoqiong
34bcf9ed57 Merge branch 'standalone_develop' into pre_trustie_server 2021-12-01 17:21:54 +08:00
xiaoxiaoqiong
b22c65e5c2 Merge branch 'develop' into standalone_develop 2021-12-01 17:21:23 +08:00