diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | apps/updatenotification/css/admin.css | 9 | ||||
| -rw-r--r-- | apps/updatenotification/js-src/components/root.vue | 18 | ||||
| -rw-r--r-- | lib/private/legacy/json.php | 15 | ||||
| -rw-r--r-- | lib/public/BackgroundJob.php | 7 | ||||
| -rw-r--r-- | lib/public/JSON.php | 32 |
6 files changed, 28 insertions, 54 deletions
diff --git a/.gitignore b/.gitignore index ec3043c8a33..639e38bc3dc 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,7 @@ !/apps/testing !/apps/admin_audit !/apps/updatenotification +/apps/updatenotification/build /apps/updatenotification/js/merged.js /apps/updatenotification/js/merged.js.map /apps/updatenotification/js/*.hot-update.* diff --git a/apps/updatenotification/css/admin.css b/apps/updatenotification/css/admin.css index cb03f6a15cb..52cc961ae35 100644 --- a/apps/updatenotification/css/admin.css +++ b/apps/updatenotification/css/admin.css @@ -31,3 +31,12 @@ #updatenotification .icon-triangle-n { opacity: 0.5; } + +#updatenotification .channel-description span { + color: #aaa; +} + +#updatenotification .channel-description span strong { + color: #555; + font-weight: normal; +} diff --git a/apps/updatenotification/js-src/components/root.vue b/apps/updatenotification/js-src/components/root.vue index 11dfd351c63..774fd6dd539 100644 --- a/apps/updatenotification/js-src/components/root.vue +++ b/apps/updatenotification/js-src/components/root.vue @@ -55,6 +55,12 @@ <em>{{ t('updatenotification', 'Note that after a new release it can take some time before it shows up here. We roll out new versions spread out over time to our users and sometimes skip a version when issues are found.') }}</em> </p> + <p class="channel-description"> + <span v-html="productionInfoString"></span><br> + <span v-html="stableInfoString"></span><br> + <span v-html="betaInfoString"></span> + </p> + <p id="oca_updatenotification_groups"> {{ t('updatenotification', 'Notify members of the following groups about available updates:') }} <v-select multiple :value="notifyGroups" :options="availableGroups"></v-select><br /> @@ -174,6 +180,18 @@ this.missingAppUpdates.length, { version: this.newVersionString }); + }, + + productionInfoString: function() { + return t('updatenotification', '<strong>production</strong> will always provide the latest patch level, but not update to the next major release immediately. That update usually happens with the second minor release (x.0.2).'); + }, + + stableInfoString: function() { + return t('updatenotification', '<strong>stable</strong> is the most recent stable version. It is suited for production use and will always update to the latest major version.'); + }, + + betaInfoString: function() { + return t('updatenotification', '<strong>beta</strong> is a pre-release version only for testing new features, not for production environments.'); } }, diff --git a/lib/private/legacy/json.php b/lib/private/legacy/json.php index 0afa179b3d8..b02e5c879fc 100644 --- a/lib/private/legacy/json.php +++ b/lib/private/legacy/json.php @@ -112,21 +112,6 @@ class OC_JSON{ } /** - * Check is a given user exists - send json error msg if not - * @param string $user - * @deprecated Use a AppFramework JSONResponse instead - * @suppress PhanDeprecatedFunction - */ - public static function checkUserExists($user) { - if (!\OC::$server->getUserManager()->userExists($user)) { - $l = \OC::$server->getL10N('lib'); - OCP\JSON::error(array('data' => array('message' => $l->t('Unknown user'), 'error' => 'unknown_user' ))); - exit; - } - } - - - /** * Check if the user is a subadmin, send json error msg if not * @deprecated Use annotation based ACLs from the AppFramework instead * @suppress PhanDeprecatedFunction diff --git a/lib/public/BackgroundJob.php b/lib/public/BackgroundJob.php index 9e37ff30145..58d44231ae3 100644 --- a/lib/public/BackgroundJob.php +++ b/lib/public/BackgroundJob.php @@ -46,11 +46,4 @@ class BackgroundJob { */ public static function setExecutionType($type) { } - - /** - * @since 6.0.0 - * @deprecated 8.1.0 Use \OC::$server->getJobList()->add() instead - */ - public static function registerJob($job, $argument = null) { - } } diff --git a/lib/public/JSON.php b/lib/public/JSON.php index c56c3b645a9..151a590b294 100644 --- a/lib/public/JSON.php +++ b/lib/public/JSON.php @@ -42,18 +42,6 @@ namespace OCP; */ class JSON { /** - * Encode and print $data in JSON format - * @param array $data The data to use - * @param bool $setContentType the optional content type - * @deprecated 8.1.0 Use a AppFramework JSONResponse instead - * - * @suppress PhanDeprecatedFunction - */ - public static function encodedPrint( $data, $setContentType=true ) { - \OC_JSON::encodedPrint($data, $setContentType); - } - - /** * Check if the user is logged in, send json error msg if not. * * This method checks if a user is logged in. If not, a json error @@ -136,16 +124,6 @@ class JSON { } /** - * Set Content-Type header to jsonrequest - * @param string $type The content type header - * @deprecated 8.1.0 Use a AppFramework JSONResponse instead - * @suppress PhanDeprecatedFunction - */ - public static function setContentTypeHeader( $type='application/json' ) { - \OC_JSON::setContentTypeHeader($type); - } - - /** * Check if the App is enabled and send JSON error message instead * * This method checks if a specific app is enabled. If not, a json error @@ -196,14 +174,4 @@ class JSON { public static function encode($data) { return \OC_JSON::encode($data); } - - /** - * Check is a given user exists - send json error msg if not - * @param string $user - * @deprecated 8.1.0 Use a AppFramework JSONResponse instead - * @suppress PhanDeprecatedFunction - */ - public static function checkUserExists($user) { - \OC_JSON::checkUserExists($user); - } } |