diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 5008dd6c22795..e70f3e1e0f6ef 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -64,7 +64,7 @@ updates: day: saturday time: "03:00" timezone: Europe/Paris - target-branch: stable24 + target-branch: stable25 labels: - "3. to review" - "feature: dependencies" @@ -74,6 +74,8 @@ updates: # ignore all GitHub linguist patch updates - dependency-name: "*" update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"] + # Disable automatic rebasing because without a build CI will likely fail anyway + rebase-strategy: "disabled" - package-ecosystem: npm directory: "/" @@ -82,7 +84,7 @@ updates: day: saturday time: "03:00" timezone: Europe/Paris - target-branch: stable25 + target-branch: stable26 labels: - "3. to review" - "feature: dependencies" @@ -92,6 +94,8 @@ updates: # ignore all GitHub linguist patch updates - dependency-name: "*" update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"] + # Disable automatic rebasing because without a build CI will likely fail anyway + rebase-strategy: "disabled" - package-ecosystem: npm directory: "/" @@ -100,7 +104,7 @@ updates: day: saturday time: "03:00" timezone: Europe/Paris - target-branch: stable26 + target-branch: stable27 labels: - "3. to review" - "feature: dependencies" @@ -110,6 +114,8 @@ updates: # ignore all GitHub linguist patch updates - dependency-name: "*" update-types: ["version-update:semver-major", "version-update:semver-minor", "version-update:semver-patch"] + # Disable automatic rebasing because without a build CI will likely fail anyway + rebase-strategy: "disabled" # Testing StableXX composer - package-ecosystem: composer @@ -119,7 +125,7 @@ updates: day: saturday time: "03:00" timezone: Europe/Paris - target-branch: stable24 + target-branch: stable25 labels: - "3. to review" - "feature: dependencies" @@ -137,7 +143,25 @@ updates: day: saturday time: "03:00" timezone: Europe/Paris - target-branch: stable25 + target-branch: stable26 + 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"] + +- package-ecosystem: composer + directory: "/build/integration" + schedule: + interval: weekly + day: saturday + time: "03:00" + timezone: Europe/Paris + target-branch: stable27 labels: - "3. to review" - "feature: dependencies" diff --git a/.github/workflows/update-cacert-bundle.yml b/.github/workflows/update-cacert-bundle.yml index f599ae62ef16f..e2fefc195f414 100644 --- a/.github/workflows/update-cacert-bundle.yml +++ b/.github/workflows/update-cacert-bundle.yml @@ -12,7 +12,7 @@ jobs: strategy: fail-fast: false matrix: - branches: ["master", "stable26", "stable25", "stable24", "stable23", "stable22"] + branches: ["master", "stable27", "stable26", "stable25", "stable24", "stable23", "stable22"] name: update-ca-certificate-bundle-${{ matrix.branches }} diff --git a/.github/workflows/update-psalm-baseline.yml b/.github/workflows/update-psalm-baseline.yml index 6f70d2ff97809..20056b456315c 100644 --- a/.github/workflows/update-psalm-baseline.yml +++ b/.github/workflows/update-psalm-baseline.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - branches: ["master", "stable26", "stable25", "stable24", "stable23"] + branches: ["master", "stable27", "stable26", "stable25"] name: update-psalm-baseline-${{ matrix.branches }} diff --git a/apps/admin_audit/appinfo/info.xml b/apps/admin_audit/appinfo/info.xml index fbef7ddbfda8b..d9e1eaf9e537b 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.17.0 + 1.18.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 8cd6b7bba702e..f9ca8185dcf55 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.10.0 + 1.11.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 35734c40e993c..62768b84027d1 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.17.0 + 1.18.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 883e2e7b62228..0adbc9a6219ea 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.8.0 + 1.9.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 6c43c310557cc..8f11a253e24bf 100644 --- a/apps/dashboard/appinfo/info.xml +++ b/apps/dashboard/appinfo/info.xml @@ -8,7 +8,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.7.0 + 7.8.0 agpl Julius Härtl Dashboard @@ -18,7 +18,7 @@ The Nextcloud Dashboard is your starting point of the day, giving you an overvie https://github.com/nextcloud/server/issues - + diff --git a/apps/dav/appinfo/info.xml b/apps/dav/appinfo/info.xml index 9140c6747160f..bc3e73aa7186a 100644 --- a/apps/dav/appinfo/info.xml +++ b/apps/dav/appinfo/info.xml @@ -5,7 +5,7 @@ WebDAV WebDAV endpoint WebDAV endpoint - 1.27.0 + 1.28.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 de7ba7f078331..5e40022b821fc 100644 --- a/apps/encryption/appinfo/info.xml +++ b/apps/encryption/appinfo/info.xml @@ -9,7 +9,7 @@ In order to use this encryption module you need to enable server-side encryption The module will not touch existing files, only new files will be encrypted after server-side encryption was enabled. It is also not possible to disable the encryption again and switch back to an unencrypted system. Please read the documentation to know all implications before you decide to enable server-side encryption. - 2.15.0 + 2.16.0 agpl Bjoern Schiessle Clark Tomlinson @@ -26,7 +26,7 @@ Please read the documentation to know all implications before you decide to enab openssl - + diff --git a/apps/federatedfilesharing/appinfo/info.xml b/apps/federatedfilesharing/appinfo/info.xml index 158b099fc724d..33c75816d0788 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.17.0 + 1.18.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 0dc4c3cef5896..b9fd70c5f85d6 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.17.0 + 1.18.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 5d9e630704dae..29f0a3d5ba5b7 100644 --- a/apps/files/appinfo/info.xml +++ b/apps/files/appinfo/info.xml @@ -5,7 +5,7 @@ Files File Management File Management - 1.22.0 + 1.23.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 a3b5034388f72..b99a20b0c3fee 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.19.0 + 1.20.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 1ba21de712c3a..72a2ed7c13848 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.19.0 + 1.20.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 58a6aa322c698..f651eb46b91ae 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.17.0 + 1.18.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 b0dbdb7a26c79..babb64033d284 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.20.0 + 1.21.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 ee1b44f1cdeef..cabc801bd0638 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.15.0 + 1.16.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 86505e3867b75..e45168da6e9bd 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.15.0 + 1.16.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 ea812200842f1..b46ba246de7e0 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.17.0 + 1.18.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 7864405e292bd..92d2928cd31a4 100644 --- a/apps/settings/appinfo/info.xml +++ b/apps/settings/appinfo/info.xml @@ -5,7 +5,7 @@ Nextcloud settings Nextcloud settings Nextcloud settings - 1.9.0 + 1.10.0 agpl Nextcloud Settings @@ -13,7 +13,7 @@ customization https://github.com/nextcloud/server/issues - + diff --git a/apps/settings/lib/WellKnown/SecurityTxtHandler.php b/apps/settings/lib/WellKnown/SecurityTxtHandler.php index e245c6f028f4c..e401ba0a0a1f3 100644 --- a/apps/settings/lib/WellKnown/SecurityTxtHandler.php +++ b/apps/settings/lib/WellKnown/SecurityTxtHandler.php @@ -38,7 +38,7 @@ public function handle(string $service, IRequestContext $context, ?IResponse $pr } $response = "Contact: https://hackerone.com/nextcloud -Expires: 2023-08-31T23:00:00.000Z +Expires: 2023-12-31T23:00:00.000Z Acknowledgments: https://hackerone.com/nextcloud/thanks Acknowledgments: https://github.com/nextcloud/security-advisories/security/advisories Policy: https://hackerone.com/nextcloud diff --git a/apps/sharebymail/appinfo/info.xml b/apps/sharebymail/appinfo/info.xml index 3ad8c19517d1f..f78e00b0bfb93 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.17.0 + 1.18.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 4ab3d9a05e314..1b0f28aebab6c 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.17.0 + 1.18.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 cd0b4f37deaee..091e2513667a9 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.17.0 + 1.18.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 09e7d70012ebc..8ad8cd5e8a939 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.2.0 + 2.3.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 15ea8661a83b5..762a8bc25fd0c 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.16.0 + 1.17.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 06d15ac451e79..4b8a47ffd454a 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.17.0 + 1.18.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 a1b5cf28758c8..20f439148e185 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.17.0 + 1.18.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 ea3de2bbe3372..ee9f4a46781f3 100644 --- a/apps/user_status/appinfo/info.xml +++ b/apps/user_status/appinfo/info.xml @@ -5,7 +5,7 @@ User status User status - 1.7.0 + 1.8.0 agpl Georg Ehrke UserStatus @@ -20,7 +20,7 @@ - + OCA\UserStatus\BackgroundJob\ClearOldStatusesBackgroundJob diff --git a/apps/weather_status/appinfo/info.xml b/apps/weather_status/appinfo/info.xml index 85f3703ecba3b..14f2a51afe371 100644 --- a/apps/weather_status/appinfo/info.xml +++ b/apps/weather_status/appinfo/info.xml @@ -7,7 +7,7 @@ - 1.7.0 + 1.8.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 2c6b44eaa4f9d..7029267140014 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.9.0 + 2.10.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 09522d9aadca5..5f477bf58b956 100644 --- a/version.php +++ b/version.php @@ -30,15 +30,15 @@ // between betas, final and RCs. This is _not_ the public version number. Reset minor/patch level // when updating major/minor version number. -$OC_Version = [27, 0, 0, 3]; +$OC_Version = [28, 0, 0, 0]; // The human-readable string -$OC_VersionString = '27.0.0 beta 2'; +$OC_VersionString = '28.0.0 dev'; $OC_VersionCanBeUpgradedFrom = [ 'nextcloud' => [ - '26.0' => true, '27.0' => true, + '28.0' => true, ], 'owncloud' => [ '10.11' => true,