From: Nicolas Frandeboeuf Date: Fri, 23 Aug 2013 21:09:43 +0000 (+0200) Subject: Revert "Add SHAARLI support to view template" X-Git-Tag: 1.0-beta4~15^2~1 X-Git-Url: https://git.immae.eu/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=fd99a8c02d7c625771656a5c5081560027d8e6e9 Revert "Add SHAARLI support to view template" This reverts commit 0269cd821311500acffed61edb1bc168d3fb5ec8. --- diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md old mode 100755 new mode 100644 diff --git a/COPYING b/COPYING old mode 100755 new mode 100644 diff --git a/CREDITS b/CREDITS old mode 100755 new mode 100644 diff --git a/INSTALL.md b/INSTALL.md old mode 100755 new mode 100644 diff --git a/README.md b/README.md old mode 100755 new mode 100644 diff --git a/TODO.md b/TODO.md old mode 100755 new mode 100644 diff --git a/composer.json b/composer.json old mode 100755 new mode 100644 diff --git a/composer.lock b/composer.lock old mode 100755 new mode 100644 diff --git a/inc/3rdparty/Encoding.php b/inc/3rdparty/Encoding.php old mode 100755 new mode 100644 diff --git a/inc/3rdparty/JSLikeHTMLElement.php b/inc/3rdparty/JSLikeHTMLElement.php old mode 100755 new mode 100644 diff --git a/inc/3rdparty/Readability.php b/inc/3rdparty/Readability.php old mode 100755 new mode 100644 diff --git a/inc/3rdparty/Session.class.php b/inc/3rdparty/Session.class.php old mode 100755 new mode 100644 diff --git a/inc/3rdparty/paginator.php b/inc/3rdparty/paginator.php old mode 100755 new mode 100644 diff --git a/inc/3rdparty/simple_html_dom.php b/inc/3rdparty/simple_html_dom.php old mode 100755 new mode 100644 diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php old mode 100755 new mode 100644 diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php old mode 100755 new mode 100644 diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php old mode 100755 new mode 100644 diff --git a/inc/poche/Url.class.php b/inc/poche/Url.class.php old mode 100755 new mode 100644 diff --git a/inc/poche/User.class.php b/inc/poche/User.class.php old mode 100755 new mode 100644 diff --git a/inc/poche/pochePictures.php b/inc/poche/pochePictures.php old mode 100755 new mode 100644 diff --git a/index.php b/index.php old mode 100755 new mode 100644 diff --git a/install/mysql.sql b/install/mysql.sql old mode 100755 new mode 100644 diff --git a/install/postgres.sql b/install/postgres.sql old mode 100755 new mode 100644 diff --git a/install/update.php b/install/update.php old mode 100755 new mode 100644 diff --git a/install/update_sqlite_from_0_to_1.php b/install/update_sqlite_from_0_to_1.php old mode 100755 new mode 100644 diff --git a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo b/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo old mode 100755 new mode 100644 diff --git a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po b/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po old mode 100755 new mode 100644 diff --git a/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo b/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo old mode 100755 new mode 100644 diff --git a/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po b/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po old mode 100755 new mode 100644 diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo old mode 100755 new mode 100644 diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po old mode 100755 new mode 100644 diff --git a/phpunit.xml.dist b/phpunit.xml.dist old mode 100755 new mode 100644 diff --git a/robots.txt b/robots.txt old mode 100755 new mode 100644 diff --git a/tpl/_bookmarklet.twig b/tpl/_bookmarklet.twig old mode 100755 new mode 100644 diff --git a/tpl/_footer.twig b/tpl/_footer.twig old mode 100755 new mode 100644 diff --git a/tpl/_head.twig b/tpl/_head.twig old mode 100755 new mode 100644 diff --git a/tpl/_menu.twig b/tpl/_menu.twig old mode 100755 new mode 100644 diff --git a/tpl/_messages.twig b/tpl/_messages.twig old mode 100755 new mode 100644 diff --git a/tpl/_top.twig b/tpl/_top.twig old mode 100755 new mode 100644 diff --git a/tpl/config.twig b/tpl/config.twig old mode 100755 new mode 100644 diff --git a/tpl/css/knacss.css b/tpl/css/knacss.css old mode 100755 new mode 100644 diff --git a/tpl/css/print.css b/tpl/css/print.css old mode 100755 new mode 100644 diff --git a/tpl/css/style-light.css b/tpl/css/style-light.css old mode 100755 new mode 100644 diff --git a/tpl/css/style.css b/tpl/css/style.css old mode 100755 new mode 100644 diff --git a/tpl/error.twig b/tpl/error.twig old mode 100755 new mode 100644 diff --git a/tpl/export.twig b/tpl/export.twig old mode 100755 new mode 100644 diff --git a/tpl/home.twig b/tpl/home.twig old mode 100755 new mode 100644 diff --git a/tpl/img/apple-touch-icon-144x144-precomposed.png b/tpl/img/apple-touch-icon-144x144-precomposed.png old mode 100755 new mode 100644 diff --git a/tpl/img/apple-touch-icon-72x72-precomposed.png b/tpl/img/apple-touch-icon-72x72-precomposed.png old mode 100755 new mode 100644 diff --git a/tpl/img/apple-touch-icon.png b/tpl/img/apple-touch-icon.png old mode 100755 new mode 100644 diff --git a/tpl/img/favicon.ico b/tpl/img/favicon.ico old mode 100755 new mode 100644 diff --git a/tpl/img/light/checkmark-off.png b/tpl/img/light/checkmark-off.png old mode 100755 new mode 100644 diff --git a/tpl/img/light/checkmark-on.png b/tpl/img/light/checkmark-on.png old mode 100755 new mode 100644 diff --git a/tpl/img/light/down.png b/tpl/img/light/down.png old mode 100755 new mode 100644 diff --git a/tpl/img/light/remove.png b/tpl/img/light/remove.png old mode 100755 new mode 100644 diff --git a/tpl/img/light/shaarli.png b/tpl/img/light/shaarli.png old mode 100755 new mode 100644 diff --git a/tpl/img/light/star-off.png b/tpl/img/light/star-off.png old mode 100755 new mode 100644 diff --git a/tpl/img/light/star-on.png b/tpl/img/light/star-on.png old mode 100755 new mode 100644 diff --git a/tpl/img/logo.png b/tpl/img/logo.png old mode 100755 new mode 100644 diff --git a/tpl/install.twig b/tpl/install.twig old mode 100755 new mode 100644 diff --git a/tpl/js/jquery-2.0.3.min.js b/tpl/js/jquery-2.0.3.min.js old mode 100755 new mode 100644 diff --git a/tpl/layout.twig b/tpl/layout.twig old mode 100755 new mode 100644 diff --git a/tpl/login.twig b/tpl/login.twig old mode 100755 new mode 100644 diff --git a/tpl/view.twig b/tpl/view.twig old mode 100755 new mode 100644 index 219faa56..4dee38c8 --- a/tpl/view.twig +++ b/tpl/view.twig @@ -10,7 +10,6 @@
  • {% trans "delete" %}
    • {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} - {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
    • {% endif %}
    @@ -30,7 +29,6 @@
  • {% trans "delete" %}
    • {% if constant('SHARE_TWITTER') == 1 %}
    • {% endif %} {% if constant('SHARE_MAIL') == 1 %}
    • {% endif %} - {% if constant('SHARE_SHAARLI') == 1 %}
  • {% trans "shaarli" %}
    • {% endif %}

    {% trans "this article appears wrong?" %} {% trans "create an issue" %} {% trans "or" %} {% trans "contact us by mail" %}