 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 |
|
yystopf
|
8698829678
|
fix: organization recommend api
|
2021-10-28 15:28:33 +08:00 |
|
yystopf
|
43dc966cf9
|
add: project category upload logo
|
2021-10-27 18:02:21 +08:00 |
|
jasder
|
cbf8f1fa67
|
FIX code review
|
2021-10-27 17:19:39 +08:00 |
|
yystopf
|
274e5090ce
|
fix
|
2021-10-27 17:07:48 +08:00 |
|
yystopf
|
91852d7957
|
add: project explore management
|
2021-10-27 16:50:18 +08:00 |
|
yystopf
|
0970a402c8
|
fix
|
2021-10-27 14:38:30 +08:00 |
|
yystopf
|
a43f6714de
|
add: project explore api
|
2021-10-27 14:20:27 +08:00 |
|
yystopf
|
01f99a2f12
|
fix
|
2021-10-27 11:03:34 +08:00 |
|
yystopf
|
d0791ee653
|
fix: privacy project not use cache
|
2021-10-27 09:48:23 +08:00 |
|
yystopf
|
21fa609e05
|
add: project rank and user rank api
|
2021-10-26 18:42:35 +08:00 |
|
yystopf
|
69c87fd5a4
|
add: callback cache
|
2021-10-26 15:22:42 +08:00 |
|
yystopf
|
91f1f4090f
|
fix: old cache
|
2021-10-25 18:03:56 +08:00 |
|
jasder
|
683c00a73e
|
Merge branch 'trustie_server' into standalone
|
2021-10-22 11:16:30 +08:00 |
|
jasder
|
74a7bc62ea
|
FIX 合并develop分支代码并处理冲突
|
2021-10-22 11:16:22 +08:00 |
|
jasder
|
5b19a333ef
|
Merge branch 'develop' into dev_trustie_server
|
2021-10-21 14:41:43 +08:00 |
|
yystopf
|
24ec039895
|
fix
|
2021-10-21 11:23:12 +08:00 |
|
yystopf
|
43d125100d
|
fix
|
2021-10-21 11:19:12 +08:00 |
|
yystopf
|
fdcf450eab
|
fix
|
2021-10-21 11:17:11 +08:00 |
|
yystopf
|
748e8cc92a
|
add: send template message email supplement
|
2021-10-20 14:34:15 +08:00 |
|
yystopf
|
c52f40adbd
|
fix
|
2021-10-19 16:21:34 +08:00 |
|
yystopf
|
3ce8723de2
|
fix
|
2021-10-19 14:49:35 +08:00 |
|
yystopf
|
dbe47dbddf
|
fix: change template message setting default value
|
2021-10-19 14:40:47 +08:00 |
|
yystopf
|
bd9759a3ed
|
fix: user template message setting init data
|
2021-10-19 14:40:47 +08:00 |
|
yystopf
|
7d98bd0bbe
|
fix: template message settinng type order by order index
|
2021-10-19 14:40:47 +08:00 |
|
yystopf
|
88a7456300
|
add: template message control by setting
|
2021-10-19 14:40:47 +08:00 |
|
yystopf
|
dbdd2e2dd3
|
add: user template message setting
|
2021-10-19 14:40:45 +08:00 |
|
yystopf
|
d54dcb6b67
|
add: template message settings api
|
2021-10-19 14:40:21 +08:00 |
|
yystopf
|
8252cb7e71
|
add: template setting model
|
2021-10-19 14:40:20 +08:00 |