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 be8098a4 Merge branch 'dev' into test
add 1dd7a8d7 Merge branch 'dev' into feat/1.4.3/ui
add 7a15e24f feat: add a copy button to the code block #1211
new 9d829ff6 fix: 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:
i18n/en_US.yaml | 4 ++
i18n/zh_CN.yaml | 3 ++
ui/src/components/Editor/Viewer.tsx | 7 ++-
ui/src/components/Editor/utils/index.ts | 58 +++++++++++++++++++++-
ui/src/index.scss | 21 ++++++++
ui/src/pages/Legal/Privacy/index.tsx | 5 +-
ui/src/pages/Legal/Tos/index.tsx | 5 +-
.../Questions/Detail/components/Answer/index.tsx | 9 +++-
.../Questions/Detail/components/Question/index.tsx | 5 +-
ui/src/pages/Questions/EditAnswer/index.tsx | 5 +-
.../pages/Review/components/FlagContent/index.tsx | 5 +-
.../Review/components/QueuedContent/index.tsx | 5 +-
ui/src/pages/Tags/Info/index.tsx | 5 +-
13 files changed, 126 insertions(+), 11 deletions(-)