Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Branding api #5559

Merged
merged 10 commits into from
Feb 13, 2023
Merged

Branding api #5559

merged 10 commits into from
Feb 13, 2023

Conversation

C0rby
Copy link
Contributor

@C0rby C0rby commented Feb 13, 2023 •
edited
Loading

New endpoints for the custom logo upload and reset.
The static files are served by the web service.

When the user uploads a logo the backend also updates the theme.json to include the new logo path.
The files are stored under the WEB_ASSET_PATH which defaults to $OCIS_BASE_DATA_PATH/web/assets.

@C0rby C0rby self-assigned this Feb 13, 2023
@update-docs
Copy link

update-docs bot commented Feb 13, 2023

Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a changelog item based on your changes.

@ownclouders
Copy link
Contributor

ownclouders commented Feb 13, 2023 •
edited
Loading

💥 Acceptance test wopiValidatorTests-ocis failed. Further test are cancelled...

David Christofas added 3 commits February 13, 2023 13:48
add a permission check to the logo upload
7c17ddb
add logo reset endpoint
45d1ba2 
when resetting the logo we are falling back to the embedded logo asset
add changelog
b318269
@mmattel
Copy link
Contributor

mmattel commented Feb 13, 2023 •
edited
Loading

@C0rby I know that there is no readme.md currently present and I am not asking for a full blown one - but would you mind adding one and just dump down the changes you just made. We would then have at least a startingpoint and things wont be forgotten if we polish that readme with more content later on 😅 🙏

@butonic @mmattel
Update services/web/pkg/config/config.go
e0753c2 
Co-authored-by: Martin <github@diemattels.at>
@C0rby
Copy link
Contributor Author

C0rby commented Feb 13, 2023

@mmattel, I'll add the readme in another PR to not bloat this one. 👍

micbar
micbar approved these changes Feb 13, 2023
View reviewed changes
Copy link
Contributor

@micbar micbar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@mmattel
Copy link
Contributor

mmattel commented Feb 13, 2023

I'll add the readme in another PR to not bloat this one

I hear your words 👍
Can you check that the default value gets added as I have posted in the suggestable commit?

@C0rby
Copy link
Contributor Author

C0rby commented Feb 13, 2023

Can you check that the default value gets added as I have posted in the suggestable commit?

The default value is here: https://github.com/owncloud/ocis/pull/5559/files#diff-a1bba8d1ace694b6b8a7c869be805bbfd6b0a3b140738fecfadcfdcd4dd47bf9R38. The config doc generator will take it from there or am I missing something?

@C0rby
Copy link
Contributor Author

C0rby commented Feb 13, 2023 •
edited
Loading

The wopiserver fails to start for some reason... or rather it doesn't even seem to start it...
https://drone.owncloud.com/owncloud/ocis/19058/40/5
https://drone.owncloud.com/owncloud/ocis/19058/40/6

@mmattel
Copy link
Contributor

mmattel commented Feb 13, 2023 •
edited
Loading

The default value is here

Sorry, I missed that 🙈
I had a typo in searching the ip:port and realized it too late 🤦‍♂️

@kulmann kulmann mentioned this pull request Feb 13, 2023
Closed
@sonarcloud
Copy link

sonarcloud bot commented Feb 13, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

0.0% 0.0% Coverage
1.9% 1.9% Duplication

@kulmann kulmann mentioned this pull request Feb 13, 2023
Merged
@micbar micbar merged commit 2b04573 into master Feb 13, 2023
@delete-merged-branch delete-merged-branch bot deleted the branding-api branch February 13, 2023 21:30
ownclouders pushed a commit that referenced this pull request Feb 13, 2023
@micbar
commit 2b04573
9c3899e 
Merge: 8fb9914 2323410
Author: Michael Barz <mbarz@owncloud.com>
Date:   Mon Feb 13 22:30:09 2023 +0100

    Merge pull request #5559 from owncloud/branding-api

    Branding api
@mmattel mmattel mentioned this pull request Feb 15, 2023
Merged
@micbar micbar mentioned this pull request May 3, 2023
Closed
89 tasks
@ScharfViktor ScharfViktor mentioned this pull request May 4, 2023
Closed
86 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mmattel mmattel mmattel left review comments

@butonic butonic butonic approved these changes

@micbar micbar micbar approved these changes

@kulmann kulmann Awaiting requested review from kulmann kulmann is a code owner

@lookacat lookacat Awaiting requested review from lookacat

@kobergj kobergj Awaiting requested review from kobergj

@wkloucek wkloucek Awaiting requested review from wkloucek wkloucek is a code owner

@phil-davis phil-davis Awaiting requested review from phil-davis phil-davis is a code owner

@individual-it individual-it Awaiting requested review from individual-it individual-it is a code owner

Assignees

@C0rby C0rby

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@C0rby @ownclouders @mmattel @butonic @micbar