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 0e9d36f6bc61a039f418cbbeebe7ab2cbf4fb322
Merge: 2cc7b333 6ae18901
Author: LinkinStars <[email protected]>
AuthorDate: Mon Dec 9 14:44:41 2024 +0800

    Merge branch 'main' into dev
    
    # Conflicts:
    #       i18n/zh_CN.yaml
    #       ui/template/homepage.html
    #       ui/template/sort-btns.html

 Makefile                                           |   13 +-
 README.md                                          |   14 +-
 cmd/main.go                                        |    2 +-
 cmd/wire_gen.go                                    |    2 +-
 docs/docs.go                                       |   49 +-
 ...SE-golang-mock.txt => LICENSE-uber-go-mock.txt} |    0
 docs/swagger.json                                  |   49 +-
 docs/swagger.yaml                                  |   31 +
 go.mod                                             |    2 +-
 go.sum                                             |   11 +-
 i18n/cs_CZ.yaml                                    |  510 ++---
 i18n/cy_GB.yaml                                    |   56 +-
 i18n/da_DK.yaml                                    |   56 +-
 i18n/de_DE.yaml                                    |   56 +-
 i18n/en_US.yaml                                    |   37 +-
 i18n/es_ES.yaml                                    |   56 +-
 i18n/fa_IR.yaml                                    |   56 +-
 i18n/fr_FR.yaml                                    |   56 +-
 i18n/hi_IN.yaml                                    |   56 +-
 i18n/id_ID.yaml                                    |   56 +-
 i18n/it_IT.yaml                                    |   58 +-
 i18n/ja_JP.yaml                                    | 2188 ++++++++++----------
 i18n/ko_KR.yaml                                    |   56 +-
 i18n/ml_IN.yaml                                    |   40 +-
 i18n/pl_PL.yaml                                    |   74 +-
 i18n/pt_PT.yaml                                    |   76 +-
 i18n/ro_RO.yaml                                    |   62 +-
 i18n/ru_RU.yaml                                    |   58 +-
 i18n/sk_SK.yaml                                    |   56 +-
 i18n/sv_SE.yaml                                    |   70 +-
 i18n/te_IN.yaml                                    |   56 +-
 i18n/tr_TR.yaml                                    |   56 +-
 i18n/uk_UA.yaml                                    | 1196 +++++------
 i18n/vi_VN.yaml                                    |   56 +-
 i18n/zh_CN.yaml                                    |   57 +-
 i18n/zh_TW.yaml                                    |   66 +-
 internal/base/constant/site_info.go                |    6 +
 .../base/constant/upload.go                        |   33 +-
 internal/cli/build.go                              |    2 +-
 internal/controller/template_controller.go         |   12 +-
 internal/controller/upload_controller.go           |   11 +-
 internal/entity/question_entity.go                 |    1 +
 internal/migrations/init.go                        |    6 +-
 internal/migrations/migrations.go                  |    1 +
 internal/migrations/v24.go                         |   72 +
 internal/repo/question/question_repo.go            |   40 +
 internal/repo/review/review_repo.go                |   10 +
 internal/repo/search_common/search_repo.go         |   15 +-
 internal/router/static_router.go                   |   19 +-
 internal/schema/question_schema.go                 |    4 +-
 internal/schema/siteinfo_schema.go                 |   36 +-
 internal/service/content/question_service.go       |   12 +
 internal/service/mock/siteinfo_repo_mock.go        |   41 +-
 internal/service/question_common/question.go       |   23 +
 internal/service/review/review_service.go          |    1 +
 .../siteinfo_common/siteinfo_service_test.go       |    2 +-
 internal/service/uploader/upload.go                |  142 +-
 pkg/checker/file_type.go                           |   53 +-
 plugin/storage.go                                  |   24 +-
 ui/src/common/interface.ts                         |   10 +-
 ui/src/components/Editor/ToolBars/file.tsx         |  135 ++
 ui/src/components/Editor/ToolBars/heading.tsx      |    7 +-
 ui/src/components/Editor/ToolBars/image.tsx        |  118 +-
 ui/src/components/Editor/ToolBars/index.ts         |    2 +
 ui/src/components/Editor/index.scss                |   75 -
 ui/src/components/Editor/index.tsx                 |    2 +
 ui/src/components/Editor/toolItem.tsx              |    1 +
 ui/src/components/PluginRender/index.tsx           |    8 +-
 .../QueryGroup/index.scss}                         |   36 +-
 ui/src/components/QueryGroup/index.tsx             |  152 +-
 ui/src/components/QuestionList/index.tsx           |    5 +-
 ui/src/index.scss                                  |    1 +
 .../Admin/Answers/components/Action/index.tsx      |    9 +
 ui/src/pages/Admin/Badges/index.tsx                |    9 +
 .../Admin/Questions/components/Action/index.tsx    |   20 +-
 .../pages/Admin/Users/components/Action/index.tsx  |   13 +-
 ui/src/pages/Admin/Users/index.tsx                 |    6 +-
 ui/src/pages/Admin/Write/index.tsx                 |  161 +-
 ui/src/pages/Tags/Detail/index.tsx                 |    2 +-
 ui/src/stores/writeSetting.ts                      |    5 +
 ui/src/utils/guard.ts                              |    7 +-
 ui/template/homepage.html                          |   33 +-
 ui/template/sort-btns.html                         |   20 +
 83 files changed, 4285 insertions(+), 2511 deletions(-)

Reply via email to