xiaoxiaoqiong
|
8f45bcf959
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-06-17 17:02:31 +08:00 |
|
xiaoxiaoqiong
|
1f9caeece5
|
auth2接入
|
2022-06-17 17:02:24 +08:00 |
 yystopf
|
f4737d88d8
|
Merge branch 'develop' into standalone_develop
|
2022-06-17 14:19:58 +08:00 |
|
yystopf
|
5b4e6f4902
|
修复: 项目存在敏感词更新forked数量使用update_column
|
2022-06-17 14:19:41 +08:00 |
|
yystopf
|
c0c259a5fc
|
Merge branch 'develop' into standalone_develop
|
2022-06-17 14:07:52 +08:00 |
|
yystopf
|
3d0e323801
|
fix
|
2022-06-17 14:07:33 +08:00 |
|
yystopf
|
c42f3d5928
|
新增：邀请用户链接生成
|
2022-06-17 14:06:59 +08:00 |
|
yystopf
|
0fa5bb2211
|
Merge branch 'develop' into standalone_develop
|
2022-06-16 13:48:28 +08:00 |
|
yystopf
|
42d2b51f7f
|
修复: 项目敏感词判定只在创建或者更新的时候
|
2022-06-16 13:42:17 +08:00 |
|
yystopf
|
7a0dbaaefb
|
Merge branch 'develop' into standalone_develop
|
2022-06-08 10:47:08 +08:00 |
|
yystopf
|
3e4dd90e17
|
修复: 用户名称展示时只去掉首末的空格
|
2022-06-08 10:46:55 +08:00 |
|
yystopf
|
8a7dc75907
|
fix merge from develop
|
2022-06-08 10:38:10 +08:00 |
|
yystopf
|
8ae5587516
|
fix: search name use strip
|
2022-06-08 10:37:31 +08:00 |
|
xiaoxiaoqiong
|
15a0b85ae6
|
通知邮件支持用户不存在时发送base_url
|
2022-06-01 16:11:18 +08:00 |
|
xiaoxiaoqiong
|
0b543f7dda
|
通知邮件支持用户不存在时发送base_url
|
2022-06-01 16:08:20 +08:00 |
|
xiaoxiaoqiong
|
a07204111a
|
通知邮件支持用户不存在时发送
|
2022-06-01 15:24:39 +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 |
|
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 |
|
yystopf
|
94881dd72a
|
add: user trace tasks record
|
2022-05-13 14:31:59 +08:00 |
|
yystopf
|
00fc83235f
|
download file use redirect
|
2022-05-12 17:11:16 +08:00 |
|
yystopf
|
7750cbe272
|
add: project trace tasks count
|
2022-05-12 09:43:55 +08:00 |
|
yystopf
|
1f13bba52e
|
add: trace user tasks_count
|
2022-05-12 09:43:55 +08:00 |
|
yystopf
|
cf09b28f5e
|
add: project menu services
|
2022-05-12 09:43:54 +08:00 |
|
yystopf
|
0afac46778
|
Merge branch 'develop' into standalone_develop
|
2022-05-07 11:58:13 +08:00 |
|
yystopf
|
a6cee63d17
|
fix: change owner must fix foreign_key
|
2022-05-07 11:57:58 +08:00 |
|
yystopf
|
20af4a7d82
|
Merge branch 'develop' into standalone_develop
|
2022-05-06 17:25:52 +08:00 |
|
yystopf
|
000197b0d1
|
fix: issues and pull_request length calculate
|
2022-05-06 17:25:34 +08:00 |
|
yystopf
|
9d8df2b4d9
|
Merge branch 'develop' into standalone_develop
|
2022-05-06 09:57:23 +08:00 |
|
xiaoxiaoqiong
|
55c74de8e4
|
fork_users加入组织
|
2022-05-05 10:41:02 +08:00 |
|
yystopf
|
11724bf63f
|
Merge branch 'develop' into standalone_develop
|
2022-04-28 11:04:01 +08:00 |
|
yystopf
|
ec3a556a6f
|
fix: default value for show super description
|
2022-04-28 11:03:42 +08:00 |
|
yystopf
|
1d7c7eba24
|
Merge branch 'develop' into standalone_develop
|
2022-04-28 10:54:02 +08:00 |
|
yystopf
|
396ac55429
|
add: user super description
|
2022-04-28 10:42:55 +08:00 |
|
yystopf
|
345fd31834
|
Merge branch 'develop' into standalone_develop
|
2022-04-18 10:52:59 +08:00 |
|
yystopf
|
8f5bb0e2d9
|
fix: organization gitea_token read by associations
|
2022-04-18 10:52:48 +08:00 |
|
xiaoxiaoqiong
|
f60cd409b6
|
竞赛配置子赛项
|
2022-04-08 18:40:52 +08:00 |
|
yystopf
|
8aa935ad5c
|
add: glcc news management and api data
|
2022-04-07 16:13:32 +08:00 |
|
yystopf
|
7fd41e13e4
|
Merge branch 'develop' into standalone_develop
|
2022-03-31 13:04:02 +08:00 |
|
yystopf
|
9ced678f91
|
fix: user trace token
|
2022-03-31 13:03:54 +08:00 |
|
yystopf
|
b25db9d37f
|
fix: merge from develop
|
2022-03-31 13:00:36 +08:00 |
|
yystopf
|
4bbb843edf
|
add: trace users and get trace token
|
2022-03-31 12:54:39 +08:00 |
|
yystopf
|
1c660213a7
|
fix: claims is losed
|
2022-03-10 09:36:51 +08:00 |
|
yystopf
|
1fe8d1defc
|
Merge branch 'develop' into standalone_develop
|
2022-03-07 11:20:23 +08:00 |
|
yystopf
|
5cb2e55f74
|
add: organization users insist team nickname search
|
2022-03-07 09:58:05 +08:00 |
|
yystopf
|
57c60b2fe9
|
Merge branch 'standalone_develop' into pre_trustie_server
|
2022-02-24 16:44:58 +08:00 |
|
yystopf
|
aa643430fa
|
Merge branch 'develop' into standalone_develop
|
2022-02-24 14:27:31 +08:00 |
|
yystopf
|
1a93477635
|
fix: forked templete delay
|
2022-02-24 14:26:04 +08:00 |
|
yystopf
|
1bb754e9d8
|
Merge branch 'standalone_develop' into pre_trustie_server
|
2022-02-22 10:39:47 +08:00 |
|
yystopf
|
f2f2ce8252
|
merge from develop
|
2022-02-22 10:38:42 +08:00 |
|
xiaoxiaoqiong
|
4e3f9cc019
|
竞赛通知任务调度
|
2022-02-21 16:48:59 +08:00 |
|
xiaoxiaoqiong
|
5ed7b3e4ad
|
竞赛通知任务调度
|
2022-02-21 16:46:40 +08:00 |
|
xiaoxiaoqiong
|
4e2c46260c
|
Merge remote-tracking branch 'origin/develop' into develop
|
2022-02-17 18:28:40 +08:00 |
|
xiaoxiaoqiong
|
9ba00b21c9
|
竞赛通知api
|
2022-02-17 18:28:32 +08:00 |
|
yystopf
|
1100309038
|
Merge branch 'develop' into standalone_develop
|
2022-02-17 11:12:58 +08:00 |
|
yystopf
|
b11f5fd228
|
fix: cache rollback
|
2022-02-17 11:12:50 +08:00 |
|
yystopf
|
af5f2b2fe3
|
Merge branch 'develop' into standalone_develop
|
2022-02-17 10:59:29 +08:00 |
|
yystopf
|
90dbe0730a
|
fix: job not affect
|
2022-02-17 10:59:18 +08:00 |
|
yystopf
|
f39e8b7668
|
Merge branch 'develop' into standalone_develop
|
2022-02-17 09:43:52 +08:00 |
|
yystopf
|
d6633cb73a
|
fix
|
2022-02-17 09:43:44 +08:00 |
|
yystopf
|
86ef890f8b
|
Merge branch 'develop' into standalone_develop
|
2022-02-17 09:40:54 +08:00 |
|
yystopf
|
a7a6abd22a
|
fix: add rule for issue expire
|
2022-02-17 09:40:44 +08:00 |
|
yystopf
|
6fd47b56a5
|
Merge branch 'develop' into standalone_develop
|
2022-02-17 09:37:00 +08:00 |
|
yystopf
|
c956667ce0
|
fix
|
2022-02-17 09:36:49 +08:00 |
|
yystopf
|
898453c88c
|
Merge branch 'develop' into standalone_develop
|
2022-02-16 15:10:19 +08:00 |
|
yystopf
|
5701c818ed
|
fix
|
2022-02-16 15:10:10 +08:00 |
|
yystopf
|
1ac2ddfaa5
|
fix: default setting for new template message
|
2022-02-16 11:46:34 +08:00 |
|
yystopf
|
3c7da85bee
|
Merge branch 'standalone_develop' into pre_trustie_server
|
2022-02-16 09:35:42 +08:00 |
|
yystopf
|
9751c954df
|
Merge branch 'develop' into standalone_develop
|
2022-02-16 09:35:22 +08:00 |
|
yystopf
|
84b56bfcb8
|
fix: project milestone create notice template
|
2022-02-16 09:34:31 +08:00 |
|
yystopf
|
ac07c88f84
|
Merge branch 'develop' into standalone_develop
|
2022-02-15 18:30:25 +08:00 |
|
yystopf
|
7485564bb9
|
add: template message platform varible
|
2022-02-15 18:30:13 +08:00 |
|
yystopf
|
5e696ae905
|
Merge branch 'develop' into standalone_develop
|
2022-02-15 17:33:55 +08:00 |
|
yystopf
|
e3f4313c80
|
fix
|
2022-02-15 17:29:13 +08:00 |
|
yystopf
|
b223abe229
|
fix: init data
|
2022-02-15 17:26:46 +08:00 |
|
yystopf
|
b3bede308c
|
add: some new message rules
|
2022-02-15 17:13:06 +08:00 |
|
yystopf
|
22293572ac
|
fix: issue changed about version callback
|
2022-02-14 17:02:59 +08:00 |
|
yystopf
|
959c1e8d95
|
add: user profile setting message
|
2022-02-14 13:55:34 +08:00 |
|
yystopf
|
ea11672fff
|
Merge branch 'standalone_develop' into pre_trustie_server
|
2022-02-11 16:27:56 +08:00 |
|
yystopf
|
09c4f8db0e
|
Merge branch 'develop' into standalone_develop
|
2022-02-11 16:27:42 +08:00 |
|
yystopf
|
29dc3fff39
|
fix: migrate use old rule
|
2022-02-11 16:27:22 +08:00 |
|
yystopf
|
8d18149537
|
Merge branch 'standalone_develop' into pre_trustie_server
|
2022-02-10 14:11:06 +08:00 |
|
yystopf
|
8050af23fc
|
Merge branch 'develop' into standalone_develop
|
2022-02-10 14:10:54 +08:00 |
|
yystopf
|
298abdd1b1
|
fix: devops organization bug
|
2022-02-10 14:08:14 +08:00 |
|
yystopf
|
b9e2a6edf1
|
Merge branch 'standalone_develop' into pre_trustie_server
|
2022-01-24 17:27:21 +08:00 |
|
yystopf
|
e0f5337fdd
|
Merge branch 'develop' into standalone_develop
|
2022-01-24 14:26:36 +08:00 |
|
yystopf
|
380ca3a066
|
fix: projects query rule
|
2022-01-24 14:26:24 +08:00 |
|
yystopf
|
7d19849968
|
Merge branch 'develop' into standalone_develop
|
2022-01-24 10:44:59 +08:00 |
|
yystopf
|
237b0afb08
|
fix: team user build use find or create by
|
2022-01-24 10:44:46 +08:00 |
|
yystopf
|
05f5982a53
|
Merge branch 'standalone_develop' into pre_trustie_server
|
2022-01-07 18:04:55 +08:00 |
|
yystopf
|
f76dad680a
|
Merge pull request '上传头像、组织团队限制、文件下载问题修复、branch简化数据、webhook问题修复' (#298) from develop into standalone_develop
|
2022-01-07 18:03:57 +08:00 |
|
yystopf
|
84f12adce8
|
fix: webhook tasks list error delay
|
2022-01-06 14:29:31 +08:00 |
|
yystopf
|
4f63caa86c
|
Merge branch 'standalone_develop' into pre_trustie_server
|
2021-12-28 16:10:44 +08:00 |
|
yystopf
|
96b0f2d167
|
Merge branch 'develop' into standalone_develop
|
2021-12-28 16:10:16 +08:00 |
|
yystopf
|
12edc620df
|
fix: complete profile condition
|
2021-12-24 16:15:59 +08:00 |
|
yystopf
|
4ce03145df
|
fix
|
2021-12-23 14:33:31 +08:00 |
|
yystopf
|
3e04a37ece
|
add: team remove and joined template message
|
2021-12-23 14:26:40 +08:00 |
|
yystopf
|
26ae9b35df
|
fix: change member role and change team user team
|
2021-12-22 11:32:40 +08:00 |
|
yystopf
|
8e79b43aaf
|
add: member bind team user
|
2021-12-22 11:16:27 +08:00 |
|
yystopf
|
bec98bbc9d
|
Merge branch 'standalone_develop' into pre_trustie_server
|
2021-12-17 15:45:57 +08:00 |
|
yystopf
|
af160084c4
|
fix: merge from develop
|
2021-12-17 15:45:28 +08:00 |
|
yystopf
|
da4fd3a762
|
fix: 易修 to 疑修
|
2021-12-17 15:35:30 +08:00 |
|
yystopf
|
96d1a7440d
|
Merge branch 'standalone_develop' into pre_trustie_server
|
2021-12-14 10:20:54 +08:00 |
|
yystopf
|
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 |
 xxq250
|
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 |
|
yystopf
|
6ffc702209
|
Merge pull request '提交最新代码到预上线环境' (#272) from develop into standalone_develop
|
2021-11-29 15:44:51 +08:00 |
|
yystopf
|
22f3371090
|
fix: change issues priority id default value
|
2021-11-29 11:05:33 +08:00 |
|
xxq250
|
7c765817c9
|
Merge pull request 'merge develop to standalone_develop' (#267) from develop into standalone_develop
|
2021-11-26 14:21:53 +08:00 |
|
xxq250
|
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 |
|
yystopf
|
1a9ed1425e
|
fix: destroy decrement forked count
|
2021-11-23 13:48:09 +08:00 |
|
yystopf
|
72ec7bc213
|
fix: change email default rule
|
2021-11-19 10:57:25 +08:00 |
|
yystopf
|
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 |
|
yystopf
|
49c7827f87
|
fix
|
2021-11-10 16:40:11 +08:00 |
|
yystopf
|
937603d0f2
|
fix: change params is blank not sent email
|
2021-11-10 10:05:35 +08:00 |
|
yystopf
|
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 |
|
jasder
|
c19c83d505
|
Merge branch 'develop' of https://git.trustie.net/Gitlink/forgeplus into develop
|
2021-11-05 11:36:51 +08:00 |
|
jasder
|
9f31dc02f4
|
FIX 后台管理修改用户信息时同步git用户
|
2021-11-04 17:58:45 +08:00 |
|
yystopf
|
18bbbce7b3
|
add: home index api
|
2021-11-03 10:19:01 +08:00 |
|
yystopf
|
35f04afe91
|
add: home index admins
|
2021-11-02 19:00:07 +08:00 |
|
yystopf
|
94075717e2
|
add: home index models
|
2021-11-02 15:56:47 +08:00 |
|
yystopf
|
46405e704a
|
add: rank not include deleted project
|
2021-11-02 09:59:21 +08:00 |
|
jasder
|
6c67b92bb1
|
FIX revert system_notification_histories
|
2021-11-01 11:06:18 +08:00 |
|
jasder
|
ab2e1ffa0e
|
FIX revert system_notification_histories[bug]
|
2021-11-01 11:06:08 +08:00 |
|
jasder
|
1533f40890
|
Merge branch 'develop' of https://git.trustie.net/Gitlink/forgeplus into develop
|
2021-11-01 11:00:01 +08:00 |
|
jasder
|
b40cbfbfbb
|
FIX conflict
|
2021-10-29 15:07:01 +08:00 |