Merge branch 'stretch-stable' into stretch-testing

This commit is contained in:
Alexandre Aubin 2019-11-18 16:41:32 +01:00
commit 2a8dac0670
2 changed files with 14 additions and 0 deletions

6
debian/changelog vendored
View file

@ -16,6 +16,12 @@ yunohost-admin (3.7.0) testing; urgency=low
-- Alexandre Aubin <alex.aubin@mailoo.org> Thu, 31 Oct 2019 19:00:00 +0000 -- Alexandre Aubin <alex.aubin@mailoo.org> Thu, 31 Oct 2019 19:00:00 +0000
yunohost-admin (3.6.5.1) stable; urgency=low
- [fix] Disabling security.rss for now because there's a header issue preventing it from working, and hasnt been used in 2+ years anyway
-- Alexandre Aubin <alex.aubin@mailoo.org> Mon, 18 Nov 2019 16:40:00 +00000
yunohost-admin (3.6.5) stable; urgency=low yunohost-admin (3.6.5) stable; urgency=low
- [fix] Stupid / buggy error handling for postinstall (2187657) - [fix] Stupid / buggy error handling for postinstall (2187657)

View file

@ -14,6 +14,13 @@
c.flash('warning', y18n.t('warning_first_user')); c.flash('warning', y18n.t('warning_first_user'));
} }
/*
* Disabling this for now because there's a duplicate Access Allow
* Origin header thing preventing it from working and people keep
* complaining about it and we havent effectively used this in 2
* years anyway despite various security issues.
*
*
// Get security feed and display new items // Get security feed and display new items
var securityFeed = 'https://yunohost.org/security.rss'; var securityFeed = 'https://yunohost.org/security.rss';
var forumUrl = 'https://forum.yunohost.org'; var forumUrl = 'https://forum.yunohost.org';
@ -68,6 +75,7 @@
.fail(function(stuff) { .fail(function(stuff) {
c.flash('fail', y18n.t('error_retrieve_feed', [securityFeed])); c.flash('fail', y18n.t('error_retrieve_feed', [securityFeed]));
}); });
*/
c.api("/diagnosis", function(data) { c.api("/diagnosis", function(data) {
versions = data.packages; versions = data.packages;