Commit Graph

854 Commits

Author SHA1 Message Date
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
18bbbce7b3 add: home index api 2021-11-03 10:19:01 +08:00
35f04afe91 add: home index admins 2021-11-02 19:00:07 +08:00
94075717e2 add: home index models 2021-11-02 15:56:47 +08:00
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
8698829678 fix: organization recommend api 2021-10-28 15:28:33 +08:00
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
274e5090ce fix 2021-10-27 17:07:48 +08:00
91852d7957 add: project explore management 2021-10-27 16:50:18 +08:00
0970a402c8 fix 2021-10-27 14:38:30 +08:00
a43f6714de add: project explore api 2021-10-27 14:20:27 +08:00
01f99a2f12 fix 2021-10-27 11:03:34 +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
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
24ec039895 fix 2021-10-21 11:23:12 +08:00
43d125100d fix 2021-10-21 11:19:12 +08:00
fdcf450eab fix 2021-10-21 11:17:11 +08:00
748e8cc92a add: send template message email supplement 2021-10-20 14:34:15 +08:00
c52f40adbd fix 2021-10-19 16:21:34 +08:00
3ce8723de2 fix 2021-10-19 14:49:35 +08:00
dbe47dbddf fix: change template message setting default value 2021-10-19 14:40:47 +08:00
bd9759a3ed fix: user template message setting init data 2021-10-19 14:40:47 +08:00
7d98bd0bbe fix: template message settinng type order by order index 2021-10-19 14:40:47 +08:00
88a7456300 add: template message control by setting 2021-10-19 14:40:47 +08:00
dbdd2e2dd3 add: user template message setting 2021-10-19 14:40:45 +08:00
d54dcb6b67 add: template message settings api 2021-10-19 14:40:21 +08:00
8252cb7e71 add: template setting model 2021-10-19 14:40:20 +08:00
jasder
33a5b7f4f9 FIX 合并主干分支代码并解决代码冲突 2021-10-18 18:16:12 +08:00
0885b7d75d fix 2021-10-18 13:51:32 +08:00
1dcc38f617 fix: remove system_notification_history 2021-10-18 13:51:32 +08:00
0d60e58304 fix: system notification edit error 2021-10-18 13:51:32 +08:00
1b87a7a733 fix: send message job need open notice menu 2021-10-18 13:51:25 +08:00
21af31f23c add: system notification history api 2021-10-18 13:49:58 +08:00
490ce7a234 add: setting of system notification 2021-10-18 13:49:58 +08:00
d176508010 add: system notification management 2021-10-18 13:49:58 +08:00
jasder
4ebb6a5e74 Merge branch 'develop' into dev_trustie_server 2021-10-15 16:09:48 +08:00
2a09fadf71 fix: change projec trend rule and fix data 2021-10-15 14:36:50 +08:00
ffa0715374 fix 2021-10-14 18:34:37 +08:00