From 3233400d70fda6da9af87e16b090ae67e74ae1a9 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 4 Feb 2019 18:55:46 +0100 Subject: [PATCH 1/2] [microdecision] Update list of 'special packages' according to tools.py --- src/js/yunohost/controllers/tools.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/js/yunohost/controllers/tools.js b/src/js/yunohost/controllers/tools.js index d24566db..07b65c8b 100644 --- a/src/js/yunohost/controllers/tools.js +++ b/src/js/yunohost/controllers/tools.js @@ -55,7 +55,7 @@ data.packages[i].changelog = data.packages[i].changelog.replace(/\n/g, '
'); // Check for special packages that need delayed upgrade. - if (["moulinette", "moulinette-yunohost", "yunohost-admin", "yunohost-config-nginx", "ssowat", "python"].indexOf(data.packages[i].name) != -1) { + if (["moulinette", "yunohost", "yunohost-admin", "ssowat", "python"].indexOf(data.packages[i].name) != -1) { c.flash('warning', y18n.t('system_delayed_upgrade_warning', [data.packages[i].name])); data.packages[i].delayed = true; } From 18d6a0003efb0926fc3365a831e4dedced69fbec Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Tue, 5 Feb 2019 15:32:51 +0000 Subject: [PATCH 2/2] [microdecision] Explain the user why the security.rss feed retrieval might not been working --- src/locales/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locales/en.json b/src/locales/en.json index 8d90af44..b1acbd34 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -138,7 +138,7 @@ "enabled": "Enabled", "error_modify_something": "You should modify something", "error_occured": "An error occurred, try again", - "error_retrieve_feed": "Could not retrieve feed: %s", + "error_retrieve_feed": "Could not retrieve feed: %s. You might have a plugin prevent your browser from performing this request (or the website is down).", "error_select_domain": "You should indicate a domain", "error_server": "Server error", "error_server_unexpected": "Unexpected server error (%s)",