You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@answer.apache.org by li...@apache.org on 2024/05/27 08:27:23 UTC
(incubator-answer) branch dev updated (aa70f41f -> 727a3f00)
This is an automated email from the ASF dual-hosted git repository.
linkinstar pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-answer.git
from aa70f41f feat: add basepath
add 410263e6 fix(comment): prohibit comment on the delete content
new 727a3f00 Merge remote-tracking branch 'origin/fix/1.3.5/comment' into dev
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
i18n/en_US.yaml | 4 ++++
internal/base/reason/reason.go | 1 +
internal/schema/simple_obj_info_schema.go | 22 +++++++++++++++++++++-
internal/service/comment/comment_service.go | 4 +++-
internal/service/content/vote_service.go | 6 ++++++
internal/service/object_info/object_info.go | 2 ++
internal/service/report/report_service.go | 3 +++
7 files changed, 40 insertions(+), 2 deletions(-)
(incubator-answer) 01/01: Merge remote-tracking branch 'origin/fix/1.3.5/comment' into dev
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
linkinstar pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-answer.git
commit 727a3f00a49b57429ac5055a77a0fffc3c861610
Merge: aa70f41f 410263e6
Author: LinkinStars <li...@foxmail.com>
AuthorDate: Mon May 27 16:27:06 2024 +0800
Merge remote-tracking branch 'origin/fix/1.3.5/comment' into dev
# Conflicts:
# i18n/en_US.yaml
i18n/en_US.yaml | 4 ++++
internal/base/reason/reason.go | 1 +
internal/schema/simple_obj_info_schema.go | 22 +++++++++++++++++++++-
internal/service/comment/comment_service.go | 4 +++-
internal/service/content/vote_service.go | 6 ++++++
internal/service/object_info/object_info.go | 2 ++
internal/service/report/report_service.go | 3 +++
7 files changed, 40 insertions(+), 2 deletions(-)
diff --cc i18n/en_US.yaml
index 850dc7d1,24b02f5b..e6ce9b48
--- a/i18n/en_US.yaml
+++ b/i18n/en_US.yaml
@@@ -201,9 -204,8 +203,11 @@@ backend
other: The old password verification failed
new_password_same_as_previous_setting:
other: The new password is the same as the previous one.
+ already_deleted:
+ other: This post has been deleted.
+ meta:
+ object_not_found:
+ other: Meta object not found
question:
already_deleted:
other: This post has been deleted.