diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index f9bcfafa675..ab768a00462 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -62,7 +62,7 @@ updates:
day: saturday
time: "03:00"
timezone: Europe/Paris
- target-branch: stable22
+ target-branch: stable23
labels:
- "3. to review"
- "feature: dependencies"
@@ -73,24 +73,6 @@ updates:
- dependency-name: "*"
update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]
-- package-ecosystem: npm
- directory: "/"
- schedule:
- interval: weekly
- day: saturday
- time: "03:00"
- timezone: Europe/Paris
- target-branch: stable23
- labels:
- - "3. to review"
- - "feature: dependencies"
- reviewers:
- - "nextcloud/server-dependabot"
- ignore:
- # ignore all GitHub linguist patch updates
- - dependency-name: "*"
- update-types: ["version-update:semver-major", "version-update:semver-minor"]
-
- package-ecosystem: npm
directory: "/"
schedule:
@@ -107,7 +89,25 @@ updates:
ignore:
# ignore all GitHub linguist patch updates
- dependency-name: "*"
- update-types: ["version-update:semver-major", "version-update:semver-minor"]
+ update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]
+
+- package-ecosystem: npm
+ directory: "/"
+ schedule:
+ interval: weekly
+ day: saturday
+ time: "03:00"
+ timezone: Europe/Paris
+ target-branch: stable25
+ labels:
+ - "3. to review"
+ - "feature: dependencies"
+ reviewers:
+ - "nextcloud/server-dependabot"
+ ignore:
+ # ignore all GitHub linguist patch updates
+ - dependency-name: "*"
+ update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]
# Testing StableXX composer
- package-ecosystem: composer
@@ -117,7 +117,7 @@ updates:
day: saturday
time: "03:00"
timezone: Europe/Paris
- target-branch: stable22
+ target-branch: stable23
labels:
- "3. to review"
- "feature: dependencies"
@@ -128,24 +128,6 @@ updates:
- dependency-name: "*"
update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]
-- package-ecosystem: composer
- directory: "/build/integration"
- schedule:
- interval: weekly
- day: saturday
- time: "03:00"
- timezone: Europe/Paris
- target-branch: stable23
- labels:
- - "3. to review"
- - "feature: dependencies"
- reviewers:
- - "nextcloud/server-dependabot"
- ignore:
- # ignore all GitHub linguist patch updates
- - dependency-name: "*"
- update-types: ["version-update:semver-major", "version-update:semver-minor"]
-
- package-ecosystem: composer
directory: "/build/integration"
schedule:
@@ -162,4 +144,22 @@ updates:
ignore:
# ignore all GitHub linguist patch updates
- dependency-name: "*"
- update-types: ["version-update:semver-major", "version-update:semver-minor"]
+ update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]
+
+- package-ecosystem: composer
+ directory: "/build/integration"
+ schedule:
+ interval: weekly
+ day: saturday
+ time: "03:00"
+ timezone: Europe/Paris
+ target-branch: stable25
+ labels:
+ - "3. to review"
+ - "feature: dependencies"
+ reviewers:
+ - "nextcloud/server-dependabot"
+ ignore:
+ # ignore all GitHub linguist patch updates
+ - dependency-name: "*"
+ update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"]
diff --git a/apps/admin_audit/appinfo/info.xml b/apps/admin_audit/appinfo/info.xml
index a11d058452d..beba1171e18 100644
--- a/apps/admin_audit/appinfo/info.xml
+++ b/apps/admin_audit/appinfo/info.xml
@@ -5,7 +5,7 @@
Auditing / Logging
Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.
Provides logging abilities for Nextcloud such as logging file accesses or otherwise sensitive actions.
- 1.15.0
+ 1.16.0
agpl
Nextcloud
AdminAudit
@@ -15,7 +15,7 @@
monitoring
https://github.com/nextcloud/server/issues
-
+
OCA\AdminAudit\BackgroundJobs\Rotate
diff --git a/apps/cloud_federation_api/appinfo/info.xml b/apps/cloud_federation_api/appinfo/info.xml
index 5511f082376..4699ff655b8 100644
--- a/apps/cloud_federation_api/appinfo/info.xml
+++ b/apps/cloud_federation_api/appinfo/info.xml
@@ -5,7 +5,7 @@
Cloud Federation API
Enable clouds to communicate with each other and exchange data
The Cloud Federation API enables various Nextcloud instances to communicate with each other and to exchange data.
- 1.8.0
+ 1.9.0
agpl
Bjoern Schiessle
CloudFederationAPI
@@ -15,6 +15,6 @@
files
https://github.com/nextcloud/cloud_federation/issues
-
+
diff --git a/apps/comments/appinfo/info.xml b/apps/comments/appinfo/info.xml
index 70a1695b923..5802d44403c 100644
--- a/apps/comments/appinfo/info.xml
+++ b/apps/comments/appinfo/info.xml
@@ -5,7 +5,7 @@
Comments
Files app plugin to add comments to files
Files app plugin to add comments to files
- 1.15.0
+ 1.16.0
agpl
Arthur Schiwon
Vincent Petry
@@ -16,7 +16,7 @@
social
https://github.com/nextcloud/server/issues
-
+
diff --git a/apps/contactsinteraction/appinfo/info.xml b/apps/contactsinteraction/appinfo/info.xml
index 2f52ff2c030..91dd209a68f 100644
--- a/apps/contactsinteraction/appinfo/info.xml
+++ b/apps/contactsinteraction/appinfo/info.xml
@@ -5,7 +5,7 @@
Contacts Interaction
Manages interaction between users and contacts
Collect data about user and contacts interactions and provide an address book for the data
- 1.6.0
+ 1.7.0
agpl
Christoph Wurst
Nextcloud Groupware Team
@@ -17,7 +17,7 @@
social
https://github.com/nextcloud/server/issues
-
+
OCA\ContactsInteraction\BackgroundJob\CleanupJob
diff --git a/apps/dashboard/appinfo/info.xml b/apps/dashboard/appinfo/info.xml
index 5969c5d1dee..8f27a63a2f3 100644
--- a/apps/dashboard/appinfo/info.xml
+++ b/apps/dashboard/appinfo/info.xml
@@ -10,7 +10,7 @@ The Nextcloud Dashboard is your starting point of the day, giving you an
overview of your upcoming appointments, urgent emails, chat messages,
incoming tickets, latest tweets and much more! Users can add the widgets
they like and change the background to their liking.]]>
- 7.5.0
+ 7.6.0
agpl
Julius Härtl
Dashboard
@@ -20,7 +20,7 @@ they like and change the background to their liking.]]>
https://github.com/nextcloud/server/issues
-
+
diff --git a/apps/dav/appinfo/info.xml b/apps/dav/appinfo/info.xml
index 02fbe970c47..134481018a0 100644
--- a/apps/dav/appinfo/info.xml
+++ b/apps/dav/appinfo/info.xml
@@ -5,7 +5,7 @@
WebDAV
WebDAV endpoint
WebDAV endpoint
- 1.24.0
+ 1.25.0
agpl
owncloud.org
DAV
@@ -15,7 +15,7 @@
integration
https://github.com/nextcloud/server/issues
-
+
diff --git a/apps/encryption/appinfo/info.xml b/apps/encryption/appinfo/info.xml
index ca03c51fc2b..03d443b1d2d 100644
--- a/apps/encryption/appinfo/info.xml
+++ b/apps/encryption/appinfo/info.xml
@@ -14,7 +14,7 @@
Please read the documentation to know all implications before you decide
to enable server-side encryption.
- 2.13.0
+ 2.14.0
agpl
Bjoern Schiessle
Clark Tomlinson
@@ -31,7 +31,7 @@
openssl
-
+
diff --git a/apps/federatedfilesharing/appinfo/info.xml b/apps/federatedfilesharing/appinfo/info.xml
index 1e71de0fa66..4ee872951f8 100644
--- a/apps/federatedfilesharing/appinfo/info.xml
+++ b/apps/federatedfilesharing/appinfo/info.xml
@@ -5,7 +5,7 @@
Federated file sharing
Provide federated file sharing across servers
Provide federated file sharing across servers
- 1.15.0
+ 1.16.0
agpl
Bjoern Schiessle
Roeland Jago Douma
@@ -15,7 +15,7 @@
https://github.com/nextcloud/server/issues
-
+
diff --git a/apps/federation/appinfo/info.xml b/apps/federation/appinfo/info.xml
index 263ffad2092..636833ed5f2 100644
--- a/apps/federation/appinfo/info.xml
+++ b/apps/federation/appinfo/info.xml
@@ -5,7 +5,7 @@
Federation
Federation allows you to connect with other trusted servers to exchange the user directory.
Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.
- 1.15.0
+ 1.16.0
agpl
Bjoern Schiessle
Federation
@@ -17,7 +17,7 @@
https://github.com/nextcloud/server/issues
-
+
diff --git a/apps/files/appinfo/info.xml b/apps/files/appinfo/info.xml
index 6c8c043cd2c..ac7e9a2fa8e 100644
--- a/apps/files/appinfo/info.xml
+++ b/apps/files/appinfo/info.xml
@@ -5,7 +5,7 @@
Files
File Management
File Management
- 1.20.0
+ 1.21.0
agpl
Robin Appelman
Vincent Petry
@@ -18,7 +18,7 @@
files
https://github.com/nextcloud/server/issues
-
+
diff --git a/apps/files_external/appinfo/info.xml b/apps/files_external/appinfo/info.xml
index 0efa5fc43b9..9e9024806db 100644
--- a/apps/files_external/appinfo/info.xml
+++ b/apps/files_external/appinfo/info.xml
@@ -9,7 +9,7 @@ This application enables administrators to configure connections to external sto
External storage can be configured using the GUI or at the command line. This second option provides the advanced user with more flexibility for configuring bulk external storage mounts and setting mount priorities. More information is available in the external storage GUI documentation and the external storage Configuration File documentation.
- 1.17.0
+ 1.18.0
agpl
Robin Appelman
Michael Gapczynski
@@ -28,7 +28,7 @@ External storage can be configured using the GUI or at the command line. This se
https://github.com/nextcloud/server/issues
-
+
diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml
index 66c49d6eeb6..3b375bbf87a 100644
--- a/apps/files_sharing/appinfo/info.xml
+++ b/apps/files_sharing/appinfo/info.xml
@@ -9,7 +9,7 @@
Turning the feature off removes shared files and folders on the server for all share recipients, and also on the sync clients and mobile apps. More information is available in the Nextcloud Documentation.
- 1.17.0
+ 1.18.0
agpl
Michael Gapczynski
Bjoern Schiessle
@@ -22,7 +22,7 @@ Turning the feature off removes shared files and folders on the server for all s
social
https://github.com/nextcloud/server/issues
-
+
diff --git a/apps/files_trashbin/appinfo/info.xml b/apps/files_trashbin/appinfo/info.xml
index f63953ade9b..1e7b5e1849e 100644
--- a/apps/files_trashbin/appinfo/info.xml
+++ b/apps/files_trashbin/appinfo/info.xml
@@ -9,7 +9,7 @@ This application enables users to restore files that were deleted from the syste
To prevent a user from running out of disk space, the Deleted files app will not utilize more than 50% of the currently available free quota for deleted files. If the deleted files exceed this limit, the app deletes the oldest files until it gets below this limit. More information is available in the Deleted Files documentation.
- 1.15.0
+ 1.16.0
agpl
Bjoern Schiessle
Files_Trashbin
@@ -23,7 +23,7 @@ To prevent a user from running out of disk space, the Deleted files app will not
files
https://github.com/nextcloud/server/issues
-
+
diff --git a/apps/files_versions/appinfo/info.xml b/apps/files_versions/appinfo/info.xml
index bdd699d620c..d40a16c023b 100644
--- a/apps/files_versions/appinfo/info.xml
+++ b/apps/files_versions/appinfo/info.xml
@@ -8,7 +8,7 @@
This application automatically maintains older versions of files that are changed. When enabled, a hidden versions folder is provisioned in every user's directory and is used to store old file versions. A user can revert to an older version through the web interface at any time, with the replaced file becoming a version. The app automatically manages the versions folder to ensure the user does not run out of Quota because of versions.
In addition to the expiry of versions, the versions app makes certain never to use more than 50% of the user's currently available free space. If stored versions exceed this limit, the app will delete the oldest versions first until it meets this limit. More information is available in the Versions documentation.
- 1.18.0
+ 1.19.0
agpl
Frank Karlitschek
Bjoern Schiessle
@@ -23,7 +23,7 @@
files
https://github.com/nextcloud/server/issues
-
+
diff --git a/apps/lookup_server_connector/appinfo/info.xml b/apps/lookup_server_connector/appinfo/info.xml
index 5cc54c7e9f2..dd0fb04f543 100644
--- a/apps/lookup_server_connector/appinfo/info.xml
+++ b/apps/lookup_server_connector/appinfo/info.xml
@@ -5,7 +5,7 @@
Lookup Server Connector
Sync public user information with the lookup server
Sync public user information with the lookup server
- 1.13.0
+ 1.14.0
agpl
Bjoern Schiessle
LookupServerConnector
@@ -16,6 +16,6 @@
social
https://github.com/nextcloud/server/issues
-
+
diff --git a/apps/oauth2/appinfo/info.xml b/apps/oauth2/appinfo/info.xml
index 6eed9b9d18e..c9a2d460450 100644
--- a/apps/oauth2/appinfo/info.xml
+++ b/apps/oauth2/appinfo/info.xml
@@ -5,7 +5,7 @@
OAuth 2.0
Allows OAuth2 compatible authentication from other web applications.
The OAuth2 app allows administrators to configure the built-in authentication workflow to also allow OAuth2 compatible authentication from other web applications.
- 1.13.0
+ 1.14.0
agpl
Lukas Reschke
OAuth2
@@ -16,7 +16,7 @@
integration
https://github.com/nextcloud/server/issues
-
+
diff --git a/apps/provisioning_api/appinfo/info.xml b/apps/provisioning_api/appinfo/info.xml
index 56dc6e610d4..19d019128f5 100644
--- a/apps/provisioning_api/appinfo/info.xml
+++ b/apps/provisioning_api/appinfo/info.xml
@@ -13,7 +13,7 @@
listed above. More information is available in the Provisioning API documentation, including example calls
and server responses.
- 1.15.0
+ 1.16.0
agpl
Tom Needham
Provisioning_API
@@ -26,6 +26,6 @@
integration
https://github.com/nextcloud/server/issues
-
+
diff --git a/apps/settings/appinfo/info.xml b/apps/settings/appinfo/info.xml
index f030c1e5c50..37083481ada 100644
--- a/apps/settings/appinfo/info.xml
+++ b/apps/settings/appinfo/info.xml
@@ -5,7 +5,7 @@
Nextcloud settings
Nextcloud settings
Nextcloud settings
- 1.7.0
+ 1.8.0
agpl
Nextcloud
Settings
@@ -13,7 +13,7 @@
customization
https://github.com/nextcloud/server/issues
-
+
diff --git a/apps/sharebymail/appinfo/info.xml b/apps/sharebymail/appinfo/info.xml
index 70458f44d19..38e2091d2b7 100644
--- a/apps/sharebymail/appinfo/info.xml
+++ b/apps/sharebymail/appinfo/info.xml
@@ -5,7 +5,7 @@
Share by mail
Share provider which allows you to share files by mail
Share provider which allows you to share files by mail
- 1.15.0
+ 1.16.0
agpl
Bjoern Schiessle
ShareByMail
@@ -16,7 +16,7 @@
social
https://github.com/nextcloud/server/issues
-
+
diff --git a/apps/systemtags/appinfo/info.xml b/apps/systemtags/appinfo/info.xml
index 1f572a831d6..ff598b1de74 100644
--- a/apps/systemtags/appinfo/info.xml
+++ b/apps/systemtags/appinfo/info.xml
@@ -6,7 +6,7 @@
Collaborative tagging functionality which shares tags among users.
Collaborative tagging functionality which shares tags among users. Great for teams.
(If you are a provider with a multi-tenancy installation, it is advised to deactivate this app as tags are shared.)
- 1.15.0
+ 1.16.0
agpl
Vincent Petry
Joas Schilling
@@ -18,7 +18,7 @@
organization
https://github.com/nextcloud/server/issues
-
+
OCA\SystemTags\Settings\Admin
diff --git a/apps/testing/appinfo/info.xml b/apps/testing/appinfo/info.xml
index 63418708ba9..2fd528b9015 100644
--- a/apps/testing/appinfo/info.xml
+++ b/apps/testing/appinfo/info.xml
@@ -5,7 +5,7 @@
QA testing
This app is only for testing! It is dangerous to have it enabled in a live instance
This app is only for testing! It is dangerous to have it enabled in a live instance
- 1.15.0
+ 1.16.0
agpl
Joas Schilling
@@ -14,6 +14,6 @@
monitoring
https://github.com/nextcloud/server/issues
-
+
diff --git a/apps/theming/appinfo/info.xml b/apps/theming/appinfo/info.xml
index 6823a9fbd88..fcdaade0fd5 100644
--- a/apps/theming/appinfo/info.xml
+++ b/apps/theming/appinfo/info.xml
@@ -5,7 +5,7 @@
Theming
Adjust the Nextcloud theme
Adjust the Nextcloud theme
- 2.0.0
+ 2.1.0
agpl
Nextcloud
Theming
@@ -17,7 +17,7 @@
customization
https://github.com/nextcloud/server/issues
-
+
diff --git a/apps/twofactor_backupcodes/appinfo/info.xml b/apps/twofactor_backupcodes/appinfo/info.xml
index bda0c18e3ed..6cc963e0b32 100644
--- a/apps/twofactor_backupcodes/appinfo/info.xml
+++ b/apps/twofactor_backupcodes/appinfo/info.xml
@@ -5,7 +5,7 @@
Two factor backup codes
A two-factor auth backup codes provider
A two-factor auth backup codes provider
- 1.14.0
+ 1.15.0
agpl
Christoph Wurst
TwoFactorBackupCodes
@@ -13,7 +13,7 @@
security
https://github.com/nextcloud/server/issues
-
+
diff --git a/apps/updatenotification/appinfo/info.xml b/apps/updatenotification/appinfo/info.xml
index 626316f04aa..e19de0345d9 100644
--- a/apps/updatenotification/appinfo/info.xml
+++ b/apps/updatenotification/appinfo/info.xml
@@ -5,14 +5,14 @@
Update notification
Displays update notifications for Nextcloud and provides the SSO for the updater.
Displays update notifications for Nextcloud and provides the SSO for the updater.
- 1.15.0
+ 1.16.0
agpl
Lukas Reschke
UpdateNotification
monitoring
https://github.com/nextcloud/server/issues
-
+
diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml
index 803b2645705..2f4cb7f2eed 100644
--- a/apps/user_ldap/appinfo/info.xml
+++ b/apps/user_ldap/appinfo/info.xml
@@ -9,7 +9,7 @@
A user logs into Nextcloud with their LDAP or AD credentials, and is granted access based on an authentication request handled by the LDAP or AD server. Nextcloud does not store LDAP or AD passwords, rather these credentials are used to authenticate a user and then Nextcloud uses a session for the user ID. More information is available in the LDAP User and Group Backend documentation.
- 1.15.0
+ 1.16.0
agpl
Dominik Schmidt
Arthur Schiwon
@@ -24,7 +24,7 @@ A user logs into Nextcloud with their LDAP or AD credentials, and is granted acc
https://github.com/nextcloud/server/issues
ldap
-
+
diff --git a/apps/user_status/appinfo/info.xml b/apps/user_status/appinfo/info.xml
index 23f07eb325a..e10723da887 100644
--- a/apps/user_status/appinfo/info.xml
+++ b/apps/user_status/appinfo/info.xml
@@ -5,7 +5,7 @@
User status
User status
- 1.5.0
+ 1.6.0
agpl
Georg Ehrke
UserStatus
@@ -21,7 +21,7 @@
-
+
OCA\UserStatus\BackgroundJob\ClearOldStatusesBackgroundJob
diff --git a/apps/weather_status/appinfo/info.xml b/apps/weather_status/appinfo/info.xml
index 403d5eb3e5d..e88a9e1f802 100644
--- a/apps/weather_status/appinfo/info.xml
+++ b/apps/weather_status/appinfo/info.xml
@@ -7,7 +7,7 @@
- 1.5.0
+ 1.6.0
agpl
Julien Veyssier
WeatherStatus
@@ -15,6 +15,6 @@
dashboard
https://github.com/nextcloud/server
-
+
diff --git a/apps/workflowengine/appinfo/info.xml b/apps/workflowengine/appinfo/info.xml
index 6ec8b4d06fa..0ec29afd388 100644
--- a/apps/workflowengine/appinfo/info.xml
+++ b/apps/workflowengine/appinfo/info.xml
@@ -5,7 +5,7 @@
Nextcloud workflow engine
Nextcloud workflow engine
Nextcloud workflow engine
- 2.7.0
+ 2.8.0
agpl
Arthur Schiwon
Julius Härtl
@@ -22,7 +22,7 @@
https://github.com/nextcloud/server.git
-
+
diff --git a/version.php b/version.php
index 687333edf6f..05812defb33 100644
--- a/version.php
+++ b/version.php
@@ -30,10 +30,10 @@
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
// when updating major/minor version number.
-$OC_Version = [25, 0, 0, 12];
+$OC_Version = [26, 0, 0, 0];
// The human readable string
-$OC_VersionString = '25.0.0 beta 7';
+$OC_VersionString = '26.0.0 dev';
$OC_VersionCanBeUpgradedFrom = [
'nextcloud' => [