From ef2271160591976b30ff1ed588d39186837361d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sat, 15 Oct 2016 15:52:05 +0200 Subject: Prepare wallabag 2.1.2 :rocket: --- app/config/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/config') diff --git a/app/config/config.yml b/app/config/config.yml index bcc4c8eb..ed2e7416 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -30,7 +30,7 @@ framework: assets: ~ wallabag_core: - version: 2.1.2-dev + version: 2.1.2 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" languages: en: 'English' -- cgit v1.2.3 From f31361a6d938e363e6164f4f1401e66ce4fb2a52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 17 Oct 2016 11:56:29 +0200 Subject: Update wallabag version for master branch --- app/config/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/config') diff --git a/app/config/config.yml b/app/config/config.yml index ed2e7416..5127c8cf 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -30,7 +30,7 @@ framework: assets: ~ wallabag_core: - version: 2.1.2 + version: 2.1.3-dev paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" languages: en: 'English' -- cgit v1.2.3 From 2297d60f100effc1bf4300488a170a6bed3ae756 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Thu, 20 Oct 2016 22:49:46 +0200 Subject: =?UTF-8?q?If=20reload=20content=20failed,=20don=E2=80=99t=20updat?= =?UTF-8?q?e=20it?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In case user wants a fresh version of the current one and the website isn’t available, don’t erase it with a boring message saying wallabag wasn’t able to refresh the content. --- app/config/config.yml | 1 + 1 file changed, 1 insertion(+) (limited to 'app/config') diff --git a/app/config/config.yml b/app/config/config.yml index 5127c8cf..a56cbdd9 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -50,6 +50,7 @@ wallabag_core: rss_limit: 50 reading_speed: 1 cache_lifetime: 10 + fetching_error_message: "wallabag can't retrieve contents for this article. Please report this issue to us." wallabag_user: registration_enabled: "%fosuser_registration%" -- cgit v1.2.3