1
0
mirror of https://github.com/owncloud/ocis.git synced 2026-10-23 23:29:02 +03:00
Commit Graph

13 Commits

Author SHA1 Message Date
Lukas Hirt
9568b738b5 fix(web): [OCISDEV-1243] admin-uploaded logo overrides theme-specific logo (#12847)
A theme can define its own logo per UI variant under
clients.web.themes[].logo, including the built-in "owncloud" theme, most
of whose variants (dark, high contrast, ...) already do this. The admin
logo upload endpoint only ever patched clients.web.defaults.logo, so the
active theme's own per-variant logo kept winning over a logo an admin
explicitly uploaded through the admin settings web app.

Force the branding (admin-uploaded) logo onto every theme variant's own
logo entries after the theme merge, so it always takes precedence.

Signed-off-by: Lukas Hirt <info@hirt.cz>
2026-08-26 06:39:29 +00:00
Roman Perekhod
b3e7a64afc chore: [OCISDEV-154] Clean up the unified roles label 2025-07-08 10:15:33 +02:00
Lukas Hirt
80f8bc1a5f feat: add SpaceEditorWithoutTrashbin role
Added a new built-in role: `SpaceEditorWithoutTrashbin`.
This role is a subset of the `SpaceEditor` role, but it does not have list/restore resources in trashbin permissions.
2025-06-10 08:40:36 +02:00
Julian Koberg
b979844791 feat(ocis): adjust reva imports
Signed-off-by: Julian Koberg <jkoberg@MBP-Julian-Koberg.local>
2025-03-05 11:14:44 +01:00
Bastian Beier
8cbaf071fa feat: Add roles EditorListGrantsWithVersions, FileEditorListGrantsWithVersions 2025-02-06 14:26:35 +01:00
Michael Barz
bac2256c5f fix: fix deny access to prevent a regression 2024-11-25 11:32:31 +01:00
Florian Schade
3a4c0f33ea fix: ocm share update 2024-09-11 15:34:08 +02:00
Roman Perekhod
d3e8eb34df [full-ci] Added a new roles viewer/editor with ListGrants 2024-09-02 11:33:18 +02:00
Roman Perekhod
6319d986eb [full-ci] Added a new role space editor without versions 2024-08-29 14:20:35 +02:00
Jörn Friedrich Dreyer
966b4e1422 allow querying federated sharing roles
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
2024-08-12 11:29:39 +02:00
Jörn Friedrich Dreyer
c3c6085f2b drop sjson dependency
Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
2024-07-18 12:06:25 +02:00
Thomas Müller
1453f904e3 chore: code cleanup services/web (#9034)
* chore: code cleanup services/web

* fix: export private member to keep the test external

* chore: backport changes

---------

Co-authored-by: Florian Schade <f.schade@icloud.com>
2024-06-04 12:28:49 +02:00
Florian Schade
eb7c36443f enhancement: introduce theme processing (#9133)
* enhancement: introduce theme processing

* enhancement: introduce theme processing

* enhancement: add theme processing tests and changelog

* Update services/web/pkg/config/config.go

Co-authored-by: Michael Barz <michael.barz@zeitgestalten.eu>

* fix: ci findings

* Apply suggestions from code review

Co-authored-by: Martin <github@diemattels.at>

* enhancement: use the theme assets from web instead of having them inside the oCis repo (license clash Apache vs. AGPLv3)

* fix: golangci tagalign order

* fix: rename UnifiedRoleUploader to UnifiedRoleEditorLite

* fix: some typos

Co-authored-by: Michael Barz <michael.barz@zeitgestalten.eu>

* enhancement: export supported theme logo upload filetypes

* chore: bump reva

* fix: allow init func

---------

Co-authored-by: Michael Barz <michael.barz@zeitgestalten.eu>
Co-authored-by: Martin <github@diemattels.at>
2024-05-29 15:48:49 +02:00