Merge pull request #603 from mariroz/dev

postgres sequence error fix, issue #602

diff --git a/README.md b/README.md
index fe6a06b61855524c4eb4b930cb90fdea73f260c4..0b54dff45a19a639c6a64fbbef09be07fcada90b 100644 (file)
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ wallabag is a self hostable application allowing you to not miss any content any
 More informations on our website: [wallabag.org](http://wallabag.org)
 
 ## License
-Copyright © 2010-2013 Nicolas Lœuillet <nicolas@loeuillet.org>
+Copyright © 2010-2014 Nicolas Lœuillet <nicolas@loeuillet.org>
 This work is free. You can redistribute it and/or modify it under the
 terms of the Do What The Fuck You Want To Public License, Version 2,
 as published by Sam Hocevar. See the COPYING file for more details.

diff --git a/index.php b/index.php
index 8b578832c9a77780f96e8788a93261ae4a91e200..7f72b14699e8e334c4101e7680dd63d4c4cd70a9 100755 (executable)
--- a/index.php
+++ b/index.php
@@ -8,7 +8,7 @@
  * @license    http://www.wtfpl.net/ see COPYING file
  */
 
-define ('POCHE', '1.5.3');
+define ('POCHE', '1.6.0');
 require 'check_setup.php';
 require_once 'inc/poche/global.inc.php';
 

diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index 725b775e6c04c383c58e0c290158a8ec9f8e32f3..d441de7c7828f1685b25d98d705057c423755a31 100755 (executable)
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -118,6 +118,7 @@
                     </div>
                 </fieldset>
             </form>
+            <p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p>
             
             <h2>{% trans "Export your wallabag data" %}</h2>
             {% if constant('STORAGE') == 'sqlite' %}

diff --git a/themes/courgette/config.twig b/themes/courgette/config.twig
index 5c0aa4b1193a13ccfc65cee63235dae31218a1c2..6e1a9043d3aab1266c562acd3448e0e4a55f7309 100755 (executable)
--- a/themes/courgette/config.twig
+++ b/themes/courgette/config.twig
@@ -9,9 +9,11 @@
             <h2>{% trans "Poching a link" %}</h2>
             <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>
             <ul>
-                <li>firefox: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.xpi" title="download the firefox extension">{% trans "download the extension" %}</a></li>
-                <li>chrome: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/poche.crx" title="download the chrome extension">{% trans "download the extension" %}</a></li>
-                <li>android: <a href="https://bitbucket.org/jogaulupeau/poche/downloads/Poche.apk" title="download the application">{% trans "download the application" %}</a></li>
+                <li>Firefox: <a href="https://addons.mozilla.org/firefox/addon/wallabag/" title="download the firefox extension">{% trans "download the extension" %}</a></li>
+                <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>
+                <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>
+                <li>iOS: <a href="https://itunes.apple.com/app/wallabag/id828331015?mt=8" title="download the iOS application">{% trans "download the application" %}</a></li>
+                <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>
                 <li>
                     <form method="get" action="index.php">
                         <label class="addurl" for="plainurl">{% trans "by filling this field" %}:</label>
@@ -79,4 +81,4 @@
             <h2>{% trans "Export your wallabag data" %}</h2>
             <p><a href="./?export" target="_blank">{% trans "Click here" %}</a> {% trans "to export your wallabag data." %}</p>
         </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}

diff --git a/themes/default/config.twig b/themes/default/config.twig
index 5bdaf56752f27b92efdca8f0aaebb0d6a6eba089..bb39dea2094d9e6426207354ed825288d7aef9e8 100755 (executable)
--- a/themes/default/config.twig
+++ b/themes/default/config.twig
@@ -117,6 +117,7 @@
                     </div>
                 </fieldset>
             </form>
+            <p><a href="?import">{% trans "You can click here to fetch content for articles with no content." %}</a></p>
 
             <h2>{% trans "Export your wallabag data" %}</h2>
             {% if constant('STORAGE') == 'sqlite' %}