diff options
-rw-r--r-- | README.md | 2 | ||||
-rwxr-xr-x | index.php | 2 | ||||
-rwxr-xr-x | themes/baggy/config.twig | 1 | ||||
-rwxr-xr-x | themes/courgette/config.twig | 10 | ||||
-rwxr-xr-x | themes/default/config.twig | 1 |
5 files changed, 10 insertions, 6 deletions
@@ -4,7 +4,7 @@ wallabag is a self hostable application allowing you to not miss any content any | |||
4 | More informations on our website: [wallabag.org](http://wallabag.org) | 4 | More informations on our website: [wallabag.org](http://wallabag.org) |
5 | 5 | ||
6 | ## License | 6 | ## License |
7 | Copyright © 2010-2013 Nicolas Lœuillet <nicolas@loeuillet.org> | 7 | Copyright © 2010-2014 Nicolas Lœuillet <nicolas@loeuillet.org> |
8 | This work is free. You can redistribute it and/or modify it under the | 8 | This work is free. You can redistribute it and/or modify it under the |
9 | terms of the Do What The Fuck You Want To Public License, Version 2, | 9 | terms of the Do What The Fuck You Want To Public License, Version 2, |
10 | as published by Sam Hocevar. See the COPYING file for more details. | 10 | as published by Sam Hocevar. See the COPYING file for more details. |
@@ -8,7 +8,7 @@ | |||
8 | * @license http://www.wtfpl.net/ see COPYING file | 8 | * @license http://www.wtfpl.net/ see COPYING file |
9 | */ | 9 | */ |
10 | 10 | ||
11 | define ('POCHE', '1.5.3'); | 11 | define ('POCHE', '1.6.0'); |
12 | require 'check_setup.php'; | 12 | require 'check_setup.php'; |
13 | require_once 'inc/poche/global.inc.php'; | 13 | require_once 'inc/poche/global.inc.php'; |
14 | 14 | ||
diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig index 725b775e..d441de7c 100755 --- a/themes/baggy/config.twig +++ b/themes/baggy/config.twig | |||
@@ -118,6 +118,7 @@ | |||
118 | </div> | 118 | </div> |
119 | </fieldset> | 119 | </fieldset> |
120 | </form> | 120 | </form> |
121 | <p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p> | ||
121 | 122 | ||
122 | <h2>{% trans "Export your wallabag data" %}</h2> | 123 | <h2>{% trans "Export your wallabag data" %}</h2> |
123 | {% if constant('STORAGE') == 'sqlite' %} | 124 | {% if constant('STORAGE') == 'sqlite' %} |
diff --git a/themes/courgette/config.twig b/themes/courgette/config.twig index 5c0aa4b1..6e1a9043 100755 --- a/themes/courgette/config.twig +++ b/themes/courgette/config.twig | |||
@@ -9,9 +9,11 @@ | |||
9 | <h2>{% trans "Poching a link" %}</h2> | 9 | <h2>{% trans "Poching a link" %}</h2> |
10 | <p>{% trans "There are several ways to save an article:" %} (<a class="special" href="http://doc.wallabag.org" title="{% trans "read the documentation" %}">?</a>)</p> | 10 | <p>{% trans "There are several ways to save an article:" %} (<a class="special" href="http://doc.wallabag.org" title="{% trans "read the documentation" %}">?</a>)</p> |
11 | <ul> | 11 | <ul> |
12 | <li>firefox: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.xpi" title="download the firefox extension">{% trans "download the extension" %}</a></li> | 12 | <li>Firefox: <a href="https://addons.mozilla.org/firefox/addon/wallabag/" title="download the firefox extension">{% trans "download the extension" %}</a></li> |
13 | <li>chrome: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.crx" title="download the chrome extension">{% trans "download the extension" %}</a></li> | 13 | <li>Chrome: <a href="http://doc.wallabag.org/doku.php?id=users:chrome_extension" title="download the chrome extension">{% trans "download the extension" %}</a></li> |
14 | <li>android: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/Poche.apk" title="download the application">{% trans "download the application" %}</a></li> | 14 | <li>Android: <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via F-Droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via Google Play" %}</a></li> |
15 | <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" title="download the iOS application">{% trans "download the application" %}</a></li> | ||
16 | <li>Windows Phone: <a href="http://www.windowsphone.com/en-us/store/app/wallabag/ff890514-348c-4d0b-9b43-153fff3f7450" title="download the window phone application">{% trans "download the application" %}</a></li> | ||
15 | <li> | 17 | <li> |
16 | <form method="get" action="index.php"> | 18 | <form method="get" action="index.php"> |
17 | <label class="addurl" for="plainurl">{% trans "by filling this field" %}:</label> | 19 | <label class="addurl" for="plainurl">{% trans "by filling this field" %}:</label> |
@@ -79,4 +81,4 @@ | |||
79 | <h2>{% trans "Export your wallabag data" %}</h2> | 81 | <h2>{% trans "Export your wallabag data" %}</h2> |
80 | <p><a href="./?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your wallabag data." %}</p> | 82 | <p><a href="./?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your wallabag data." %}</p> |
81 | </div> | 83 | </div> |
82 | {% endblock %} \ No newline at end of file | 84 | {% endblock %} |
diff --git a/themes/default/config.twig b/themes/default/config.twig index 5bdaf567..bb39dea2 100755 --- a/themes/default/config.twig +++ b/themes/default/config.twig | |||
@@ -117,6 +117,7 @@ | |||
117 | </div> | 117 | </div> |
118 | </fieldset> | 118 | </fieldset> |
119 | </form> | 119 | </form> |
120 | <p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p> | ||
120 | 121 | ||
121 | <h2>{% trans "Export your wallabag data" %}</h2> | 122 | <h2>{% trans "Export your wallabag data" %}</h2> |
122 | {% if constant('STORAGE') == 'sqlite' %} | 123 | {% if constant('STORAGE') == 'sqlite' %} |