Skip to content

Master is now 23 #27648

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.

Sign up for GitHub

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

Merged
nickvergessen merged 2 commits into from
Jun 24, 2021
Merged

Master is now 23 #27648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b0448d
Master is now 23
nickvergessen Jun 24, 2021
15e59a6
Update dependabot config too
nickvergessen Jun 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ updates:
day: saturday
time: "03:00"
timezone: Europe/Paris
target-branch: stable19
target-branch: stable20
labels:
- "3. to review"
- "feature: dependencies"
Expand All @@ -80,7 +80,7 @@ updates:
day: saturday
time: "03:00"
timezone: Europe/Paris
target-branch: stable20
target-branch: stable21
labels:
- "3. to review"
- "feature: dependencies"
Expand All @@ -98,7 +98,7 @@ updates:
day: saturday
time: "03:00"
timezone: Europe/Paris
target-branch: stable21
target-branch: stable22
labels:
- "3. to review"
- "feature: dependencies"
Expand All @@ -117,7 +117,7 @@ updates:
day: saturday
time: "03:00"
timezone: Europe/Paris
target-branch: stable19
target-branch: stable20
labels:
- "3. to review"
- "feature: dependencies"
Expand All @@ -135,7 +135,7 @@ updates:
day: saturday
time: "03:00"
timezone: Europe/Paris
target-branch: stable20
target-branch: stable21
labels:
- "3. to review"
- "feature: dependencies"
Expand All @@ -153,7 +153,7 @@ updates:
day: saturday
time: "03:00"
timezone: Europe/Paris
target-branch: stable21
target-branch: stable22
labels:
- "3. to review"
- "feature: dependencies"
Expand Down
2 changes: 1 addition & 1 deletion apps/accessibility/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<bugs>https://github.com/nextcloud/server/issues</bugs>

<dependencies>
<nextcloud min-version="22" max-version="22"/>
<nextcloud min-version="23" max-version="23"/>
</dependencies>

<repair-steps>
Expand Down
2 changes: 1 addition & 1 deletion apps/admin_audit/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<category>monitoring</category>
<bugs>https://github.com/nextcloud/server/issues</bugs>
<dependencies>
<nextcloud min-version="22" max-version="22"/>
<nextcloud min-version="23" max-version="23"/>
</dependencies>
<background-jobs>
<job>OCA\AdminAudit\BackgroundJobs\Rotate</job>
Expand Down
2 changes: 1 addition & 1 deletion apps/cloud_federation_api/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
<category>files</category>
<bugs>https://github.com/nextcloud/cloud_federation/issues</bugs>
<dependencies>
<nextcloud min-version="22" max-version="22"/>
<nextcloud min-version="23" max-version="23"/>
</dependencies>
</info>
2 changes: 1 addition & 1 deletion apps/comments/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<category>social</category>
<bugs>https://github.com/nextcloud/server/issues</bugs>
<dependencies>
<nextcloud min-version="22" max-version="22"/>
<nextcloud min-version="23" max-version="23"/>
</dependencies>

<activity>
Expand Down
2 changes: 1 addition & 1 deletion apps/contactsinteraction/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<category>social</category>
<bugs>https://github.com/nextcloud/server/issues</bugs>
<dependencies>
<nextcloud min-version="22" max-version="22"/>
<nextcloud min-version="23" max-version="23"/>
</dependencies>
<background-jobs>
<job>OCA\ContactsInteraction\BackgroundJob\CleanupJob</job>
Expand Down
2 changes: 1 addition & 1 deletion apps/dashboard/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<bugs>https://github.com/nextcloud/server/issues</bugs>

<dependencies>
<nextcloud min-version="22" max-version="22"/>
<nextcloud min-version="23" max-version="23"/>
</dependencies>

<navigations>
Expand Down
2 changes: 1 addition & 1 deletion apps/dav/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<category>integration</category>
<bugs>https://github.com/nextcloud/server/issues</bugs>
<dependencies>
<nextcloud min-version="22" max-version="22"/>
<nextcloud min-version="23" max-version="23"/>
</dependencies>

