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.

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

Merge back Release 10.13.1 #40975

Merged
merged 8 commits into from Sep 11, 2023
Merged

Merge back Release 10.13.1 #40975

merged 8 commits into from Sep 11, 2023

Conversation

phil-davis
Copy link
Contributor

Description

Merge release-10.13.1 changes back to master

Related Issue

https://github.com/owncloud/enterprise/issues/5996

How Has This Been Tested?

CI

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Database schema changes (next release will require increase of minor version instead of patch)
  • Breaking change (fix or feature that would cause existing functionality to change)
  • Technical debt
  • Tests only (no source changes)

Checklist:

  • Code changes
  • Unit tests added
  • Acceptance tests added
  • Documentation ticket raised:
  • Changelog item, see TEMPLATE

jnweiger and others added 6 commits August 31, 2023 11:24
branched from master,
 - taking 5 small well understood easily testable fixes (for php8 forward compatibility)
 - but before #40961 gets merged to master.
* Revamped the onlyoffice.png in gimp: cleaner and smaller PNG, ugly checkerboard background removed. (It was actually a 200k jpeg)
Replaced wopi.png with the logo found at github.com/OfficeDev/PnP-WOPI (it was a copy of the onlyoffic jpeg)

* added transparent round corners to the new icons.
drawio.png and richdocuments.png already have transparency.
@owncloud owncloud deleted a comment from update-docs bot Sep 7, 2023
Copy link
Contributor

@jnweiger jnweiger left a comment

Choose a reason for hiding this comment

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

Thanks to all!
Done!

@phil-davis
Copy link
Contributor Author

@jnweiger CI is failing in this PR (and all core PRs) because the Windows SMB server seems to be down, and so the unit test pipeline that runs with SMB storage fails:
https://drone.owncloud.com/owncloud/core/39048/23/7

Who can fix that?

@jnweiger
Copy link
Contributor

We have a deja-vu of:
#40570 (comment)

The machine is wnd.testlab.owncloud.works t used to live in our hetzner QA project.
that is a fragile setup, as we regularly have to kill old machines in this project.
We need to find a more peaceful place.
I am afraid the machine got destroyed. Checking with @GeraldLeikam

In the meantime I'll force commit this merge back, so that we get the releasenotes updated.

@jnweiger jnweiger merged commit 930a72a into master Sep 11, 2023
1 of 2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants