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/01/02 06:48:21 UTC
(incubator-answer) branch test updated (937f95df -> 4b8ad99a)
This is an automated email from the ASF dual-hosted git repository.
shuai pushed a change to branch test
in repository https://gitbox.apache.org/repos/asf/incubator-answer.git
from 937f95df Merge branch 'dev' into test
add 82fdfc77 Release/1.2.1 (#678)
add 3f696b63 docs(README): upgrade 1.2.1
add 7e4fe9a0 New Crowdin updates (#3)
add 2df8d565 New Crowdin updates (#14)
add 68f5af01 fix: log prints incorrect method(#684)
add 152934c7 ci: build image only if repository_owner is apache
add 3b00da93 Sanitize input from contributor fork workflows.
add 41a73cf9 fix: i18n text (#693)
add ba3f5a5a fix: tag form logic optimization arc
new 4b8ad99a fix: resolve conflict
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:
.github/workflows/build-binary-for-release.yml | 1 +
.github/workflows/build-image-for-manual.yml | 1 +
.github/workflows/build-image-for-release.yml | 1 +
.github/workflows/build-image-for-test.yml | 1 +
.github/workflows/uffizzi-build.yml | 8 +-
.github/workflows/uffizzi-preview.yml | 44 ++++++----
Makefile | 2 +-
README.md | 2 +-
docs/docs.go | 15 ++++
docs/swagger.json | 15 ++++
docs/swagger.yaml | 10 +++
i18n/af_ZA.yaml | 4 +-
i18n/ar_SA.yaml | 4 +-
i18n/az_AZ.yaml | 4 +-
i18n/bal_BA.yaml | 4 +-
i18n/ban_ID.yaml | 4 +-
i18n/bn_BD.yaml | 4 +-
i18n/bs_BA.yaml | 4 +-
i18n/ca_ES.yaml | 4 +-
i18n/cs_CZ.yaml | 49 ++++++++---
i18n/cy_GB.yaml | 49 ++++++++---
i18n/da_DK.yaml | 49 ++++++++---
i18n/de_DE.yaml | 115 ++++++++++++++++---------
i18n/el_GR.yaml | 4 +-
i18n/en_US.yaml | 23 ++---
i18n/es_ES.yaml | 78 +++++++++--------
i18n/fa_IR.yaml | 47 ++++++++--
i18n/fi_FI.yaml | 4 +-
i18n/fr_FR.yaml | 47 ++++++++--
i18n/he_IL.yaml | 4 +-
i18n/hu_HU.yaml | 4 +-
i18n/hy_AM.yaml | 4 +-
i18n/id_ID.yaml | 47 ++++++++--
i18n/it_IT.yaml | 49 ++++++++---
i18n/ja_JP.yaml | 49 ++++++++---
i18n/ko_KR.yaml | 51 ++++++++---
i18n/nl_NL.yaml | 4 +-
i18n/no_NO.yaml | 4 +-
i18n/pl_PL.yaml | 47 ++++++++--
i18n/pt_PT.yaml | 49 ++++++++---
i18n/ro_RO.yaml | 4 +-
i18n/ru_RU.yaml | 47 ++++++++--
i18n/sk_SK.yaml | 47 ++++++++--
i18n/sq_AL.yaml | 4 +-
i18n/sr_SP.yaml | 4 +-
i18n/sv_SE.yaml | 4 +-
i18n/tr_TR.yaml | 49 ++++++++---
i18n/uk_UA.yaml | 49 ++++++++---
i18n/vi_VN.yaml | 49 ++++++++---
i18n/zh_CN.yaml | 53 ++++++++----
i18n/zh_TW.yaml | 49 ++++++++---
internal/controller/question_controller.go | 4 +-
internal/migrations/migrations.go | 2 +-
ui/.prettierrc.json | 2 +-
ui/pnpm-lock.yaml | 17 ++++
ui/src/common/constants.ts | 2 +
ui/src/hooks/useTagModal/index.tsx | 7 +-
ui/src/pages/Questions/Ask/index.tsx | 2 +
ui/src/pages/Questions/EditAnswer/index.tsx | 1 +
ui/src/pages/Tags/Create/index.tsx | 60 +++++++++++++
ui/src/pages/Tags/Edit/index.tsx | 74 ++++++++++++++--
ui/src/pages/Users/Logout/index.tsx | 19 ++++
ui/src/utils/common.ts | 38 ++++----
63 files changed, 1121 insertions(+), 375 deletions(-)
(incubator-answer) 01/01: fix: resolve conflict
Posted by sh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
shuai pushed a commit to branch test
in repository https://gitbox.apache.org/repos/asf/incubator-answer.git
commit 4b8ad99a3a51b7c42050118e637cea4f67b50cc1
Merge: 937f95df ba3f5a5a
Author: shuai <li...@sifou.com>
AuthorDate: Tue Jan 2 14:48:10 2024 +0800
fix: resolve conflict
.github/workflows/build-binary-for-release.yml | 1 +
.github/workflows/build-image-for-manual.yml | 1 +
.github/workflows/build-image-for-release.yml | 1 +
.github/workflows/build-image-for-test.yml | 1 +
.github/workflows/uffizzi-build.yml | 8 +-
.github/workflows/uffizzi-preview.yml | 44 ++++++----
Makefile | 2 +-
README.md | 2 +-
docs/docs.go | 15 ++++
docs/swagger.json | 15 ++++
docs/swagger.yaml | 10 +++
i18n/af_ZA.yaml | 4 +-
i18n/ar_SA.yaml | 4 +-
i18n/az_AZ.yaml | 4 +-
i18n/bal_BA.yaml | 4 +-
i18n/ban_ID.yaml | 4 +-
i18n/bn_BD.yaml | 4 +-
i18n/bs_BA.yaml | 4 +-
i18n/ca_ES.yaml | 4 +-
i18n/cs_CZ.yaml | 49 ++++++++---
i18n/cy_GB.yaml | 49 ++++++++---
i18n/da_DK.yaml | 49 ++++++++---
i18n/de_DE.yaml | 115 ++++++++++++++++---------
i18n/el_GR.yaml | 4 +-
i18n/en_US.yaml | 23 ++---
i18n/es_ES.yaml | 78 +++++++++--------
i18n/fa_IR.yaml | 47 ++++++++--
i18n/fi_FI.yaml | 4 +-
i18n/fr_FR.yaml | 47 ++++++++--
i18n/he_IL.yaml | 4 +-
i18n/hu_HU.yaml | 4 +-
i18n/hy_AM.yaml | 4 +-
i18n/id_ID.yaml | 47 ++++++++--
i18n/it_IT.yaml | 49 ++++++++---
i18n/ja_JP.yaml | 49 ++++++++---
i18n/ko_KR.yaml | 51 ++++++++---
i18n/nl_NL.yaml | 4 +-
i18n/no_NO.yaml | 4 +-
i18n/pl_PL.yaml | 47 ++++++++--
i18n/pt_PT.yaml | 49 ++++++++---
i18n/ro_RO.yaml | 4 +-
i18n/ru_RU.yaml | 47 ++++++++--
i18n/sk_SK.yaml | 47 ++++++++--
i18n/sq_AL.yaml | 4 +-
i18n/sr_SP.yaml | 4 +-
i18n/sv_SE.yaml | 4 +-
i18n/tr_TR.yaml | 49 ++++++++---
i18n/uk_UA.yaml | 49 ++++++++---
i18n/vi_VN.yaml | 49 ++++++++---
i18n/zh_CN.yaml | 53 ++++++++----
i18n/zh_TW.yaml | 49 ++++++++---
internal/controller/question_controller.go | 4 +-
internal/migrations/migrations.go | 2 +-
ui/.prettierrc.json | 2 +-
ui/pnpm-lock.yaml | 17 ++++
ui/src/common/constants.ts | 2 +
ui/src/hooks/useTagModal/index.tsx | 7 +-
ui/src/pages/Questions/Ask/index.tsx | 2 +
ui/src/pages/Questions/EditAnswer/index.tsx | 1 +
ui/src/pages/Tags/Create/index.tsx | 60 +++++++++++++
ui/src/pages/Tags/Edit/index.tsx | 74 ++++++++++++++--
ui/src/pages/Users/Logout/index.tsx | 19 ++++
ui/src/utils/common.ts | 38 ++++----
63 files changed, 1121 insertions(+), 375 deletions(-)