diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-06-12 22:33:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-12 22:33:16 -0500 |
| commit | 6a06df824e8527546e5374074efa2c51b1326a29 (patch) | |
| tree | 3e97aa505a943f38280afa1ac5ce1881030e2364 /core | |
| parent | ea64cb00289a40ee3c12c195d7a2804ea1abe97e (diff) | |
| parent | 02275e60c6a8bd9c5fe883c381cb78e49a2c04b7 (diff) | |
| download | nextcloud-server-6a06df824e8527546e5374074efa2c51b1326a29.tar.gz nextcloud-server-6a06df824e8527546e5374074efa2c51b1326a29.zip | |
Merge pull request #5027 from nextcloud/require-nextcloud-version-as-per-docs
Version and dependency are now required
Diffstat (limited to 'core')
| -rw-r--r-- | core/Command/App/CheckCode.php | 8 | ||||
| -rw-r--r-- | core/shipped.json | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/core/Command/App/CheckCode.php b/core/Command/App/CheckCode.php index 46b9b748ada..48662409dcf 100644 --- a/core/Command/App/CheckCode.php +++ b/core/Command/App/CheckCode.php @@ -146,11 +146,7 @@ class CheckCode extends Command implements CompletionAwareInterface { }); $infoChecker->listen('InfoChecker', 'missingRequirement', function($minMax) use ($output) { - $output->writeln("<comment>Nextcloud $minMax version requirement missing (will be an error in Nextcloud 12 and later)</comment>"); - }); - - $infoChecker->listen('InfoChecker', 'duplicateRequirement', function($minMax) use ($output) { - $output->writeln("<error>Duplicate $minMax ownCloud version requirement found</error>"); + $output->writeln("<error>Nextcloud $minMax version requirement missing</error>"); }); $infoChecker->listen('InfoChecker', 'differentVersions', function($versionFile, $infoXML) use ($output) { @@ -162,7 +158,7 @@ class CheckCode extends Command implements CompletionAwareInterface { }); $infoChecker->listen('InfoChecker', 'migrateVersion', function($version) use ($output) { - $output->writeln("<info>Migrate the app version to appinfo/info.xml (add <version>$version</version> to appinfo/info.xml and remove appinfo/version)</info>"); + $output->writeln("<error>Migrate the app version to appinfo/info.xml (add <version>$version</version> to appinfo/info.xml and remove appinfo/version)</error>"); }); if(OutputInterface::VERBOSITY_VERBOSE <= $output->getVerbosity()) { diff --git a/core/shipped.json b/core/shipped.json index 83eb3a29787..0c09e53244b 100644 --- a/core/shipped.json +++ b/core/shipped.json @@ -21,15 +21,15 @@ "lookup_server_connector", "nextcloud_announcements", "notifications", + "oauth2", "password_policy", "provisioning_api", "serverinfo", "sharebymail", "survey_client", "systemtags", - "templateeditor", - "twofactor_backupcodes", "theming", + "twofactor_backupcodes", "updatenotification", "user_external", "user_ldap", |