Commit Graph

140 Commits

Author SHA1 Message Date
2668630f2a 项目fored_count更新时updated_on同时更新 2023-02-01 17:23:48 +08:00
dd979eb1d0 Merge branch 'develop' into standalone_develop 2023-01-04 09:43:27 +08:00
6b9adefde2 修复:action使用正确 2023-01-04 09:43:18 +08:00
872a2b334b Merge branch 'develop' into standalone_develop 2023-01-04 09:19:55 +08:00
cec764127e 更改:项目排行榜规则及个数 2023-01-04 09:19:42 +08:00
xiaoxiaoqiong
07ec114e9a fixed 提交日志记录用户信息 2022-07-13 13:13:10 +08:00
7e5d5e31e5 merge from develop 2022-06-20 10:21:10 +08:00
1ebb6cb561 Merge branch 'develop' of https://gitlink.org.cn/Trustie/forgeplus into develop 2022-06-20 09:34:29 +08:00
f4737d88d8 Merge branch 'develop' into standalone_develop 2022-06-17 14:19:58 +08:00
5b4e6f4902 修复: 项目存在敏感词更新forked数量使用update_column 2022-06-17 14:19:41 +08:00
c42f3d5928 新增:邀请用户链接生成 2022-06-17 14:06:59 +08:00
0fa5bb2211 Merge branch 'develop' into standalone_develop 2022-06-16 13:48:28 +08:00
42d2b51f7f 修复: 项目敏感词判定只在创建或者更新的时候 2022-06-16 13:42:17 +08:00
e69fe13745 merge from develop 2022-06-01 10:03:29 +08:00
xiaoxiaoqiong
9a17c4865f 项目名称和描述增加敏感词检测 2022-06-01 09:27:18 +08:00
xiaoxiaoqiong
dc787a35d4 项目名称和描述增加敏感词检测 2022-06-01 09:23:11 +08:00
94881dd72a add: user trace tasks record 2022-05-13 14:31:59 +08:00
1bb754e9d8 Merge branch 'standalone_develop' into pre_trustie_server 2022-02-22 10:39:47 +08:00
1100309038 Merge branch 'develop' into standalone_develop 2022-02-17 11:12:58 +08:00
b11f5fd228 fix: cache rollback 2022-02-17 11:12:50 +08:00
af5f2b2fe3 Merge branch 'develop' into standalone_develop 2022-02-17 10:59:29 +08:00
90dbe0730a fix: job not affect 2022-02-17 10:59:18 +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
7c765817c9 Merge pull request 'merge develop to standalone_develop' (#267) from develop into standalone_develop 2021-11-26 14:21:53 +08:00
1a9ed1425e fix: destroy decrement forked count 2021-11-23 13:48:09 +08:00
jasder
7ad3789fe2 FIX 解决develop分支代码冲突 2021-11-08 14:59:06 +08:00
46405e704a add: rank not include deleted project 2021-11-02 09:59:21 +08:00
jasder
b40cbfbfbb FIX conflict 2021-10-29 15:07:01 +08:00
274e5090ce fix 2021-10-27 17:07:48 +08:00
91852d7957 add: project explore management 2021-10-27 16:50:18 +08:00
a43f6714de add: project explore api 2021-10-27 14:20:27 +08:00
d0791ee653 fix: privacy project not use cache 2021-10-27 09:48:23 +08:00
21fa609e05 add: project rank and user rank api 2021-10-26 18:42:35 +08:00
69c87fd5a4 add: callback cache 2021-10-26 15:22:42 +08:00
91f1f4090f fix: old cache 2021-10-25 18:03:56 +08:00
jasder
00ed177089 Merge pull request 'FIX bug' (#148) from develop into dev_trustie_server 2021-09-10 18:32:08 +08:00
02f8e453f1 fix: remove watcher when project change is_public 2021-09-10 11:26:01 +08:00
84aed0391a fix: project list query 2021-09-07 17:19:38 +08:00
jasder
27e5febef2 Merge branch 'develop' into dev_trustie_server 2021-07-30 17:04:21 +08:00
ebc4305ca8 add: repository webhooks 2021-07-26 17:25:06 +08:00
jasder
b054094798 FIX conflicts 2021-07-12 16:20:14 +08:00
jasder
2d648e516e FIX merge develop branch 2021-07-12 16:19:03 +08:00
jasder
71e039efb8 FIX merge develop branch 2021-07-12 16:14:51 +08:00
ff21916f18 fix: merge from develop 2021-07-09 13:48:48 +08:00
d9162cb3bf fix: merge from develop 2021-07-09 13:47:21 +08:00