<background-jobs>
Expand Down
2 changes: 1 addition & 1 deletion apps/encryption/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

<dependencies>
<lib>openssl</lib>
<nextcloud min-version="22" max-version="22"/>
<nextcloud min-version="23" max-version="23"/>
</dependencies>

<repair-steps>
Expand Down
2 changes: 1 addition & 1 deletion apps/federatedfilesharing/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<bugs>https://github.com/nextcloud/server/issues</bugs>

<dependencies>
<nextcloud min-version="22" max-version="22"/>
<nextcloud min-version="23" max-version="23"/>
</dependencies>

<settings>
Expand Down
2 changes: 1 addition & 1 deletion apps/federation/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<bugs>https://github.com/nextcloud/server/issues</bugs>

<dependencies>
<nextcloud min-version="22" max-version="22"/>
<nextcloud min-version="23" max-version="23"/>
</dependencies>

<background-jobs>
Expand Down
2 changes: 1 addition & 1 deletion apps/files/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<category>files</category>
<bugs>https://github.com/nextcloud/server/issues</bugs>
<dependencies>
<nextcloud min-version="22" max-version="22"/>
<nextcloud min-version="23" max-version="23"/>
</dependencies>

<background-jobs>
Expand Down
2 changes: 1 addition & 1 deletion apps/files_external/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ External storage can be configured using the GUI or at the command line. This se
<bugs>https://github.com/nextcloud/server/issues</bugs>

<dependencies>
<nextcloud min-version="22" max-version="22"/>
<nextcloud min-version="23" max-version="23"/>
</dependencies>

<background-jobs>
Expand Down
2 changes: 1 addition & 1 deletion apps/files_sharing/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Turning the feature off removes shared files and folders on the server for all s
<category>social</category>
<bugs>https://github.com/nextcloud/server/issues</bugs>
<dependencies>
<nextcloud min-version="22" max-version="22"/>
<nextcloud min-version="23" max-version="23"/>
</dependencies>

<background-jobs>
Expand Down
2 changes: 1 addition & 1 deletion apps/files_trashbin/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ To prevent a user from running out of disk space, the Deleted files app will not
<category>files</category>
<bugs>https://github.com/nextcloud/server/issues</bugs>
<dependencies>
<nextcloud min-version="22" max-version="22"/>
<nextcloud min-version="23" max-version="23"/>
</dependencies>

<background-jobs>
Expand Down
2 changes: 1 addition & 1 deletion apps/files_versions/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<category>files</category>
<bugs>https://github.com/nextcloud/server/issues</bugs>
<dependencies>
<nextcloud min-version="22" max-version="22"/>
<nextcloud min-version="23" max-version="23"/>
</dependencies>

<background-jobs>
Expand Down
2 changes: 1 addition & 1 deletion apps/lookup_server_connector/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@
<category>social</category>
<bugs>https://github.com/nextcloud/server/issues</bugs>
<dependencies>
<nextcloud min-version="22" max-version="22"/>
<nextcloud min-version="23" max-version="23"/>
</dependencies>
</info>
2 changes: 1 addition & 1 deletion apps/oauth2/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<category>integration</category>
<bugs>https://github.com/nextcloud/server/issues</bugs>
<dependencies>
<nextcloud min-version="22" max-version="22"/>
<nextcloud min-version="23" max-version="23"/>
</dependencies>

<repair-steps>
Expand Down
2 changes: 1 addition & 1 deletion apps/provisioning_api/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@
<category>integration</category>
<bugs>https://github.com/nextcloud/server/issues</bugs>
<dependencies>
<nextcloud min-version="22" max-version="22"/>
<nextcloud min-version="23" max-version="23"/>
</dependencies>
</info>
2 changes: 1 addition & 1 deletion apps/settings/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<category>customization</category>
<bugs>https://github.com/nextcloud/server/issues</bugs>
<dependencies>
<nextcloud min-version="22" max-version="22"/>
<nextcloud min-version="23" max-version="23"/>
</dependencies>

