jasder
|
d9e4f26819
|
ADD 前端页面打包文件
|
2021-10-22 11:52:01 +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
|
a5e5dbb6bf
|
Merge branch 'trustie_server' of https://git.trustie.net/Gitlink/forgeplus into trustie_server
|
2021-10-22 10:52:42 +08:00 |
jasder
|
da30ba189c
|
Merge pull request '主干分支代码并入生产分支' (#215) from dev_trustie_server into trustie_server
|
2021-10-21 15:06:40 +08:00 |
|
jasder
|
b5047392a6
|
Merge pull request '合并主干分支代码' (#214) from jasder/forgeplus:dev_trustie_server into dev_trustie_server
|
2021-10-21 14:45:58 +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 |
|
jasder
|
cd9a454a80
|
Merge pull request 'FIX 优化接口数据' (#211) from featrue_api_performance into develop
|
2021-10-21 13:50:09 +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 |
|
yystopf
|
62e8cf76b9
|
Merge pull request 'ADD 通知公告以及修复bug' (#207) from dev_trustie_server into trustie_server
|
2021-10-18 18:27:06 +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 |
|
jasder
|
fddd466907
|
Merge pull request '修改易修标题验证规则' (#203) from yystopf/forgeplus:hh_fix_bug into develop
|
2021-10-18 17:41:51 +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
|
4567c32b97
|
Merge pull request 'FIX edit project identifier’s bug' (#201) from dev_trustie_server into trustie_server
|
2021-10-15 16:57:20 +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 |
|
jasder
|
37e5e6d547
|
Merge pull request '项目标识可以选择不修改' (#199) from yystopf/forgeplus:hh_fix_bug into develop
|
2021-10-15 16:54:33 +08:00 |
|
yystopf
|
a4ee529216
|
fix: allow update repository identifier origin
|
2021-10-15 16:47:01 +08:00 |
|
jasder
|
da3625a0a8
|
Merge pull request 'FIX 项目动态数据修复以及 Pr项目链接错误的bug' (#198) from dev_trustie_server into trustie_server
|
2021-10-15 16:32:49 +08:00 |
|
jasder
|
6f5f42c23a
|
Merge pull request 'FIX dev_trustie_server 远程仓库pr' (#197) from jasder/forgeplus:dev_trustie_server into dev_trustie_server
|
2021-10-15 16:22:02 +08:00 |
|
jasder
|
3c44ffe7df
|
Merge remote-tracking branch 'gitlink/dev_trustie_server' into dev_trustie_server
|
2021-10-15 16:13:45 +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 |