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/01/17 02:37:17 UTC
(incubator-answer) branch test updated (5ee1ebd1 -> 90bce89e)
This is an automated email from the ASF dual-hosted git repository.
linkinstar pushed a change to branch test
in repository https://gitbox.apache.org/repos/asf/incubator-answer.git
from 5ee1ebd1 Merge branch 'feat/1.2.5/theme' into test
add e51f438e developing
add 7259915d add custome privilege
add 7fc70332 add validation for privilege fields
add fdca1b97 add default custom privilige option
add b743c1d2 fix hardcoded value
add a9849334 update
add 640690a5 update
add 4375964e resolve comments
new 90bce89e Merge remote-tracking branch 'origin/dev' into test
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 | 3 ++
internal/base/constant/privilege.go | 2 +-
internal/base/reason/privilege.go | 7 +--
internal/schema/siteinfo_schema.go | 15 ++++++-
internal/service/siteinfo/siteinfo_service.go | 53 +++++++++++++++++++---
ui/src/common/constants.ts | 1 +
ui/src/pages/Admin/Privileges/index.tsx | 63 ++++++++++++++++++++++++---
ui/src/services/admin/settings.ts | 15 +++++--
8 files changed, 136 insertions(+), 23 deletions(-)
(incubator-answer) 01/01: Merge remote-tracking branch 'origin/dev' into test
Posted by li...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
linkinstar pushed a commit to branch test
in repository https://gitbox.apache.org/repos/asf/incubator-answer.git
commit 90bce89e049a1be5233a8ef452fe9ee3ac87a9ba
Merge: 5ee1ebd1 4375964e
Author: LinkinStars <li...@foxmail.com>
AuthorDate: Wed Jan 17 10:37:05 2024 +0800
Merge remote-tracking branch 'origin/dev' into test
# Conflicts:
# ui/src/common/constants.ts
i18n/en_US.yaml | 3 ++
internal/base/constant/privilege.go | 2 +-
internal/base/reason/privilege.go | 7 +--
internal/schema/siteinfo_schema.go | 15 ++++++-
internal/service/siteinfo/siteinfo_service.go | 53 +++++++++++++++++++---
ui/src/common/constants.ts | 1 +
ui/src/pages/Admin/Privileges/index.tsx | 63 ++++++++++++++++++++++++---
ui/src/services/admin/settings.ts | 15 +++++--
8 files changed, 136 insertions(+), 23 deletions(-)
diff --cc ui/src/common/constants.ts
index c0fad641,fa5e95fd..373e41d2
--- a/ui/src/common/constants.ts
+++ b/ui/src/common/constants.ts
@@@ -28,7 -28,7 +28,8 @@@ export const DRAFT_QUESTION_STORAGE_KE
export const DRAFT_ANSWER_STORAGE_KEY = '_a_da_';
export const DRAFT_TIMESIGH_STORAGE_KEY = '|_a_t_s_|';
export const QUESTIONS_ORDER_STORAGE_KEY = '_a_qok_';
+export const DEFAULT_THEME = 'system';
+ export const ADMIN_PRIVILEGE_CUSTOM_LEVEL = 99;
export const USER_AGENT_NAMES = {
SegmentFault: 'SegmentFault',