Skip to content

Commit

Permalink
Merge pull request #9514 from 2403905/issue-9402-5.0-bakport
Browse files Browse the repository at this point in the history
fixed the notification service error when the user's display name con…
  • Loading branch information
2403905 committed Jul 10, 2024
1 parent c98678f commit f28aeb7
Show file tree
Hide file tree
Showing 85 changed files with 122 additions and 122 deletions.
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/messages/eventhistory/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.messages.eventhistory.v0"
url: /apis/grpc_apis/ocis_messages_eventhistory_v0
date: 2024-07-10T09:32:50Z
date: 2024-07-10T09:38:32Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/messages/policies/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.messages.policies.v0"
url: /apis/grpc_apis/ocis_messages_policies_v0
date: 2024-07-10T09:32:50Z
date: 2024-07-10T09:38:32Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/messages/search/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.messages.search.v0"
url: /apis/grpc_apis/ocis_messages_search_v0
date: 2024-07-10T09:32:50Z
date: 2024-07-10T09:38:32Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/messages/settings/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.messages.settings.v0"
url: /apis/grpc_apis/ocis_messages_settings_v0
date: 2024-07-10T09:32:50Z
date: 2024-07-10T09:38:32Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/messages/store/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.messages.store.v0"
url: /apis/grpc_apis/ocis_messages_store_v0
date: 2024-07-10T09:32:50Z
date: 2024-07-10T09:38:32Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/messages/thumbnails/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.messages.thumbnails.v0"
url: /apis/grpc_apis/ocis_messages_thumbnails_v0
date: 2024-07-10T09:32:50Z
date: 2024-07-10T09:38:32Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/services/eventhistory/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.services.eventhistory.v0"
url: /apis/grpc_apis/ocis_services_eventhistory_v0
date: 2024-07-10T09:32:50Z
date: 2024-07-10T09:38:33Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/services/policies/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.services.policies.v0"
url: /apis/grpc_apis/ocis_services_policies_v0
date: 2024-07-10T09:32:50Z
date: 2024-07-10T09:38:32Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/services/search/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.services.search.v0"
url: /apis/grpc_apis/ocis_services_search_v0
date: 2024-07-10T09:32:50Z
date: 2024-07-10T09:38:32Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/services/settings/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.services.settings.v0"
url: /apis/grpc_apis/ocis_services_settings_v0
date: 2024-07-10T09:32:50Z
date: 2024-07-10T09:38:32Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/services/store/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.services.store.v0"
url: /apis/grpc_apis/ocis_services_store_v0
date: 2024-07-10T09:32:50Z
date: 2024-07-10T09:38:32Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
2 changes: 1 addition & 1 deletion apis/grpc_apis/ocis/services/thumbnails/v0/grpc.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "ocis.services.thumbnails.v0"
url: /apis/grpc_apis/ocis_services_thumbnails_v0
date: 2024-07-10T09:32:50Z
date: 2024-07-10T09:38:32Z
weight: 50
geekdocRepo: https://github.com/owncloud/ocis
---
Expand Down
4 changes: 2 additions & 2 deletions services/_includes/adoc/antivirus_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2024-07-10-09-33-06]
[#deprecation-note-2024-07-10-09-38-51]
[caption=]
.Deprecation notes for the antivirus service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down Expand Up @@ -245,7 +245,7 @@ a| [subs=-attributes]
The socket clamav is running on. Note the default value is an example which needs adaption according your OS.

a|`ANTIVIRUS_ICAP_TIMEOUT` +
xref:deprecation-note-2024-07-10-09-33-06[Deprecation Note]
xref:deprecation-note-2024-07-10-09-38-51[Deprecation Note]
a| [subs=-attributes]
++int64 ++
a| [subs=-attributes]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/app-provider_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2024-07-10-09-33-06]
[#deprecation-note-2024-07-10-09-38-51]
[caption=]
.Deprecation notes for the app-provider service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/app-registry_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2024-07-10-09-33-06]
[#deprecation-note-2024-07-10-09-38-51]
[caption=]
.Deprecation notes for the app-registry service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/audit_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2024-07-10-09-33-06]
[#deprecation-note-2024-07-10-09-38-51]
[caption=]
.Deprecation notes for the audit service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/auth-basic_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2024-07-10-09-33-06]
[#deprecation-note-2024-07-10-09-38-51]
[caption=]
.Deprecation notes for the auth-basic service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/auth-bearer_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2024-07-10-09-33-06]
[#deprecation-note-2024-07-10-09-38-51]
[caption=]
.Deprecation notes for the auth-bearer service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/auth-machine_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2024-07-10-09-33-06]
[#deprecation-note-2024-07-10-09-38-51]
[caption=]
.Deprecation notes for the auth-machine service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/auth-service_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2024-07-10-09-33-06]
[#deprecation-note-2024-07-10-09-38-51]
[caption=]
.Deprecation notes for the auth-service service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/clientlog_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2024-07-10-09-33-06]
[#deprecation-note-2024-07-10-09-38-51]
[caption=]
.Deprecation notes for the clientlog service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/eventhistory_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2024-07-10-09-33-06]
[#deprecation-note-2024-07-10-09-38-51]
[caption=]
.Deprecation notes for the eventhistory service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
4 changes: 2 additions & 2 deletions services/_includes/adoc/frontend_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2024-07-10-09-33-06]
[#deprecation-note-2024-07-10-09-38-51]
[caption=]
.Deprecation notes for the frontend service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down Expand Up @@ -327,7 +327,7 @@ The default upload protocol to use in clients. Currently only 'tus' is avaliable

a|`OCIS_ENABLE_RESHARING` +
`FRONTEND_ENABLE_RESHARING` +
xref:deprecation-note-2024-07-10-09-33-06[Deprecation Note]
xref:deprecation-note-2024-07-10-09-38-51[Deprecation Note]
a| [subs=-attributes]
++bool ++
a| [subs=-attributes]
Expand Down
2 changes: 1 addition & 1 deletion services/_includes/adoc/gateway_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

ifeval::[{show-deprecation} == true]

[#deprecation-note-2024-07-10-09-33-06]
[#deprecation-note-2024-07-10-09-38-51]
[caption=]
.Deprecation notes for the gateway service
[width="100%",cols="~,~,~,~",options="header"]
Expand Down
38 changes: 19 additions & 19 deletions services/_includes/adoc/global_configvars.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ a| [subs=-attributes]
++false ++

a| [subs=-attributes]
The default role assignments the demo users should be setup.
Flag to enable or disable the creation of the demo users.
a| `OCIS_ADMIN_USER_ID`

a| [subs=attributes+]
Expand Down Expand Up @@ -278,7 +278,7 @@ a| [subs=-attributes]
++[]string ++

a| [subs=-attributes]
++[Authorization Origin Content-Type Accept X-Requested-With X-Request-Id Cache-Control] ++
++[Authorization Origin Content-Type Accept X-Requested-With X-Request-Id Ocs-Apirequest] ++

a| [subs=-attributes]
A list of allowed CORS headers. See following chapter for more details: *Access-Control-Request-Headers* at \https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Request-Headers. See the Environment Variable Types description for more details.
Expand All @@ -303,7 +303,7 @@ a| [subs=-attributes]
++[]string ++

a| [subs=-attributes]
++[GET POST PUT PATCH DELETE OPTIONS] ++
++[GET] ++

a| [subs=-attributes]
A list of allowed CORS methods. See following chapter for more details: *Access-Control-Request-Method* at \https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Access-Control-Request-Method. See the Environment Variable Types description for more details.
Expand Down Expand Up @@ -388,7 +388,7 @@ a| [subs=-attributes]
++false ++

a| [subs=-attributes]
Set this option to 'true' to disable rendering of thumbnails triggered via webdav access. Note that when disabled, all access to preview related webdav paths will return a 404.
Set this option to 'true' to disable previews in all the different web file listing views. This can speed up file listings in folders with many files. The only list view that is not affected by this setting is the trash bin, as it does not allow previewing at all.
a| `OCIS_EDITION`

a| [subs=attributes+]
Expand Down Expand Up @@ -443,7 +443,7 @@ a| [subs=-attributes]
++ ++

a| [subs=-attributes]
Password for the events broker.
The password to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services.
a| `OCIS_EVENTS_AUTH_USERNAME`

a| [subs=attributes+]
Expand All @@ -469,7 +469,7 @@ a| [subs=-attributes]
++ ++

a| [subs=-attributes]
Username for the events broker.
The username to authenticate with the events broker. The events broker is the ocis service which receives and delivers events between the services.
a| `OCIS_EVENTS_CLUSTER`

a| [subs=attributes+]
Expand Down Expand Up @@ -573,7 +573,7 @@ a| [subs=-attributes]
++ ++

a| [subs=-attributes]
The root CA certificate used to validate the server's TLS certificate. If provided SHARING_EVENTS_TLS_INSECURE will be seen as false.
The root CA certificate used to validate the server's TLS certificate. If provided POSTPROCESSING_EVENTS_TLS_INSECURE will be seen as false.
a| `OCIS_GATEWAY_GRPC_ADDR`

a| [subs=attributes+]
Expand Down Expand Up @@ -757,7 +757,7 @@ a| [subs=-attributes]
++false ++

a| [subs=-attributes]
Allow insecure connections to the OIDC issuer.
Whether the ocis server should skip the client certificate verification during the TLS handshake.
a| `OCIS_JWT_SECRET`

a| [subs=attributes+]
Expand Down Expand Up @@ -822,7 +822,7 @@ a| [subs=-attributes]
++ ++

a| [subs=-attributes]
The client ID to authenticate with keycloak.
The client id to authenticate with keycloak.
a| `OCIS_KEYCLOAK_CLIENT_REALM`

a| [subs=attributes+]
Expand Down Expand Up @@ -959,7 +959,7 @@ a| [subs=-attributes]
++attribute ++

a| [subs=-attributes]
An option to control the behavior for disabling users. Valid options are 'none', 'attribute' and 'group'. If set to 'group', disabling a user via API will add the user to the configured group for disabled users, if set to 'attribute' this will be done in the ldap user entry, if set to 'none' the disable request is not processed.
An option to control the behavior for disabling users. Supported options are 'none', 'attribute' and 'group'. If set to 'group', disabling a user via API will add the user to the configured group for disabled users, if set to 'attribute' this will be done in the ldap user entry, if set to 'none' the disable request is not processed. Default is 'attribute'.
a| `OCIS_LDAP_GROUP_BASE_DN`

a| [subs=attributes+]
Expand Down Expand Up @@ -1198,7 +1198,7 @@ a| [subs=-attributes]
++ownCloudUserEnabled ++

a| [subs=-attributes]
LDAP attribute to use as a flag telling if the user is enabled or disabled.
LDAP Attribute to use as a flag telling if the user is enabled or disabled.
a| `OCIS_LDAP_USER_FILTER`

a| [subs=attributes+]
Expand Down Expand Up @@ -1701,7 +1701,7 @@ a| [subs=-attributes]
++string ++

a| [subs=-attributes]
++memory ++
++nats-js-kv ++

a| [subs=-attributes]
The type of the store. Supported values are: 'memory', 'ocmem', 'etcd', 'redis', 'redis-sentinel', 'nats-js', 'noop'. See the text description for details.
Expand Down Expand Up @@ -1746,7 +1746,7 @@ a| [subs=-attributes]
++[]string ++

a| [subs=-attributes]
++[] ++
++[127.0.0.1:9233] ++

a| [subs=-attributes]
A list of nodes to access the configured store. This has no effect when 'memory' or 'ocmem' stores are configured. Note that the behaviour how nodes are used is dependent on the library of the configured store. See the Environment Variable Types description for more details.
Expand Down Expand Up @@ -1776,10 +1776,10 @@ a| [subs=-attributes]
++Duration ++

a| [subs=-attributes]
++336h0m0s ++
++0s ++

a| [subs=-attributes]
Time to live for events in the store. Defaults to '336h' (2 weeks). See the Environment Variable Types description for more details.
Time to live for events in the store. See the Environment Variable Types description for more details.
a| `OCIS_REVA_GATEWAY`

a| [subs=attributes+]
Expand Down Expand Up @@ -1904,7 +1904,7 @@ a| [subs=-attributes]
++0 ++

a| [subs=-attributes]
Set a global max quota for spaces in bytes. A value of 0 equals unlimited. If not using the global OCIS_SPACES_MAX_QUOTA, you must define the FRONTEND_MAX_QUOTA in the frontend service.
Set the global max quota value in bytes. A value of 0 equals unlimited. The value is provided via capabilities.
a| `OCIS_SYSTEM_USER_API_KEY`

a| [subs=attributes+]
Expand Down Expand Up @@ -2179,7 +2179,7 @@ a| [subs=-attributes]
++ ++

a| [subs=-attributes]
The storage transfer secret.
Transfer secret for signing file up- and download requests.
a| `OCIS_TRANSLATION_PATH`

a| [subs=attributes+]
Expand Down Expand Up @@ -2220,10 +2220,10 @@ a| [subs=-attributes]
++string ++

a| [subs=-attributes]
++https://localhost:9200/ ++
++https://localhost:9200 ++

a| [subs=-attributes]
Base url to navigate back from the app to the containing folder in the file list.
The identity provider value to set in the group IDs of the CS3 group objects for groups returned by this group provider.
a| `STORAGE_USERS_ASYNC_PROPAGATOR_PROPAGATION_DELAY`

a| [subs=attributes+]
Expand Down
Loading

0 comments on commit f28aeb7

Please sign in to comment.