mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-12 19:27:32 +00:00
Merge branch 'refs/heads/main' into next
# Conflicts: # cmd/start/start.go # docs/sidebars.js # internal/api/grpc/action/v3alpha/execution_integration_test.go # internal/api/grpc/action/v3alpha/query_integration_test.go # internal/api/grpc/action/v3alpha/target_integration_test.go # internal/api/grpc/feature/v2beta/converter.go # internal/api/grpc/feature/v2beta/converter_test.go # internal/api/grpc/oidc/v2beta/oidc.go # internal/api/grpc/resources/action/v3alpha/server_integration_test.go # internal/api/grpc/settings/v2beta/server.go # internal/api/grpc/user/v2/query_integration_test.go # internal/api/grpc/user/v2beta/query.go # internal/api/grpc/user/v2beta/query_integration_test.go # internal/auth/repository/eventsourcing/eventstore/auth_request_test.go # internal/command/user_idp_link_test.go # internal/crypto/crypto.go # internal/integration/assert.go # internal/integration/client.go # proto/zitadel/action/v3alpha/target.proto # proto/zitadel/feature/v2/instance.proto # proto/zitadel/org/v2/org_service.proto # proto/zitadel/resources/action/v3alpha/action_service.proto # proto/zitadel/resources/action/v3alpha/execution.proto # proto/zitadel/resources/action/v3alpha/query.proto # proto/zitadel/user/v2/user_service.proto
This commit is contained in:
@@ -496,6 +496,7 @@ Errors:
|
||||
SQLStatement: 无法创建 SQL 语句
|
||||
InvalidRequest: 请求无效
|
||||
TooManyNestingLevels: 查询嵌套级别过多(最多 20 个)
|
||||
LimitExceeded: 限制已超出
|
||||
Quota:
|
||||
AlreadyExists: 这个单位的配额已经存在
|
||||
NotFound: 没有找到该单位的配额
|
||||
@@ -564,6 +565,8 @@ Errors:
|
||||
NotFound: 未找到执行
|
||||
IncludeNotFound: 包括未找到的内容
|
||||
NoTargets: 没有定义目标
|
||||
Failed: 执行失败
|
||||
ResponseIsNotValidJSON: 响应不是有效的 JSON
|
||||
UserSchema:
|
||||
NotEnabled: 未启用“用户架构”功能
|
||||
Type:
|
||||
@@ -585,6 +588,13 @@ Errors:
|
||||
NotForAPI: API 不允许使用模拟令牌
|
||||
Impersonation:
|
||||
PolicyDisabled: 实例安全策略中禁用模拟
|
||||
WebKey:
|
||||
ActiveDelete: 无法删除活动 Web 密钥
|
||||
Config: 无效的 Web 密钥配置
|
||||
Duplicate: Web 密钥 ID 不唯一
|
||||
FeatureDisabled: Web 密钥功能已禁用
|
||||
NoActive: 未找到活动 Web 密钥
|
||||
NotFound: 未找到 Web 密钥
|
||||
|
||||
AggregateTypes:
|
||||
action: 动作
|
||||
@@ -608,6 +618,7 @@ AggregateTypes:
|
||||
restrictions: 限制
|
||||
system: 系统
|
||||
session: 会话
|
||||
web_key: Web 密钥
|
||||
|
||||
EventTypes:
|
||||
execution:
|
||||
@@ -1174,12 +1185,6 @@ EventTypes:
|
||||
deactivated: 停用动作
|
||||
reactivated: 启用动作
|
||||
removed: 删除动作
|
||||
user_schema:
|
||||
created: 已创建用户架构
|
||||
updated: 用户架构已更新
|
||||
deactivated: 用户架构已停用
|
||||
reactivated: 用户架构已重新激活
|
||||
deleted: 用户架构已删除
|
||||
instance:
|
||||
added: 实例已添加
|
||||
changed: 实例已更改
|
||||
@@ -1308,6 +1313,17 @@ EventTypes:
|
||||
password:
|
||||
changed: SMTP 配置密码已更改
|
||||
removed: SMTP 配置已删除
|
||||
user_schema:
|
||||
created: 已创建用户架构
|
||||
updated: 用户架构已更新
|
||||
deactivated: 用户架构已停用
|
||||
reactivated: 用户架构已重新激活
|
||||
deleted: 用户架构已删除
|
||||
web_key:
|
||||
added: 已添加 Web Key
|
||||
activated: 已激活 Web Key
|
||||
deactivated: 已停用 Web Key
|
||||
removed: 已删除 Web Key
|
||||
|
||||
Application:
|
||||
OIDC:
|
||||
|
Reference in New Issue
Block a user