Merge back Release 10.13.1 (#40975)

* prepare 10.13.1 branched from master, - taking 5 small well understood easily testable fixes (for php8 forward compatibility) - but before #40961 gets merged to master. * Improve images (#40963) * 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. * fix: disallow pre-signed url access if the signing key is not initialized * bump Changelog * bump version.php for final * prepare merge back. * prepare merge back, using 10.13.2 prealpha ... --------- Co-authored-by: Juergen Weigert <jnweiger@gmail.com> Co-authored-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com>
owncloud · Sep 11, 2023 · 930a72a · 930a72a
1 parent f321f14
commit 930a72a
Show file tree

Hide file tree

Showing 13 changed files with 3 additions and 3 deletions.
diff --git a/changelog/unreleased/40943 → changelog/10.13.1_2023-09-04/40943 b/changelog/unreleased/40943 → changelog/10.13.1_2023-09-04/40943
diff --git a/changelog/unreleased/40944 → changelog/10.13.1_2023-09-04/40944 b/changelog/unreleased/40944 → changelog/10.13.1_2023-09-04/40944
diff --git a/changelog/unreleased/40945 → changelog/10.13.1_2023-09-04/40945 b/changelog/unreleased/40945 → changelog/10.13.1_2023-09-04/40945
diff --git a/changelog/unreleased/40947 → changelog/10.13.1_2023-09-04/40947 b/changelog/unreleased/40947 → changelog/10.13.1_2023-09-04/40947
diff --git a/changelog/unreleased/40955 → changelog/10.13.1_2023-09-04/40955 b/changelog/unreleased/40955 → changelog/10.13.1_2023-09-04/40955
diff --git a/changelog/unreleased/40958 → changelog/10.13.1_2023-09-04/40958 b/changelog/unreleased/40958 → changelog/10.13.1_2023-09-04/40958
diff --git a/changelog/unreleased/40962 → changelog/10.13.1_2023-09-04/40962 b/changelog/unreleased/40962 → changelog/10.13.1_2023-09-04/40962
diff --git a/changelog/unreleased/40969 → changelog/10.13.1_2023-09-04/40969 b/changelog/unreleased/40969 → changelog/10.13.1_2023-09-04/40969
diff --git a/.../unreleased/PHPdependencies20230822onward → ..._2023-09-04/PHPdependencies20230822onward b/.../unreleased/PHPdependencies20230822onward → ..._2023-09-04/PHPdependencies20230822onward
diff --git a/core/img/app-registry/onlyoffice.png b/core/img/app-registry/onlyoffice.png
diff --git a/core/img/app-registry/wopi.png b/core/img/app-registry/wopi.png
diff --git a/sonar-project.properties b/sonar-project.properties
@@ -1,7 +1,7 @@
 # Organization and project keys are displayed in the right sidebar of the project homepage
 sonar.organization=owncloud-1
 sonar.projectKey=owncloud_core
-sonar.projectVersion=10.13.0
+sonar.projectVersion=10.13.1
 sonar.host.url=https://sonarcloud.io
 
 # =====================================================

diff --git a/version.php b/version.php
@@ -25,10 +25,10 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = [10, 13, 1, 0];
+$OC_Version = [10, 13, 2, 0];
 
 // The human-readable string
-$OC_VersionString = '10.13.1 prealpha';
+$OC_VersionString = '10.13.2 prealpha';
 
 $OC_VersionCanBeUpgradedFrom = [[8, 2, 11],[9, 0, 9],[9, 1]];