diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2018-03-19 11:25:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-19 11:25:15 +0100 |
| commit | 17bfa1c74e3348c47ea93a00793290e659eac86a (patch) | |
| tree | 4a10b5aecaf9211b0c66c5047cc3e2fb7f9a71ae /apps | |
| parent | 63bc633d89e53c2ff04d3fd521a2a1b18f6737f7 (diff) | |
| parent | b01b3454e62c1fb72534165cde0b36041c22c007 (diff) | |
| download | nextcloud-server-17bfa1c74e3348c47ea93a00793290e659eac86a.tar.gz nextcloud-server-17bfa1c74e3348c47ea93a00793290e659eac86a.zip | |
Merge pull request #8815 from nextcloud/channel-description
Provide a description of the update channels inline
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/updatenotification/css/admin.css | 9 | ||||
| -rw-r--r-- | apps/updatenotification/js-src/components/root.vue | 18 |
2 files changed, 27 insertions, 0 deletions
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.'); } }, |