<settings>
Expand Down
2 changes: 1 addition & 1 deletion apps/sharebymail/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<category>social</category>
<bugs>https://github.com/nextcloud/server/issues</bugs>
<dependencies>
<nextcloud min-version="22" max-version="22"/>
<nextcloud min-version="23" max-version="23"/>
</dependencies>

<settings>
Expand Down
2 changes: 1 addition & 1 deletion apps/systemtags/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<category>organization</category>
<bugs>https://github.com/nextcloud/server/issues</bugs>
<dependencies>
<nextcloud min-version="22" max-version="22"/>
<nextcloud min-version="23" max-version="23"/>
</dependencies>
<settings>
<admin>OCA\SystemTags\Settings\Admin</admin>
Expand Down
2 changes: 1 addition & 1 deletion apps/testing/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,6 @@
<category>monitoring</category>
<bugs>https://github.com/nextcloud/server/issues</bugs>
<dependencies>
<nextcloud min-version="22" max-version="22"/>
<nextcloud min-version="23" max-version="23"/>
</dependencies>
</info>
2 changes: 1 addition & 1 deletion apps/theming/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<category>customization</category>
<bugs>https://github.com/nextcloud/server/issues</bugs>
<dependencies>
<nextcloud min-version="22" max-version="22"/>
<nextcloud min-version="23" max-version="23"/>
</dependencies>

<settings>
Expand Down
2 changes: 1 addition & 1 deletion apps/twofactor_backupcodes/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<category>security</category>
<bugs>https://github.com/nextcloud/server/issues</bugs>
<dependencies>
<nextcloud min-version="22" max-version="22"/>
<nextcloud min-version="23" max-version="23"/>
</dependencies>

<repair-steps>
Expand Down
2 changes: 1 addition & 1 deletion apps/updatenotification/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<category>monitoring</category>
<bugs>https://github.com/nextcloud/server/issues</bugs>
<dependencies>
<nextcloud min-version="22" max-version="22"/>
<nextcloud min-version="23" max-version="23"/>
</dependencies>

<background-jobs>
Expand Down
2 changes: 1 addition & 1 deletion apps/user_ldap/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ A user logs into Nextcloud with their LDAP or AD credentials, and is granted acc
<bugs>https://github.com/nextcloud/server/issues</bugs>
<dependencies>
<lib>ldap</lib>
<nextcloud min-version="22" max-version="22"/>
<nextcloud min-version="23" max-version="23"/>
</dependencies>

<background-jobs>
Expand Down
2 changes: 1 addition & 1 deletion apps/user_status/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
</navigation>
</navigations>
<dependencies>
<nextcloud min-version="22" max-version="22"/>
<nextcloud min-version="23" max-version="23"/>
</dependencies>
<background-jobs>
<job>OCA\UserStatus\BackgroundJob\ClearOldStatusesBackgroundJob</job>
Expand Down
2 changes: 1 addition & 1 deletion apps/weather_status/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
<category>dashboard</category>
<bugs>https://github.com/nextcloud/server</bugs>
<dependencies>
<nextcloud min-version="22" max-version="22"/>
<nextcloud min-version="23" max-version="23"/>
</dependencies>
</info>
2 changes: 1 addition & 1 deletion apps/workflowengine/appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<repository>https://github.com/nextcloud/server.git</repository>

<dependencies>
<nextcloud min-version="22" max-version="22"/>
<nextcloud min-version="23" max-version="23"/>
</dependencies>

<background-jobs>
Expand Down
6 changes: 3 additions & 3 deletions version.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
// when updating major/minor version number.

$OC_Version = [22, 0, 0, 9];
$OC_Version = [23, 0, 0, 0];

// The human readable string
$OC_VersionString = '22.0.0 RC1';
$OC_VersionString = '23.0.0 alpha';

$OC_VersionCanBeUpgradedFrom = [
'nextcloud' => [
'21.0' => true,
'22.0' => true,
'23.0' => true,
],
'owncloud' => [
'10.5' => true,
Expand Down