Commit Graph

629 Commits

Author SHA1 Message Date
xxq250 7c765817c9 Merge pull request 'merge develop to standalone_develop' (#267) from develop into standalone_develop 2021-11-26 14:21:53 +08:00
yystopf abca0fe432 fix: change pr path id to number 2021-11-25 15:08:59 +08:00
xiaoxiaoqiong 399558550e fix 验证码过期等#53446,#50806,#50880 2021-11-24 18:13:15 +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 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 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 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
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 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
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
yystopf 35f04afe91 add: home index admins 2021-11-02 19:00:07 +08:00
yystopf 43c683e83f fix: contributor load cache data 2021-11-02 11:27:17 +08:00
yystopf 1b47f51550 fix 2021-11-02 10:03:13 +08:00
yystopf 28c3b4dda4 add: repo commit user use cache data 2021-11-02 09:59:21 +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
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
yystopf 8698829678 fix: organization recommend api 2021-10-28 15:28:33 +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 43dc966cf9 add: project category upload logo 2021-10-27 18:02:21 +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
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 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 21fa609e05 add: project rank and user rank api 2021-10-26 18:42:35 +08:00
yystopf fa476732e5 add: user common info cache service 2021-10-25 17:23:17 +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