From 699731bb967cbc6cd8d3134c40dba198dde72299 Mon Sep 17 00:00:00 2001
From: Elizabeth Danzberger <elizabeth@elzody.dev>
Date: Wed, 1 Oct 2025 15:21:50 +0200
Subject: [PATCH 1/2] chore(release): bump version

Signed-off-by: Elizabeth Danzberger <elizabeth@elzody.dev>
---
 appinfo/info.xml  |  2 +-
 appinfo/info.xml~ | 51 +++++++++++++++++++++++++++++++++++++++++++++++
 package-lock.json |  4 ++--
 package.json      |  2 +-
 4 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 appinfo/info.xml~

diff --git a/appinfo/info.xml b/appinfo/info.xml
index eeb277b5c6..f3f1a64625 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -6,7 +6,7 @@
 	<description><![CDATA[This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.
 
 You can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.]]></description>
-	<version>8.4.12</version>
+	<version>8.4.13</version>
 	<licence>agpl</licence>
 	<author>Collabora Productivity based on work of Frank Karlitschek, Victor Dubiniuk</author>
 	<types>
diff --git a/appinfo/info.xml~ b/appinfo/info.xml~
new file mode 100644
index 0000000000..f3f1a64625
--- /dev/null
+++ b/appinfo/info.xml~
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<info>
+	<id>richdocuments</id>
+	<name>Nextcloud Office</name>
+	<summary>Edit office documents directly in your browser.</summary>
+	<description><![CDATA[This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.
+
+You can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.]]></description>
+	<version>8.4.13</version>
+	<licence>agpl</licence>
+	<author>Collabora Productivity based on work of Frank Karlitschek, Victor Dubiniuk</author>
+	<types>
+		<prevent_group_restriction/>
+	</types>
+	<documentation>
+		<user>https://nextcloud.com/collaboraonline/</user>
+		<admin>https://github.com/nextcloud/richdocuments/wiki</admin>
+	</documentation>
+	<category>office</category>
+	<category>integration</category>
+	<website>https://collaboraoffice.com/</website>
+	<bugs>https://github.com/nextcloud/richdocuments/issues</bugs>
+	<repository type="git">https://github.com/nextcloud/richdocuments.git</repository>
+	<screenshot>https://github.com/nextcloud/richdocuments/raw/main/screenshots/Nextcloud-writer.png</screenshot>
+	<screenshot>https://github.com/nextcloud/richdocuments/raw/main/screenshots/Nextcloud-spreadsheet.png</screenshot>
+	<screenshot>https://github.com/nextcloud/richdocuments/raw/main/screenshots/Nextcloud-presentation.png</screenshot>
+	<dependencies>
+		<nextcloud min-version="29" max-version="29"/>
+	</dependencies>
+	<background-jobs>
+		<job>OCA\Richdocuments\Backgroundjobs\ObtainCapabilities</job>
+		<job>OCA\Richdocuments\Backgroundjobs\Cleanup</job>
+	</background-jobs>
+	<repair-steps>
+		<install>
+			<step>OCA\Richdocuments\Migration\InstallDefaultFonts</step>
+		</install>
+	</repair-steps>
+	<commands>
+		<command>OCA\Richdocuments\Command\ActivateConfig</command>
+		<command>OCA\Richdocuments\Command\ConvertToBigInt</command>
+		<command>OCA\Richdocuments\Command\UpdateEmptyTemplates</command>
+		<command>OCA\Richdocuments\Command\InstallDefaultFonts</command>
+	</commands>
+	<settings>
+		<admin>OCA\Richdocuments\Settings\Admin</admin>
+		<admin-section>OCA\Richdocuments\Settings\Section</admin-section>
+		<personal>OCA\Richdocuments\Settings\Personal</personal>
+		<personal-section>OCA\Richdocuments\Settings\Section</personal-section>
+	</settings>
+</info>
diff --git a/package-lock.json b/package-lock.json
index 3e8e3d3731..9c09d78363 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "richdocuments",
-  "version": "8.4.12",
+  "version": "8.4.13",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "richdocuments",
-      "version": "8.4.12",
+      "version": "8.4.13",
       "license": "AGPL-3.0-or-later",
       "dependencies": {
         "@nextcloud/auth": "^2.4.0",
diff --git a/package.json b/package.json
index 6529763a85..1ca01fe358 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "richdocuments",
   "description": "Collabora online integration",
-  "version": "8.4.12",
+  "version": "8.4.13",
   "authors": [
     {
       "name": "Julius Härtl",

From 0c765ad7e91653952cd0130a30392b060de99d77 Mon Sep 17 00:00:00 2001
From: Elizabeth Danzberger <elizabeth@elzody.dev>
Date: Wed, 1 Oct 2025 15:26:43 +0200
Subject: [PATCH 2/2] chore(release): update changelog

Signed-off-by: Elizabeth Danzberger <elizabeth@elzody.dev>
---
 CHANGELOG.md      | 13 ++++++++++++
 appinfo/info.xml~ | 51 -----------------------------------------------
 2 files changed, 13 insertions(+), 51 deletions(-)
 delete mode 100644 appinfo/info.xml~

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84cf4dfe36..6c975b4e58 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,18 @@
 # Changelog
 
+## 8.4.13
+
+### Fixed
+- Apply proper default timezone for watermarks by @juliusknorr in [#5055](https://github.com/nextcloud/richdocuments/pull/5055)
+- Guest users inherit edit_group by @elzody in [#4838](https://github.com/nextcloud/richdocuments/pull/4838)
+- Shares allow document creation only for users that can edit by @tanyaka in [#4828](https://github.com/nextcloud/richdocuments/pull/4828)
+- Ensure edit permissions are checked before template file token generation by @printminion-co in [#4799](https://github.com/nextcloud/richdocuments/pull/4799)
+
+### Other
+- NPM audits
+- Dependency updates
+
+
 ## 8.4.12
 
 ### Added
diff --git a/appinfo/info.xml~ b/appinfo/info.xml~
deleted file mode 100644
index f3f1a64625..0000000000
--- a/appinfo/info.xml~
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<info>
-	<id>richdocuments</id>
-	<name>Nextcloud Office</name>
-	<summary>Edit office documents directly in your browser.</summary>
-	<description><![CDATA[This application can connect to a Collabora Online (or other) server (WOPI-like Client). Nextcloud is the WOPI Host. Please read the documentation to learn more about that.
-
-You can also edit your documents off-line with the Collabora Office app from the **[Android](https://play.google.com/store/apps/details?id=com.collabora.libreoffice)** and **[iOS](https://apps.apple.com/us/app/collabora-office/id1440482071)** store.]]></description>
-	<version>8.4.13</version>
-	<licence>agpl</licence>
-	<author>Collabora Productivity based on work of Frank Karlitschek, Victor Dubiniuk</author>
-	<types>
-		<prevent_group_restriction/>
-	</types>
-	<documentation>
-		<user>https://nextcloud.com/collaboraonline/</user>
-		<admin>https://github.com/nextcloud/richdocuments/wiki</admin>
-	</documentation>
-	<category>office</category>
-	<category>integration</category>
-	<website>https://collaboraoffice.com/</website>
-	<bugs>https://github.com/nextcloud/richdocuments/issues</bugs>
-	<repository type="git">https://github.com/nextcloud/richdocuments.git</repository>
-	<screenshot>https://github.com/nextcloud/richdocuments/raw/main/screenshots/Nextcloud-writer.png</screenshot>
-	<screenshot>https://github.com/nextcloud/richdocuments/raw/main/screenshots/Nextcloud-spreadsheet.png</screenshot>
-	<screenshot>https://github.com/nextcloud/richdocuments/raw/main/screenshots/Nextcloud-presentation.png</screenshot>
-	<dependencies>
-		<nextcloud min-version="29" max-version="29"/>
-	</dependencies>
-	<background-jobs>
-		<job>OCA\Richdocuments\Backgroundjobs\ObtainCapabilities</job>
-		<job>OCA\Richdocuments\Backgroundjobs\Cleanup</job>
-	</background-jobs>
-	<repair-steps>
-		<install>
-			<step>OCA\Richdocuments\Migration\InstallDefaultFonts</step>
-		</install>
-	</repair-steps>
-	<commands>
-		<command>OCA\Richdocuments\Command\ActivateConfig</command>
-		<command>OCA\Richdocuments\Command\ConvertToBigInt</command>
-		<command>OCA\Richdocuments\Command\UpdateEmptyTemplates</command>
-		<command>OCA\Richdocuments\Command\InstallDefaultFonts</command>
-	</commands>
-	<settings>
-		<admin>OCA\Richdocuments\Settings\Admin</admin>
-		<admin-section>OCA\Richdocuments\Settings\Section</admin-section>
-		<personal>OCA\Richdocuments\Settings\Personal</personal>
-		<personal-section>OCA\Richdocuments\Settings\Section</personal-section>
-	</settings>
-</info>