Commit Graph

2190 Commits

Author SHA1 Message Date
xiaoxiaoqiong 515307139a README文件中的图片显示问题 2021-11-25 10:30:46 +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 f9d4316a8e fix: change fork project status 2021-11-23 11:43:44 +08:00
yystopf ddb826733b fix: project setting permission control 2021-11-19 14:56:20 +08:00
yystopf 1f989d0a37 fix: delete organization tip 2021-11-19 14:44:25 +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
yystopf 0885575cc4 fix: organization validate name tip 2021-11-18 17:31:22 +08:00
yystopf 8011dabaac fix: undo events 2021-11-18 17:02: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 222e5c1050 fix: atme sender info 2021-11-10 11:32:59 +08:00
yystopf 1298fedcbb fix: user rank 2021-11-10 10:47:03 +08:00
yystopf 937603d0f2 fix: change params is blank not sent email 2021-11-10 10:05:35 +08:00
yystopf 685d2b80f2 fix 2021-11-10 09:43:22 +08:00
yystopf 2e35fb92a9 fix: change message template email title 2021-11-09 17:04:45 +08:00
yystopf c4e88ad690 fix 2021-11-09 16:56:49 +08:00
yystopf e316a60433 fix: pullrequest fork_project_user_name 2021-11-09 16:56:49 +08:00
jasder 77ad959a8c Merge remote-tracking branch 'gitlink/featrue_login_and_register' into standalone_develop 2021-11-08 15:08:47 +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 6fe3507a16 Merge remote-tracking branch 'gitlink/develop' into develop 2021-11-08 14:22:57 +08:00
jasder 6b0f9a689a Merge pull request '@我功能' (#239) from yystopf/forgeplus:hh_notification_v2_2 into develop 2021-11-08 14:21:00 +08:00
yystopf eb18a1e7aa add: project members api and update forks api 2021-11-08 11:35:14 +08:00
yystopf 1a449d1dc6 add: atme service 2021-11-08 11:35:14 +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
jasder 8d3b674321 FIX viri code invalid bug 2021-11-04 14:14:11 +08:00
jasder a549dc1e25 FIX reset password bug 2021-11-03 21:32:17 +08:00
jasder e02237a9e0 FIX code review 2021-11-03 18:25:57 +08:00
jasder 538d2113f1 FIX 完善重置密码功能 2021-11-03 17:19:43 +08:00
yystopf e27ba76f33 fix: project identifier regex 2021-11-03 14:43:17 +08:00
yystopf 18cf2ca78a fix 2021-11-03 14:26:19 +08:00
yystopf 0d1fa2995a fix 2021-11-03 14:25:04 +08:00
yystopf e243a61d0c add: request api data and topic group 2021-11-03 14:21:02 +08:00
jasder 06cf52c384 ADD 注册接口添加确认密码参数 2021-11-03 13:50:38 +08:00
yystopf a3f57d3cbc fix: paginate and img width 2021-11-03 11:38:47 +08:00
yystopf 18bbbce7b3 add: home index api 2021-11-03 10:19:01 +08:00
jasder be96e7e5eb FIX render_error mentod bug 2021-11-02 21:43:10 +08:00
yystopf 35f04afe91 add: home index admins 2021-11-02 19:00:07 +08:00
yystopf 385f45ddde add: home index controllers 2021-11-02 15:59:57 +08:00
yystopf 94075717e2 add: home index models 2021-11-02 15:56:47 +08:00
jasder 1008f17849 FIX 调整注册接口 2021-11-02 13:39:45 +08:00
yystopf 43c683e83f fix: contributor load cache data 2021-11-02 11:27:17 +08:00
yystopf 282d3d0122 fix 2021-11-02 10:15:35 +08:00
yystopf 1b47f51550 fix 2021-11-02 10:03:13 +08:00
yystopf 890fe7d629 fix 2021-11-02 09:59:21 +08:00
yystopf 7193323be9 fix: field upper but 2021-11-02 09:59:21 +08:00
yystopf 28c3b4dda4 add: repo commit user use cache data 2021-11-02 09:59:21 +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 97ed641c63 FIX 增加gitea接口的响应时间(timeout设置为100s) 2021-11-01 11:05:31 +08:00
jasder 84ad7130d3 Revert "FIX 增加gitea接口的响应时间(timeout设置为100s)"
This reverts commit 0e9699885d.
2021-11-01 11:04:37 +08:00
jasder 83661dcf71 FIX update query projects api 2021-11-01 11:03:14 +08:00
jasder 0e9699885d FIX 增加gitea接口的响应时间(timeout设置为100s) 2021-11-01 11:03:00 +08:00
jasder 1533f40890 Merge branch 'develop' of https://git.trustie.net/Gitlink/forgeplus into develop 2021-11-01 11:00:01 +08:00
yystopf de2399a0a1 fix: project category load slowly 2021-10-29 19:54:58 +08:00
yystopf eba672f39a fix: user popular project nil 2021-10-29 19:39:08 +08:00
jasder b40cbfbfbb FIX conflict 2021-10-29 15:07:01 +08:00
jasder c0df55c20f Merge pull request 'ADD 合并项目首页改版功能' (#227) from feature_project_detail into develop 2021-10-29 11:21:27 +08:00
yystopf a983ce5e8a Merge pull request '项目首页api以及后台推荐精选功能' (#226) from yystopf/forgeplus:hh_project_detail into feature_project_detail 2021-10-29 10:57:28 +08:00
yystopf 4f53994470 fix: rank count 2021-10-28 16:33:30 +08:00
yystopf 11d102f240 fix 2021-10-28 15:32:49 +08:00
yystopf 8698829678 fix: organization recommend api 2021-10-28 15:28:33 +08:00
yystopf 81ab0b01c0 fix: banner recommend remove login require 2021-10-28 14:21:42 +08:00
yystopf 3f690fd9a0 add: pinned projects size 2021-10-28 11:00:32 +08:00
yystopf 2b6d5e694e fix 2021-10-28 10:56:30 +08:00
yystopf 9aff90c03a fix 2021-10-28 10:52:44 +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 cc0e01cc47 fix 2021-10-27 17:06:35 +08:00
jasder 4676b756e8 FIX 完善邮箱注册发送邮件功能 2021-10-27 17:01:16 +08:00
yystopf f0580720e3 fix 2021-10-27 16:58:31 +08:00
yystopf 91852d7957 add: project explore management 2021-10-27 16:50:18 +08:00
jasder 2719e60248 ADD 邮箱、登录名、手机号验证api 2021-10-27 15:15:06 +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 c019766df2 fix 2021-10-27 10:48:45 +08:00
yystopf 9232a284d8 fix 2021-10-27 10:46:09 +08:00
yystopf e6c6e544fe fix 2021-10-27 10:00:06 +08:00
yystopf d0791ee653 fix: privacy project not use cache 2021-10-27 09:48:23 +08:00
yystopf e1b0abbf31 fix 2021-10-27 09:20:46 +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 9cd54b0ccb FIX 解决老版本trustie项目链接错误的问题 2021-10-25 17:24:28 +08:00
yystopf fa476732e5 add: user common info cache service 2021-10-25 17:23:17 +08:00
yystopf f9bb74aba4 add: cache service 2021-10-25 16:57:11 +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
jasder 401798ebdd Merge pull request '通知系统自定义发送规则功能' (#205) from yystopf/forgeplus:hh_notification_v2_1 into develop 2021-10-21 14:25:58 +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
jasder 94d5565f56 FIX 调整detail接口数据[bug] 2021-10-21 10:52:58 +08:00
jasder 9ffe10bd5b FIX 调整detail接口数据 2021-10-21 10:48:14 +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 9157bc3eb9 fix: api doc 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
jasder 33a5b7f4f9 FIX 合并主干分支代码并解决代码冲突 2021-10-18 18:16:12 +08:00
jasder d58d4136ad Merge pull request '系统通知弹窗功能' (#204) from yystopf/forgeplus:hh_notification_v2 into develop 2021-10-18 17:43:53 +08:00
yystopf ff97daac54 fix 2021-10-18 13:52:52 +08:00
yystopf 2d4f083164 fix 2021-10-18 13:51:32 +08:00
yystopf 0885b7d75d fix 2021-10-18 13:51:32 +08:00
yystopf 1dcc38f617 fix: remove system_notification_history 2021-10-18 13:51:32 +08:00
yystopf 0d60e58304 fix: system notification edit error 2021-10-18 13:51:32 +08:00
yystopf 1b87a7a733 fix: send message job need open notice menu 2021-10-18 13:51:25 +08:00
yystopf 21af31f23c add: system notification history api 2021-10-18 13:49:58 +08:00
yystopf 490ce7a234 add: setting of system notification 2021-10-18 13:49:58 +08:00
yystopf d176508010 add: system notification management 2021-10-18 13:49:58 +08:00
yystopf 73f558d7c3 fix: issue subject validate 2021-10-18 13:42:55 +08:00
jasder 9899a8aab6 Merge pull request 'FIX edit project identifier’s bug' (#200) from develop into dev_trustie_server 2021-10-15 16:56:43 +08:00
yystopf a4ee529216 fix: allow update repository identifier origin 2021-10-15 16:47:01 +08:00
jasder 4ebb6a5e74 Merge branch 'develop' into dev_trustie_server 2021-10-15 16:09:48 +08:00
jasder c5a0d025cc Merge pull request '项目动态正确显示以及数据修复' (#194) from yystopf/forgeplus:hh_project_trends into develop 2021-10-15 16:06:12 +08:00
jasder a8972276ec Merge pull request '项目设置可更改项目标识' (#193) from yystopf/forgeplus:hh_fix_bug into develop 2021-10-15 16:05:32 +08:00
yystopf 2a09fadf71 fix: change projec trend rule and fix data 2021-10-15 14:36:50 +08:00
yystopf ffa0715374 fix 2021-10-14 18:34:37 +08:00
yystopf 79b394d291 fix: projecttrend show rule 2021-10-14 18:34:27 +08:00
yystopf 98a45eb05c fix: update repository identifier valid 2021-10-14 17:03:36 +08:00
yystopf 00100e59c4 add: project permit change identifier 2021-10-14 17:03:36 +08:00
yystopf 018745c062 add: project permit change identifier 2021-10-14 17:03:36 +08:00
yystopf 1198830422 add: project permit change identifier 2021-10-14 17:03:36 +08:00
yystopf 3d8b19fa73 fix: edit pr fork project info 2021-10-14 16:59:43 +08:00
yystopf 8ba1198b4a fix: pr files commits count 2021-10-14 16:38:12 +08:00
jasder da960a916e Merge pull request '合并请求已存在修改跳转地址' (#187) from yystopf/forgeplus:hh_pr_redirect into develop 2021-10-14 15:35:10 +08:00
yystopf 2587ccea28 add: pr compare exist pr 2021-10-14 15:32:56 +08:00
jasder 1fa44535bb FIX 更新pulls的api文档 2021-10-12 18:36:14 +08:00
jasder 7c8843fda7 Merge branch 'develop' into dev_trustie_server 2021-10-12 14:02:33 +08:00
yystopf 0bdbc09ec0 fix: check pr can merge change redirect url 2021-10-11 18:15:10 +08:00
yystopf 301f82f84d fix: check pr can merge change redirect url 2021-10-11 18:13:42 +08:00
yystopf 48b5117062 fix: check pr can merge change redirect url 2021-10-11 18:10:28 +08:00
yystopf 350502b499 fix: pullrequest create info 2021-10-11 10:07:35 +08:00
jasder 3325ec842d Merge pull request 'FIX 代码库二级页面改版以及其他bug' (#172) from develop into dev_trustie_server 2021-10-09 16:15:12 +08:00