You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@answer.apache.org by sh...@apache.org on 2024/08/14 03:24:26 UTC

(incubator-answer) 03/03: Merge branch 'feat/1.4.0/personal' of github.com:answerdev/answer into feat/1.4.0/personal

This is an automated email from the ASF dual-hosted git repository.

shuai pushed a commit to branch feat/1.4.0/personal
in repository https://gitbox.apache.org/repos/asf/incubator-answer.git

commit 2653d0d52f27333b009c173605af63aaca5e964f
Merge: 4ce7e7a8 a74c4006
Author: shuai <li...@sifou.com>
AuthorDate: Wed Aug 14 11:24:07 2024 +0800

    Merge branch 'feat/1.4.0/personal' of github.com:answerdev/answer into feat/1.4.0/personal

 dev/i18n/zh_CN.yaml                                |  1 +
 i18n/zh_CN.yaml                                    | 15 ++++
 .../pages/Admin/Badges/components/Action/index.tsx | 15 ++--
 ui/src/pages/Admin/Badges/index.tsx                | 96 +++++++++++++++-------
 ui/src/services/admin/{index.ts => badges.ts}      | 30 +++++--
 ui/src/services/admin/index.ts                     |  1 +
 6 files changed, 113 insertions(+), 45 deletions(-)