From 76e487cd7e6a3594faf1749ff4f9b936ff75d868 Mon Sep 17 00:00:00 2001 From: Dmitry Sandalov Date: Sat, 28 Dec 2013 11:47:10 +0400 Subject: docs link, typos --- locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mo | Bin 4826 -> 4823 bytes locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po | 10 +++++----- locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo | Bin 4779 -> 4776 bytes locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po | 8 ++++---- locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo | Bin 4487 -> 4481 bytes locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po | 16 ++++++++-------- locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo | Bin 4198 -> 4195 bytes locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po | 10 +++++----- locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mo | Bin 5635 -> 5632 bytes locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po | 10 +++++----- locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo | Bin 4813 -> 4810 bytes locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po | 10 +++++----- locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo | Bin 4900 -> 4897 bytes locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po | 10 +++++----- locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo | Bin 5806 -> 5803 bytes locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po | 10 +++++----- themes/README.md | 2 +- 17 files changed, 43 insertions(+), 43 deletions(-) diff --git a/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mo b/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mo index bdf19250..0e8f88bf 100644 Binary files a/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mo and b/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.mo differ diff --git a/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po b/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po index a99d3903..8209a9cd 100644 --- a/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po +++ b/locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po @@ -73,7 +73,7 @@ msgstr "Importovat" msgid "Please execute the import script locally, it can take a very long time." msgstr "Spusťte importní skript lokálně, může to dlouho trvat." -msgid "More infos in the official doc:" +msgid "More info in the official doc:" msgstr "Více informací v oficiální dokumentaci:" msgid "import from Pocket" @@ -85,13 +85,13 @@ msgstr "importovat z Readability" msgid "import from Instapaper" msgstr "importovat z Instapaper" -msgid "Export your poche datas" +msgid "Export your poche data" msgstr "Export dat" msgid "Click here" msgstr "Klikněte zde" -msgid "to export your poche datas." +msgid "to export your poche data." msgstr "pro export vašich dat." msgid "back to home" @@ -105,11 +105,11 @@ msgstr "instalovat" msgid "" "poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " +"Don't hesitate to read the documentation " "on poche website." msgstr "" "poche ještě není nainstalováno. Pro instalaci vyplňte níže uvedený formulář. " -"Nezapomeňte si přečíst dokumentaci " +"Nezapomeňte si přečíst dokumentaci " "na stránkách programu." msgid "Login" diff --git a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo b/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo index cf8ae292..253d8c7e 100644 Binary files a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo and b/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.mo differ diff --git a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po b/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po index 14aeb0f5..5b30d3d7 100644 --- a/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po +++ b/locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po @@ -67,7 +67,7 @@ msgstr "Import" msgid "Please execute the import script locally, it can take a very long time." msgstr "Bitte führe das Import Script lokal aus, dies kann eine Weile dauern." -msgid "More infos in the official doc:" +msgid "More info in the official doc:" msgstr "Mehr Informationen in der offiziellen Dokumentation:" msgid "import from Pocket" @@ -79,13 +79,13 @@ msgstr "Import aus Readability" msgid "import from Instapaper" msgstr "Import aus Instapaper" -msgid "Export your poche datas" +msgid "Export your poche data" msgstr "Exportieren Sie Ihre Poche Daten." msgid "Click here" msgstr "Klicke hier" -msgid "to export your poche datas." +msgid "to export your poche data." msgstr "um deine Daten aus Poche zu exportieren." msgid "back to home" @@ -99,7 +99,7 @@ msgstr "Installiere dein Poche" msgid "" "poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " +"Don't hesitate to read the documentation " "on poche website." msgstr "" "Poche ist noch nicht installiert. Bitte fülle die Felder unten aus, um die " diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo index f387889d..974ca4f3 100644 Binary files a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo and b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo differ diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po index 8e56560d..b78759f5 100644 --- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po +++ b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po @@ -68,8 +68,8 @@ msgid "Please execute the import script locally, it can take a very long time." msgstr "" "Please execute the import script locally, it can take a very long time." -msgid "More infos in the official doc:" -msgstr "More infos in the official doc:" +msgid "More info in the official doc:" +msgstr "More info in the official doc:" msgid "import from Pocket" msgstr "import from Pocket" @@ -80,14 +80,14 @@ msgstr "import from Readability" msgid "import from Instapaper" msgstr "import from Instapaper" -msgid "Export your poche datas" -msgstr "Export your poche datas" +msgid "Export your poche data" +msgstr "Export your poche data" msgid "Click here" msgstr "Click here" -msgid "to export your poche datas." -msgstr "to export your poche datas." +msgid "to export your poche data." +msgstr "to export your poche data." msgid "back to home" msgstr "back to home" @@ -100,11 +100,11 @@ msgstr "install your poche" msgid "" "poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " +"Don't hesitate to read the documentation " "on poche website." msgstr "" "poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " +"Don't hesitate to read the documentation " "on poche website." msgid "Login" diff --git a/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo b/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo index 0122cebc..20978239 100644 Binary files a/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo and b/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.mo differ diff --git a/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po b/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po index 833d1803..afe0595d 100644 --- a/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po +++ b/locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po @@ -68,7 +68,7 @@ msgid "Please execute the import script locally, it can take a very long time." msgstr "" "Por favor, ejecute la importación en local, esto puede demorar un tiempo." -msgid "More infos in the official doc:" +msgid "More info in the official doc:" msgstr "Más información en la documentación oficial :" msgid "import from Pocket" @@ -80,13 +80,13 @@ msgstr "importación desde Readability" msgid "import from Instapaper" msgstr "importación desde Instapaper" -msgid "Export your poche datas" +msgid "Export your poche data" msgstr "Exportar sus datos de poche" msgid "Click here" msgstr "Haga clic aquí" -msgid "to export your poche datas." +msgid "to export your poche data." msgstr "para exportar sus datos de poche." msgid "back to home" @@ -100,11 +100,11 @@ msgstr "instala tu Poche" msgid "" "Poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " +"Don't hesitate to read the documentation " "on poche website." msgstr "" "Poche todavia no està instalado. Por favor, completa los campos siguientes " -"para instalarlo. No dudes de leer la " +"para instalarlo. No dudes de leer la " "documentación en el sitio de Poche." msgid "Login" diff --git a/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mo b/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mo index 00178208..a7bb6f64 100644 Binary files a/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mo and b/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.mo differ diff --git a/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po b/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po index 4bc118fd..74a763c6 100644 --- a/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po +++ b/locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po @@ -67,7 +67,7 @@ msgstr "درون‌ریزی" msgid "Please execute the import script locally, it can take a very long time." msgstr "لطفاً برنامهٔ درون‌ریزی را به‌طور محلی اجرا کنید، شاید خیلی طول بکشد." -msgid "More infos in the official doc:" +msgid "More info in the official doc:" msgstr "اطلاعات بیشتر در راهنمای رسمی:" msgid "import from Pocket" @@ -79,13 +79,13 @@ msgstr "درون‌ریزی از Readability" msgid "import from Instapaper" msgstr "درون‌ریزی از Instapaper" -msgid "Export your poche datas" +msgid "Export your poche data" msgstr "داده‌های poche خود را برون‌بری کنید" msgid "Click here" msgstr "اینجا را کلیک کنید" -msgid "to export your poche datas." +msgid "to export your poche data." msgstr "برای برون‌بری داده‌های poche شما" msgid "back to home" @@ -99,11 +99,11 @@ msgstr "poche خود را نصب کنید" msgid "" "poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " +"Don't hesitate to read the documentation " "on poche website." msgstr "" "poche هنوز نصب نیست. برای نصب لطفاً فرم زیر را پر کنید. خواندن راهنما در وبگاه poche را از یاد نبرید." +"href='http://doc.inthepoche.com'>راهنما در وبگاه poche را از یاد نبرید." msgid "Login" msgstr "ورود" diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo index e3baaaa1..99e7142c 100644 Binary files a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo and b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo differ diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po index 779aadae..f105d180 100644 --- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po +++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po @@ -67,7 +67,7 @@ msgstr "Importer" msgid "Please execute the import script locally, it can take a very long time." msgstr "Merci d'exécuter l'import en local, cela peut prendre du temps." -msgid "More infos in the official doc:" +msgid "More info in the official doc:" msgstr "Plus d'infos sur la documentation officielle" msgid "import from Pocket" @@ -79,13 +79,13 @@ msgstr "import depuis Readability" msgid "import from Instapaper" msgstr "import depuis Instapaper" -msgid "Export your poche datas" +msgid "Export your poche data" msgstr "Exporter vos données de poche" msgid "Click here" msgstr "Cliquez-ici" -msgid "to export your poche datas." +msgid "to export your poche data." msgstr "pour exporter vos données de poche." msgid "back to home" @@ -99,11 +99,11 @@ msgstr "installez votre poche" msgid "" "poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " +"Don't hesitate to read the documentation " "on poche website." msgstr "" "poche n'est pas encore installé. Merci de remplir le formulaire suivant pour " -"l'installer. N'hésitez pas à lire la " +"l'installer. N'hésitez pas à lire la " "documentation sur le site de poche." msgid "Login" diff --git a/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo b/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo index e4d4fb3d..d6ef9890 100644 Binary files a/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo and b/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.mo differ diff --git a/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po b/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po index f4e69c07..429d5d55 100644 --- a/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po +++ b/locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po @@ -75,7 +75,7 @@ msgstr "" "Si prega di eseguire lo script di importazione a livello locale, può " "richiedere un tempo molto lungo." -msgid "More infos in the official doc:" +msgid "More info in the official doc:" msgstr "Maggiori info nella documentazione ufficiale" msgid "import from Pocket" @@ -87,13 +87,13 @@ msgstr "Importa da Readability" msgid "import from Instapaper" msgstr "Importa da Instapaper" -msgid "Export your poche datas" +msgid "Export your poche data" msgstr "Esporta i tuoi dati di poche" msgid "Click here" msgstr "Fai clic qui" -msgid "to export your poche datas." +msgid "to export your poche data." msgstr "per esportare i tuoi dati di poche." msgid "back to home" @@ -107,11 +107,11 @@ msgstr "installa il tuo poche" msgid "" "poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " +"Don't hesitate to read the documentation " "on poche website." msgstr "" "poche non è ancora installato. Si prega di riempire il modulo sottostante " -"per completare l'installazione. Leggere " +"per completare l'installazione. Leggere " "la documentazione sul sito di poche." msgid "Login" diff --git a/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo b/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo index eea7ff0b..970898db 100644 Binary files a/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo and b/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.mo differ diff --git a/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po b/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po index 78ddb158..6f647e36 100644 --- a/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po +++ b/locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po @@ -68,7 +68,7 @@ msgid "Please execute the import script locally, it can take a very long time." msgstr "" "Выполните сценарий импорта локально - он может занять слишком много времени." -msgid "More infos in the official doc:" +msgid "More info in the official doc:" msgstr "Больше сведений в официальной документации:" msgid "import from Pocket" @@ -80,13 +80,13 @@ msgstr "импортировать из Readability" msgid "import from Instapaper" msgstr "импортировать из Instapaper" -msgid "Export your poche datas" +msgid "Export your poche data" msgstr "Экспортировать данные poche" msgid "Click here" msgstr "Кликни сюда" -msgid "to export your poche datas." +msgid "to export your poche data." msgstr "чтобы экспортировать твои записи из poche." msgid "back to home" @@ -100,11 +100,11 @@ msgstr "установить твой poche" msgid "" "poche is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " +"Don't hesitate to read the documentation " "on poche website." msgstr "" "poche всё ещё не установлен. Надо заполнить форму ниже, чтобы установить " -"его. Неплохо также прочесть документацию " +"его. Неплохо также прочесть документацию " "на сайте poche." msgid "Login" diff --git a/themes/README.md b/themes/README.md index 9e5d6560..b5d925b4 100644 --- a/themes/README.md +++ b/themes/README.md @@ -24,7 +24,7 @@ That's all ! ## create a theme -Just have a look to this short documentation : http://inthepoche.com/doc/doku.php?id=designers:creating_theme +Just have a look to this short documentation : http://doc.inthepoche.com/doku.php?id=designers:creating_theme ## send a theme -- cgit v1.2.3 From b1bfd4cb0c06bb7fd730d634a57325dc34cfb407 Mon Sep 17 00:00:00 2001 From: William Theaker Date: Thu, 2 Jan 2014 21:04:56 -0500 Subject: Updated tag edit page --- themes/default/edit-tags.twig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/themes/default/edit-tags.twig b/themes/default/edit-tags.twig index 7116bba9..53852d39 100644 --- a/themes/default/edit-tags.twig +++ b/themes/default/edit-tags.twig @@ -11,10 +11,10 @@ no tags {% for tag in tags %}
  • {{ tag.value }} ✘
    • {% endfor %}
    - -

    {% trans "you can type several tags, separated by comma" %}

    + +

    {% trans "You can enter multiple tags, separated by commas." %}

    - +
    -{% trans "back to the article" %} -{% endblock %} \ No newline at end of file +{% trans "return to article" %} +{% endblock %} -- cgit v1.2.3 From aeea7c6af02d02cfed077eeab1b7fe34a4d4c5db Mon Sep 17 00:00:00 2001 From: William Theaker Date: Thu, 2 Jan 2014 21:15:41 -0500 Subject: Updated config page --- themes/default/config.twig | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/themes/default/config.twig b/themes/default/config.twig index c01556ba..10df726e 100644 --- a/themes/default/config.twig +++ b/themes/default/config.twig @@ -6,11 +6,11 @@ {% endblock %} {% block content %}

    {% trans "Poching links" %}

    -

    {% trans "There are several ways to poche a link::" %} (?)

    +

    {% trans "There are several ways to poche a link:" %} (?)

    • Firefox: {% trans "download the extension" %}
    • Chrome: {% trans "download the extension" %}
      • -
    • Android: {% trans "via f-droid" %} {% trans " or " %} {% trans "via Google Play" %}
      • +
    • Android: {% trans "via F-Droid" %} {% trans " or " %} {% trans "via Google Play" %}
    • Windows Phone: {% trans "download the application" %}
    • @@ -31,12 +31,12 @@

      {% trans "Feeds" %}

      {% if token == '' %} -

      {% trans "The token is empty, you have to generate it to use feeds. Click here to generate it." %}

      +

      {% trans "Your feed token is currently empty and must first be generated to enable feeds. Click here to generate it." %}

      {% else %}

      {% trans "You can regenerate your token: generate!." %}

      {% endif %} @@ -101,12 +101,12 @@ {% endif %}

      {% trans "Import" %}

      -

      {% trans "Please execute the import script locally, it can take a very long time." %}

      -

      {% trans "More info in the official docs:" %} inthepoche.com

      +

      {% trans "Please execute the import script locally as it can take a very long time." %}

      +

      {% trans "More info in the official docs:" %} inthepoche.com

      {% trans "Export your poche data" %}

      -- cgit v1.2.3 From 9de34d4e8430b8b2d994aa9b681ec9f11dabf0b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 3 Jan 2014 10:06:26 +0100 Subject: [fix] error in query to get entries and tags --- inc/poche/Database.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php index afe02a41..d8b63859 100644 --- a/inc/poche/Database.class.php +++ b/inc/poche/Database.class.php @@ -337,7 +337,7 @@ class Database { public function retrieveEntriesByTag($tag_id) { $sql = - "SELECT * FROM entries + "SELECT entries.* FROM entries LEFT JOIN tags_entries ON tags_entries.entry_id=entries.id WHERE tags_entries.tag_id = ?"; $query = $this->executeQuery($sql, array($tag_id)); @@ -348,7 +348,7 @@ class Database { public function retrieveTagsByEntry($entry_id) { $sql = - "SELECT * FROM tags + "SELECT tags.* FROM tags LEFT JOIN tags_entries ON tags_entries.tag_id=tags.id WHERE tags_entries.entry_id = ?"; $query = $this->executeQuery($sql, array($entry_id)); -- cgit v1.2.3 From 0b57c6825aa0bf88d10a2c420875f6cf9afe17c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 3 Jan 2014 10:15:05 +0100 Subject: [fix] bugs #374 and #376 - encoding in rss --- inc/poche/Poche.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 4f70afb7..d3eb71d2 100644 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -951,7 +951,7 @@ class Poche if (count($entries) > 0) { foreach ($entries as $entry) { $newItem = $feed->createNewItem(); - $newItem->setTitle(htmlentities($entry['title'])); + $newItem->setTitle($entry['title']); $newItem->setLink(Tools::getPocheUrl() . '?view=view&id=' . $entry['id']); $newItem->setDate(time()); $newItem->setDescription($entry['content']); -- cgit v1.2.3 From 4a84d94e91b2868145e222d235c1209ac9fe7f0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 3 Jan 2014 10:21:18 +0100 Subject: [add] config file for interviewmagazine.com --- inc/3rdparty/site_config/custom/interviewmagazine.com.txt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 inc/3rdparty/site_config/custom/interviewmagazine.com.txt diff --git a/inc/3rdparty/site_config/custom/interviewmagazine.com.txt b/inc/3rdparty/site_config/custom/interviewmagazine.com.txt new file mode 100644 index 00000000..a9d4f8ca --- /dev/null +++ b/inc/3rdparty/site_config/custom/interviewmagazine.com.txt @@ -0,0 +1,4 @@ +title: //title +body: //div[contains(@class, 'block')] + +test_url: http://www.interviewmagazine.com/film/spike-jonze \ No newline at end of file -- cgit v1.2.3 From cb4fba5a333ac18b40665502e3de74249106cad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 3 Jan 2014 10:22:12 +0100 Subject: [del] remove inthepoche.com config file, website has changed --- inc/3rdparty/site_config/custom/inthepoche.com.txt | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 inc/3rdparty/site_config/custom/inthepoche.com.txt diff --git a/inc/3rdparty/site_config/custom/inthepoche.com.txt b/inc/3rdparty/site_config/custom/inthepoche.com.txt deleted file mode 100644 index ede74b97..00000000 --- a/inc/3rdparty/site_config/custom/inthepoche.com.txt +++ /dev/null @@ -1,7 +0,0 @@ -title: //title -body: //div[@class='post-content'] - -prune: no -tidy: no - -test_url: http://www.inthepoche.com/?post/poche-hosting \ No newline at end of file -- cgit v1.2.3 From 4d058d48243e48876599dc006bb49ce28ef7db25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 3 Jan 2014 10:33:01 +0100 Subject: [fix] code display when printing a page was buggy --- themes/default/css/print.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/themes/default/css/print.css b/themes/default/css/print.css index 99c00bdf..625478e1 100644 --- a/themes/default/css/print.css +++ b/themes/default/css/print.css @@ -33,6 +33,10 @@ article { border: none !important; } +pre code { + line-height: 1.6em; +} + /* Add URL after links */ .vieworiginal a:after { content: " (" attr(href) ")"; -- cgit v1.2.3 From b5c1ed12273d72888b443e801123252d92f8c8ec Mon Sep 17 00:00:00 2001 From: FireFox Date: Fri, 3 Jan 2014 11:17:15 +0100 Subject: Change Permissions in pochePictures.php Stored Pictures are not accessible (on my server), when permission is set to 0705, but instead, when using 0755 (or for example to 0715) all is working as expected. So maybe it would be good, considering in changing the permission of created directories in the assets directory --- inc/poche/pochePictures.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/inc/poche/pochePictures.php b/inc/poche/pochePictures.php index 4e4a0b08..b0cfb9df 100644 --- a/inc/poche/pochePictures.php +++ b/inc/poche/pochePictures.php @@ -84,12 +84,12 @@ function create_assets_directory($id) { $assets_path = ABS_PATH; if(!is_dir($assets_path)) { - mkdir($assets_path, 0705); + mkdir($assets_path, 0715); } $article_directory = $assets_path . $id; if(!is_dir($article_directory)) { - mkdir($article_directory, 0705); + mkdir($article_directory, 0715); } return $article_directory; @@ -107,4 +107,4 @@ function remove_directory($directory) } return rmdir($directory); } -} \ No newline at end of file +} -- cgit v1.2.3 From 9bc32632af80130ca6aff968b800ceb43aa86576 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 3 Jan 2014 15:18:13 +0100 Subject: [fix] #375 Readability.com changed its export format --- inc/poche/Poche.class.php | 53 +++++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index d3eb71d2..e9ff7b46 100644 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -806,34 +806,37 @@ class Poche $url = NULL; $favorite = FALSE; $archive = FALSE; - foreach ($value as $attr => $attr_value) { - if ($attr == 'article__url') { - $url = new Url(base64_encode($attr_value)); - } - $sequence = ''; - if (STORAGE == 'postgres') { - $sequence = 'entries_id_seq'; - } - if ($attr_value == 'true') { - if ($attr == 'favorite') { - $favorite = TRUE; + foreach ($value as $item) { + foreach ($item as $attr => $value) { + if ($attr == 'article__url') { + $url = new Url(base64_encode($value)); } - if ($attr == 'archive') { - $archive = TRUE; + $sequence = ''; + if (STORAGE == 'postgres') { + $sequence = 'entries_id_seq'; + } + if ($value == 'true') { + if ($attr == 'favorite') { + $favorite = TRUE; + } + if ($attr == 'archive') { + $archive = TRUE; + } } } - } - # we can add the url - if (!is_null($url) && $url->isCorrect()) { - $this->action('add', $url, 0, TRUE); - $count++; - if ($favorite) { - $last_id = $this->store->getLastId($sequence); - $this->action('toggle_fav', $url, $last_id, TRUE); - } - if ($archive) { - $last_id = $this->store->getLastId($sequence); - $this->action('toggle_archive', $url, $last_id, TRUE); + + # we can add the url + if (!is_null($url) && $url->isCorrect()) { + $this->action('add', $url, 0, TRUE); + $count++; + if ($favorite) { + $last_id = $this->store->getLastId($sequence); + $this->action('toggle_fav', $url, $last_id, TRUE); + } + if ($archive) { + $last_id = $this->store->getLastId($sequence); + $this->action('toggle_archive', $url, $last_id, TRUE); + } } } } -- cgit v1.2.3 From 607e12b4f2ad9881ac8dd3195fc44c36375583f5 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 4 Jan 2014 21:50:08 +0100 Subject: Fixes bug 359 --- inc/3rdparty/FlattrItem.class.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/3rdparty/FlattrItem.class.php b/inc/3rdparty/FlattrItem.class.php index 0d3e69d0..711b4ee0 100644 --- a/inc/3rdparty/FlattrItem.class.php +++ b/inc/3rdparty/FlattrItem.class.php @@ -14,12 +14,12 @@ class FlattrItem { $flattrResponse = file_get_contents(CACHE . "/flattr/".$id.".cache"); if($flattrResponse != FALSE) { $result = json_decode($flattrResponse); - if (isset($result->message)){ + if (isset($result->message)){ if ($result->message == "flattrable") { $this->status = FLATTRABLE; } } - elseif ($result->link) { + elseif (is_object($result) && $result->link) { $this->status = FLATTRED; $this->flattrItemURL = $result->link; $this->numflattrs = $result->flattrs; -- cgit v1.2.3 From a562e3905ac67983b85853e5ace813b2de0e3807 Mon Sep 17 00:00:00 2001 From: adev Date: Sun, 5 Jan 2014 15:03:05 +0100 Subject: Create sqlite table tags_entries only if not already exists --- inc/poche/Database.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/poche/Database.class.php b/inc/poche/Database.class.php index d8b63859..04731821 100644 --- a/inc/poche/Database.class.php +++ b/inc/poche/Database.class.php @@ -81,7 +81,7 @@ class Database { if (STORAGE == 'sqlite') { $sql = ' - CREATE TABLE tags_entries ( + CREATE TABLE IF NOT EXISTS tags_entries ( id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL UNIQUE, entry_id INTEGER, tag_id INTEGER, -- cgit v1.2.3 From fcb5fd27e2fe7de36a9e2dffc818686a08ecc4db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 6 Jan 2014 08:32:28 +0100 Subject: [change] update poche version in compatibility test file --- poche_compatibility_test.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/poche_compatibility_test.php b/poche_compatibility_test.php index eed3c391..42faaa2c 100644 --- a/poche_compatibility_test.php +++ b/poche_compatibility_test.php @@ -1,5 +1,5 @@ =')); $pcre_ok = extension_loaded('pcre'); -- cgit v1.2.3 From d866e8be91de61a9b7dc40ae68c2390e0e05201d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 7 Jan 2014 13:13:24 +0100 Subject: [change] poche logo is now at SVG format, see #373 --- themes/default/_top.twig | 2 +- .../img/apple-touch-icon-144x144-precomposed.png | Bin 7349 -> 2361 bytes .../img/apple-touch-icon-72x72-precomposed.png | Bin 6168 -> 1375 bytes themes/default/img/apple-touch-icon.png | Bin 5803 -> 1174 bytes themes/default/img/logo.png | Bin 1350 -> 0 bytes themes/default/img/logo.svg | 8 ++++++++ 6 files changed, 9 insertions(+), 1 deletion(-) delete mode 100644 themes/default/img/logo.png create mode 100644 themes/default/img/logo.svg diff --git a/themes/default/_top.twig b/themes/default/_top.twig index b5f65028..083be152 100644 --- a/themes/default/_top.twig +++ b/themes/default/_top.twig @@ -1,6 +1,6 @@

      - {% if view == 'home' %}{% block logo %}logo poche{% endblock %} + {% if view == 'home' %}{% block logo %}logo poche{% endblock %} {% else %}{{ block('logo') }} {% endif %}

      diff --git a/themes/default/img/apple-touch-icon-144x144-precomposed.png b/themes/default/img/apple-touch-icon-144x144-precomposed.png index 557b479c..9e951230 100644 Binary files a/themes/default/img/apple-touch-icon-144x144-precomposed.png and b/themes/default/img/apple-touch-icon-144x144-precomposed.png differ diff --git a/themes/default/img/apple-touch-icon-72x72-precomposed.png b/themes/default/img/apple-touch-icon-72x72-precomposed.png index e167d3a4..263419b1 100644 Binary files a/themes/default/img/apple-touch-icon-72x72-precomposed.png and b/themes/default/img/apple-touch-icon-72x72-precomposed.png differ diff --git a/themes/default/img/apple-touch-icon.png b/themes/default/img/apple-touch-icon.png index 4d222fba..ac8a1cf0 100644 Binary files a/themes/default/img/apple-touch-icon.png and b/themes/default/img/apple-touch-icon.png differ diff --git a/themes/default/img/logo.png b/themes/default/img/logo.png deleted file mode 100644 index 5305c77d..00000000 Binary files a/themes/default/img/logo.png and /dev/null differ diff --git a/themes/default/img/logo.svg b/themes/default/img/logo.svg new file mode 100644 index 00000000..865da440 --- /dev/null +++ b/themes/default/img/logo.svg @@ -0,0 +1,8 @@ + + + + + + + + -- cgit v1.2.3 From e1cf0fda27df031e478e55d6df08823d42fe2220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 7 Jan 2014 13:15:43 +0100 Subject: [add] user_agent in file_get_contents --- inc/poche/Poche.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index e9ff7b46..76a73be2 100644 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -333,7 +333,9 @@ class Poche switch ($action) { case 'add': - $json = file_get_contents(Tools::getPocheUrl() . '/inc/3rdparty/makefulltextfeed.php?url='.urlencode($url->getUrl()).'&max=5&links=preserve&exc=&format=json&submit=Create+Feed'); + $options = array('http' => array('user_agent' => 'poche')); + $context = stream_context_create($options); + $json = file_get_contents(Tools::getPocheUrl() . '/inc/3rdparty/makefulltextfeed.php?url='.urlencode($url->getUrl()).'&max=5&links=preserve&exc=&format=json&submit=Create+Feed', false, $context); $content = json_decode($json, true); $title = $content['rss']['channel']['item']['title']; $body = $content['rss']['channel']['item']['description']; -- cgit v1.2.3