From 603ecb0052dfafd244259819b6fc7fb711f32c26 Mon Sep 17 00:00:00 2001 From: Dmitry Sandalov Date: Sat, 12 Apr 2014 00:08:11 +0400 Subject: [PATCH 01/57] added missing image to dmagenta theme --- themes/dmagenta/img/dmagenta/rss.png | Bin 0 -> 288 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 themes/dmagenta/img/dmagenta/rss.png diff --git a/themes/dmagenta/img/dmagenta/rss.png b/themes/dmagenta/img/dmagenta/rss.png new file mode 100644 index 0000000000000000000000000000000000000000..21bad1a174bf152563552aff0e1a397fee05a82b GIT binary patch literal 288 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt^vJzX3_ zEPBsgF!XW`6li_u-9N+;K)*BZpl-y?R7O3=4IFw-8+chZalBq4=(BL@)Ega1 zyC$q?{eJL+$D_?g%m)&8-vX5;);}d*q9%;X1w!LziDT>u$o#d_? zI?N{v+PLqCI{Y=7z@xq*iFtVi|Af<_r$4e4^9Zfz^?c>OaX-(77i|7FoYlYN)pZy2 z6-G$>IQehFAMI_^8T$%bWbd?FgvPLDD93k%=O%Ut@)gLY&8pzpy!B6Dq~LS2zij6# iG=H>CRh{}ZJK+9#5j$t+ Date: Sun, 13 Apr 2014 00:02:03 +0200 Subject: [PATCH 02/57] Improved french translation --- locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo | Bin 12818 -> 12863 bytes locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po | 77 +++++++------------- 2 files changed, 27 insertions(+), 50 deletions(-) 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 7bcde861224a34801cc7357fadebb2e416e96073..2015f6158a0426d9fef6a951df01f0d99f0bc7c3 100755 GIT binary patch delta 3692 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 Xo@+_5!OrJbyepGO`Fd}q7Wn@MfNXfG 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 bd8dd9b88..904a4178c 100755 --- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po +++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po @@ -4,7 +4,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-25 18:33+0300\n" "PO-Revision-Date: \n" -"Last-Translator: Gilles WITTEZAELE \n" +"Last-Translator: Amaury Carrade \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -84,13 +84,8 @@ msgstr "Une version de développement plus récente est disponible." msgid "Feeds" msgstr "Flux" -msgid "" -"Your feed token is currently empty and must first be generated to enable " -"feeds. Click here to generate it." -msgstr "" -"Votre jeton de flux est actuellement vide et doit d'abord être généré pour " -"activer les flux. Cliquez ici pour " -"le générer." +msgid "Your feed token is currently empty and must first be generated to enable feeds. Click here to generate it." +msgstr "Votre jeton de flux est actuellement vide et doit d'abord être généré pour activer les flux. Cliquez ici pour le générer." msgid "Unread feed" msgstr "Flux des non lus" @@ -107,12 +102,8 @@ msgstr "Votre jeton :" msgid "Your user id:" msgstr "Votre ID utilisateur :" -msgid "" -"You can regenerate your token: generate!" -"." -msgstr "" -"Vous pouvez regénérer votre jeton : génération !." +msgid "You can regenerate your token: generate!." +msgstr "Vous pouvez regénérer votre jeton : génération !." msgid "Change your theme" msgstr "Changer votre thème" @@ -144,11 +135,8 @@ msgstr "Répétez votre nouveau mot de passe :" msgid "Import" msgstr "Importer" -msgid "" -"Please execute the import script locally as it can take a very long time." -msgstr "" -"Merci d'exécuter le script d'importation en local car cela peut prendre du " -"temps." +msgid "Please execute the import script locally as it can take a very long time." +msgstr "Merci d'exécuter le script d'importation en local car cela peut prendre du temps." msgid "More info in the official documentation:" msgstr "Plus d'infos dans la documentation officielle :" @@ -196,12 +184,8 @@ msgstr "retourner à l'article" msgid "plop" msgstr "plop" -msgid "" -"You can check your configuration " -"here." -msgstr "" -"Vous pouvez vérifier votre configuration ici." +msgid "You can check your configuration here." +msgstr "Vous pouvez vérifier votre configuration ici." msgid "favoris" msgstr "favoris" @@ -263,14 +247,8 @@ msgstr "installation" msgid "install your wallabag" msgstr "installez votre wallabag" -msgid "" -"wallabag is still not installed. Please fill the below form to install it. " -"Don't hesitate to read the documentation " -"on wallabag website." -msgstr "" -"wallabag n'est pas encore installé. Merci de remplir le formulaire suivant " -"pour l'installer. N'hésitez pas à lire la " -"documentation sur le site de wallabag." +msgid "wallabag is still not installed. Please fill the below form to install it. Don't hesitate to read the documentation on wallabag website." +msgstr "wallabag n'est pas encore installé. Merci de remplir le formulaire suivant pour l'installer. N'hésitez pas à lire la documentation sur le site de wallabag." msgid "Login" msgstr "Nom d'utilisateur" @@ -288,8 +266,7 @@ msgid "Login to wallabag" msgstr "Se connecter à wallabag" msgid "you are in demo mode, some features may be disabled." -msgstr "" -"vous êtes en mode démo, certaines fonctionnalités peuvent être désactivées." +msgstr "vous êtes en mode démo, certaines fonctionnalités peuvent être désactivées." msgid "Username" msgstr "Nom d'utilisateur" @@ -310,7 +287,7 @@ msgid "Back to top" msgstr "Haut de page" msgid "Mark as read" -msgstr "Marquer comme lu / non lu" +msgstr "Marquer comme lu" msgid "Favorite" msgstr "Favoris" @@ -418,9 +395,7 @@ msgid "a more recent development version is available." msgstr "une version de développement plus récente est disponible." msgid "Please execute the import script locally, it can take a very long time." -msgstr "" -"Merci d'exécuter le script d'importation en local car cela peut prendre du " -"temps." +msgstr "Merci d'exécuter le script d'importation en local car cela peut prendre du temps." msgid "More infos in the official doc:" msgstr "Plus d'infos dans la documentation officielle :" @@ -473,12 +448,8 @@ msgstr "en mode démo, vous ne pouvez pas mettre à jour le mot de passe" msgid "your password has been updated" msgstr "votre mot de passe a été mis à jour" -msgid "" -"the two fields have to be filled & the password must be the same in the two " -"fields" -msgstr "" -"les deux champs doivent être remplis & le mot de passe doit être le même " -"dans les deux" +msgid "the two fields have to be filled & the password must be the same in the two fields" +msgstr "les deux champs doivent être remplis & le mot de passe doit être le même dans les deux" msgid "still using the \"" msgstr "utilise encore \"" @@ -505,16 +476,16 @@ msgid "login failed: bad login or password" msgstr "échec de l'identification : mauvais identifiant ou mot de passe" msgid "import from instapaper completed" -msgstr "Importation depuis Instapaper complété" +msgstr "Importation depuis Instapaper achevée" msgid "import from pocket completed" -msgstr "Importation depuis Pocket complété" +msgstr "Importation depuis Pocket achevée" msgid "import from Readability completed. " -msgstr "Importation depuis Readability complété" +msgstr "Importation depuis Readability achevée" msgid "import from Poche completed. " -msgstr "Importation depuis Pocket complété" +msgstr "Importation depuis Pocket achevée" msgid "Unknown import provider." msgstr "Format d'importation inconnu." @@ -523,7 +494,7 @@ msgid "Incomplete inc/poche/define.inc.php file, please define \"" msgstr "Fichier inc/poche/define.inc.php incomplet, merci de définir \"" msgid "Could not find required \"" -msgstr "Ne peut pas trouver \"" +msgstr "Impossible de trouver \"" msgid "Uh, there is a problem while generating feeds." msgstr "Hum, il y a un problème lors de la génération des flux." @@ -534,6 +505,12 @@ msgstr "Cache effacé." msgid "Oops, it seems you don't have PHP 5." msgstr "Oups, vous ne semblez pas avoir PHP 5." +msgid "search" +msgstr "rechercher" + +msgid "Search" +msgstr "Rechercher" + #~ msgid "poche it!" #~ msgstr "pochez-le !" From 44fd0faa23fc5abc2028c8400166c00b653e12b3 Mon Sep 17 00:00:00 2001 From: Justin Plock Date: Mon, 14 Apr 2014 09:40:35 -0400 Subject: [PATCH 03/57] Added IF NOT EXISTS --- install/postgres.sql | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/install/postgres.sql b/install/postgres.sql index fe8f559ca..1d73dfcba 100644 --- a/install/postgres.sql +++ b/install/postgres.sql @@ -1,10 +1,10 @@ -CREATE TABLE config ( +CREATE TABLE IF NOT EXISTS config ( id bigserial primary key, name varchar(255) NOT NULL, value varchar(255) NOT NULL ); -CREATE TABLE entries ( +CREATE TABLE IF NOT EXISTS entries ( id bigserial primary key, title varchar(255) NOT NULL, url varchar(255) NOT NULL, @@ -14,7 +14,7 @@ CREATE TABLE entries ( user_id integer NOT NULL ); -CREATE TABLE users ( +CREATE TABLE IF NOT EXISTS users ( id bigserial primary key, username varchar(255) NOT NULL, password varchar(255) NOT NULL, @@ -22,20 +22,20 @@ CREATE TABLE users ( email varchar(255) NOT NULL ); -CREATE TABLE users_config ( +CREATE TABLE IF NOT EXISTS users_config ( id bigserial primary key, user_id integer NOT NULL, name varchar(255) NOT NULL, value varchar(255) NOT NULL ); -CREATE TABLE tags ( +CREATE TABLE IF NOT EXISTS tags ( id bigserial primary key, value varchar(255) NOT NULL ); -CREATE TABLE tags_entries ( +CREATE TABLE IF NOT EXISTS tags_entries ( id bigserial primary key, entry_id integer NOT NULL, tag_id integer NOT NULL -) \ No newline at end of file +) From 6212acfc813781501177674baa3139ceef62f78f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 15 Apr 2014 21:49:00 +0200 Subject: [PATCH 04/57] [fix] rss feed content type set to text/xml #636 --- .../libraries/feedwriter/FeedWriter.php | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/inc/3rdparty/libraries/feedwriter/FeedWriter.php b/inc/3rdparty/libraries/feedwriter/FeedWriter.php index df4c8b4b7..79639c0c2 100755 --- a/inc/3rdparty/libraries/feedwriter/FeedWriter.php +++ b/inc/3rdparty/libraries/feedwriter/FeedWriter.php @@ -89,18 +89,11 @@ define('JSONP', 3, true); */ public function genarateFeed() { - if ($this->version == RSS2) { -// header('Content-type: text/xml; charset=UTF-8'); - // this line prevents Chrome 20 from prompting download - // used by Google: https://news.google.com/news/feeds?ned=us&topic=b&output=rss -// header('X-content-type-options: nosniff'); - } elseif ($this->version == JSON) { -// header('Content-type: application/json; charset=UTF-8'); - $this->json = new stdClass(); - } elseif ($this->version == JSONP) { -// header('Content-type: application/javascript; charset=UTF-8'); - $this->json = new stdClass(); - } + header('Content-type: text/xml; charset=UTF-8'); + // this line prevents Chrome 20 from prompting download + // used by Google: https://news.google.com/news/feeds?ned=us&topic=b&output=rss + header('X-content-type-options: nosniff'); + $this->printHead(); $this->printChannels(); $this->printItems(); From c2cf7075c24c1539befd4ba09881eed761c9d769 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Tue, 22 Apr 2014 10:45:09 +0300 Subject: [PATCH 05/57] print view fixed in baggy; print link added; read percent added in default theme; archive and favorite re-factored to be ajax action in article view --- inc/poche/Poche.class.php | 16 ++++++- inc/poche/config.inc.php.new | 4 ++ themes/baggy/css/main.css | 3 ++ themes/baggy/css/print.css | 14 ++++++ themes/baggy/fonts/icomoon.eot | Bin 3724 -> 3896 bytes themes/baggy/fonts/icomoon.svg | 17 ++++++- themes/baggy/fonts/icomoon.ttf | Bin 3560 -> 3732 bytes themes/baggy/fonts/icomoon.woff | Bin 3528 -> 3664 bytes themes/baggy/view.twig | 49 +++++++++++++++++++- themes/default/css/style-default.css | 4 ++ themes/default/css/style.css | 13 +++++- themes/default/img/default/print.png | Bin 0 -> 321 bytes themes/default/view.twig | 64 ++++++++++++++++++++++++++- 13 files changed, 176 insertions(+), 8 deletions(-) mode change 100755 => 100644 themes/baggy/fonts/icomoon.eot mode change 100755 => 100644 themes/baggy/fonts/icomoon.svg mode change 100755 => 100644 themes/baggy/fonts/icomoon.ttf mode change 100755 => 100644 themes/baggy/fonts/icomoon.woff mode change 100644 => 100755 themes/default/css/style-default.css create mode 100755 themes/default/img/default/print.png diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 811895dca..dcfdc167d 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -434,12 +434,24 @@ class Poche case 'toggle_fav' : $this->store->favoriteById($id, $this->user->getId()); Tools::logm('mark as favorite link #' . $id); - Tools::redirect(); + if ( Tools::isAjaxRequest() ) { + echo 1; + exit; + } + else { + Tools::redirect(); + } break; case 'toggle_archive' : $this->store->archiveById($id, $this->user->getId()); Tools::logm('archive link #' . $id); - Tools::redirect(); + if ( Tools::isAjaxRequest() ) { + echo 1; + exit; + } + else { + Tools::redirect(); + } break; case 'archive_all' : $this->store->archiveAll($this->user->getId()); diff --git a/inc/poche/config.inc.php.new b/inc/poche/config.inc.php.new index 83b3c4c02..3b08c212f 100755 --- a/inc/poche/config.inc.php.new +++ b/inc/poche/config.inc.php.new @@ -42,6 +42,10 @@ define ('FLATTR_API', 'https://api.flattr.com/rest/v2/things/lookup/?url='); define ('NOT_FLATTRABLE', '0'); define ('FLATTRABLE', '1'); define ('FLATTRED', '2'); +// display or not print link in article view +define ('SHOW_PRINTLINK', '1'); +// display or not percent of read in article view. Affects only default theme. +define ('SHOW_READPERCENT', '1'); define ('ABS_PATH', 'assets/'); define ('DEFAULT_THEME', 'baggy'); diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 0991dbede..52d8ecaa4 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -746,6 +746,9 @@ margin-top:1em; .icon-rss:before { content: "\e808"; } +.icon-print:before { + content: "\e80d"; +} /* ========================================================================== Icon selected diff --git a/themes/baggy/css/print.css b/themes/baggy/css/print.css index 9aefa779e..9dd6d295c 100755 --- a/themes/baggy/css/print.css +++ b/themes/baggy/css/print.css @@ -17,6 +17,7 @@ img { /* Hide useless blocks */ body > header, +#article_toolbar, #links, #sort, body > footer, @@ -46,3 +47,16 @@ abbr[title]:after { .pagination span.current { border-style: dashed; } + +#main { + width: 100%; + padding: 0; + margin: 0; + margin-left: 0; + padding-right: 0; + padding-bottom: 0; +} + +#article { + width: 100%; +} diff --git a/themes/baggy/fonts/icomoon.eot b/themes/baggy/fonts/icomoon.eot old mode 100755 new mode 100644 index 02f53b36d030547fa28eaf6d42f7bcfb7197ec11..563235166982e94bcbb1275d5f7fe0122b742aa8 GIT binary patch delta 488 zcmeB?-66+j!Oy@jg>NF88B2eX8s}t1UXh6*$^3^I7#Q{daYAx#V!;cKiO1yXTQ~K~ zGcYh#Ffec($w*C1VGz66&A`B815{;}0Tf_<#P|)!F9GsZGIC2Q7$XCcq%uRKX*m4cX2kK$8EXXe|VPFQzFz|uQ zQ($0bnw-q&z{op!38O0`@8(yGbC|T4)btq{89LcOKtPb6O^Ka{pOcfHhh33{je~=g znUkG^iJg^^owaN829{3tdKQp*Obm<%fF>(2s4`eFFbFG(DzYjn@iECVipVipGm0vj z8XMU$*)p2wF)1@En;MG>i|{ciE9o(rn%FTJ8_6+=HZU^$XJAbD=fKX*$;!&f&7Q!> zkN{&h95~R<%+A5e%E8VIqZto4D1g-YEC8u$XaKRn%zpJ#ZOdU6bpIiu+0DLes8ObnAB@#qM#CV};dGGs7-J<7l|xsXqI JvoUWZBLFKfShfHF delta 312 zcmdlX*CWf;!^gnzf_EaD8Hj7#Q{daYAx#V!;ddiO1yXcX!H2FfcGy zFfee*WTYmh{ExeLm4ShK3Q(0<22g1lSwMackgt%Jn49V%vE>?&-vhM6vLL^>gn=0-!@zq2B+tOi zG&z~kfstqO5=K`>p3Scq=P+q8nyBeBGBR|sfq;M@KbsOe4?ia-KM%VSGdnvc3kwGa zJ2ObGbMpq4PIhHRka-LYFNKOX#q-;IW#DE4^Uo{z^MDv2dNK>IIitvA8{UA)6L__R ZfTAExA`BT2$1pHWR^%7ne4jUx5dicvL7o5r diff --git a/themes/baggy/fonts/icomoon.svg b/themes/baggy/fonts/icomoon.svg old mode 100755 new mode 100644 index d9c35b98d..b45861363 --- a/themes/baggy/fonts/icomoon.svg +++ b/themes/baggy/fonts/icomoon.svg @@ -1,7 +1,21 @@ -Generated by IcoMoon + + +{ + "fontFamily": "icomoon", + "majorVersion": 1, + "minorVersion": 0, + "version": "Version 1.0", + "fontId": "icomoon", + "psName": "icomoon", + "subFamily": "Regular", + "fullName": "icomoon", + "description": "Generated by IcoMoon" +} + + @@ -23,4 +37,5 @@ + \ No newline at end of file diff --git a/themes/baggy/fonts/icomoon.ttf b/themes/baggy/fonts/icomoon.ttf old mode 100755 new mode 100644 index 3860dd04141f2df89cde9392742608b8407f95b8..bb1f21f888d3786dd6db4bc0d75ab322b1eaac75 GIT binary patch delta 503 zcmaDMJw>*jfsuiMft#U$ftkU;KUm+0L+RgPpvWE|PDsv8EO_DZtc`(zQ3l8lNlz>; z0MY_LK8WT>pn-PA7+pny(pVnqRi6hjsR1Fr;-uaK9Ro9ZI5&d587(Up;Rvm4_aCM_m4eMUxxPBst_5aef5V&~!K1}g>zVMS3zRz)Q~CRs)i zIVNjHQAJZ@BReKrMiV_IWoBhlV^LudJ|<-)Jtk8VJ0@czIVRBtMuz_kj0yi7*tt1b zSvk4c6Brp1VC;qi2ilq0Iapaa*qLE8;{gW+kUF0QAXNJ#ZOdh!l#b4Jn0AGiaUm>4G8@#qM#CV};dGGs7- RJ<7l|`693I=6;??MgVj>T4MkJ delta 331 zcmbOt`$D>&fsuiMft#U$ftkU;KUm+0L+RfkpvWE|PDsv8EO_Dmtc`(zQ3l8lNlz>; z0MY_LK8WT>q?-6WMxIHGu8cgJ-5BREX)&6p=`%7ibh3effFM7c5<3q+CnrA- zyAm@yJ0}YZ2M0SdNUn1;4@)PzGRWUR@KUIFQ#`-TR|ak-F#o)QKM#ljq9-Ttm@|q@ hp1~6^`3;Yj5Kt7PNrWK-;syq$$&Gx%o2_{x83C8^Lnr_M diff --git a/themes/baggy/fonts/icomoon.woff b/themes/baggy/fonts/icomoon.woff old mode 100755 new mode 100644 index c3a91ed7fab59be57983b11dacfb8bc455545bb1..bab137795473159c2c2c0c176cfea5d3dce56ec7 GIT binary patch delta 502 zcmX>heL+U7+~3X3KP1GTfq^f8fr|kM_&69CCvW5xo2bKG-^swh)tR)Wf2Du0z7Ych zcLPv90fae}{vA%vO)LP4Jpl4UK=_5nv$piaVxSn036ReL#R3_ri77xa8zA2djKwZ? zX8;9(VkJPn3J5blV*HkoTT%fOn*rp5&69s_#AuP5SOGHd4N#B`j70+&@)C1Xfnr}6 z7#J-<*hON?wSxR&pkaIl6JL1hUgMVqD!nZTA~}HsSA!6P7$YMGzo4*~w1TRZzKNxs zvxjd`cuZni_T*T`RK8MI3j-Gh1}4T%24M!#$)_2$nK;Wge`Ea1QU6`!M~LY6Dc#-P zzo&Gwe*cm!`X{8DwX(amw!4y}`?m>ecje65x!oMEySsmjfYf~#dEL!Aw|nNy?ztS@ z-+}UTYiCw=bNm+heMR(l2vFYSJCFow{4V`{iD-9SV`E)+U3cTu?it-PrcMPC-BTO8 z>p1v+OcD7pMU<_Z2NWxl|8O}o@=kW(b_J4c+~)F(K(DDK^~dwud}ZKf0;*tOIA47t d9Y#;S!)?weI$4A#fD0lSz`!87Ig2Nb5da2KlaT-b delta 360 zcmca0b3$6I+~3X3KP1GTfr0k~0~Z4j@HQ|oOcYbB=U`yq;;`$RYv~`XZvzS zFo)8=L&>>`1q=+_F+hF@2)}TD)|Q@F3=-P_wT6`6?jH{D|>uMs7(30|So;kRJfTvd@heEpihpfClma4PamcW03%cyu{p8pjZwA z1EVDfyGU%gR*+v@0(AF^i7z~LF7V3&m0lGDk(@w+^S=;-C?g{Wzo4*~w1TRZzKNxs zvxjd`cuZp2$>L#Pi#HW#DE4@)#J-EBN!k=*bB@=8PhfXYd37-3#=G$mUNxaf|>g CpipW6 diff --git a/themes/baggy/view.twig b/themes/baggy/view.twig index ffb512a38..62af2516e 100755 --- a/themes/baggy/view.twig +++ b/themes/baggy/view.twig @@ -8,13 +8,14 @@ @@ -32,6 +33,50 @@ \ No newline at end of file From 009669360d46645d8f84f444fe0f6895811f51a3 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Sat, 24 May 2014 11:21:43 +0300 Subject: [PATCH 53/57] fix of onmouseover displaying of wallbabag a link in wallabag form in default theme --- themes/default/css/style.css | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/themes/default/css/style.css b/themes/default/css/style.css index 11a8ea1c0..e58ef81a1 100755 --- a/themes/default/css/style.css +++ b/themes/default/css/style.css @@ -384,8 +384,8 @@ a#bagit-form-close { background-color: #000; color: #fff; padding: 0 4px 1px 3px; - font-weight: bold; - font-size: 0.7em; + font-weight: bold; + font-size: 0.7em; border-radius: 4px; } .add-to-wallabag-link-after:hover, .add-to-wallabag-link-after:active { @@ -394,6 +394,23 @@ a#bagit-form-close { .add-to-wallabag-link-after:visited { color: #999; } +a.add-to-wallabag-link-after { + visibility: hidden; + position: absolute; + opacity: 0; + transition-duration: 2s; + transition-timing-function: ease-out; +} +#article article a:hover + a.add-to-wallabag-link-after, a.add-to-wallabag-link-after:hover { + opacity: 1; + visibility: visible; + transition-duration: .3s; + transition-timing-function: ease-in; +} +a.add-to-wallabag-link-after:after { + content: "w"; +} + #add-link-result { display: inline; From 0b9bb8cb7868f24137c5d8b85c39cc88ea877411 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Mon, 26 May 2014 14:29:18 +0300 Subject: [PATCH 54/57] add dailymotion videos, issue #708 --- inc/3rdparty/site_config/custom/dailymotion.com.txt | 12 ++++++++++++ inc/poche/Poche.class.php | 11 ++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) create mode 100755 inc/3rdparty/site_config/custom/dailymotion.com.txt diff --git a/inc/3rdparty/site_config/custom/dailymotion.com.txt b/inc/3rdparty/site_config/custom/dailymotion.com.txt new file mode 100755 index 000000000..0cad808f9 --- /dev/null +++ b/inc/3rdparty/site_config/custom/dailymotion.com.txt @@ -0,0 +1,12 @@ +title: //title +body: //iframe + +replace_string(): _ + +single_page_link: //link[@type='application/xml+oembed'] + +prune: no +tidy: no + +http://www.dailymotion.com/video/x1vk5oh_before-they-were-on-game-of-thrones_people diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 1b69cd619..37cf66a3e 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -1142,11 +1142,12 @@ class Poche * return new purifier object with actual config */ protected function getPurifier() { - $config = HTMLPurifier_Config::createDefault(); - $config->set('Cache.SerializerPath', CACHE); - $config->set('HTML.SafeIframe', true); - $config->set('URI.SafeIframeRegexp', '%^(https?:)?//(www\.youtube(?:-nocookie)?\.com/embed/|player\.vimeo\.com/video/)%'); //allow YouTube and Vimeo$purifier = new HTMLPurifier($config); - + $config = HTMLPurifier_Config::createDefault(); + $config->set('Cache.SerializerPath', CACHE); + $config->set('HTML.SafeIframe', true); + //allow YouTube, Vimeo and dailymotion videos + $config->set('URI.SafeIframeRegexp', '%^(https?:)?//(www\.youtube(?:-nocookie)?\.com/embed/|player\.vimeo\.com/video/|www\.dailymotion\.com/embed/video/)%'); + return new HTMLPurifier($config); } From 3dc8d84229ed0f3ccd40b44420ed6e818a6edea9 Mon Sep 17 00:00:00 2001 From: Maryana Rozhankivska Date: Thu, 29 May 2014 16:35:00 +0300 Subject: [PATCH 55/57] fix of uninitialized object warning, issue #710 --- inc/3rdparty/libraries/feedwriter/FeedWriter.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/inc/3rdparty/libraries/feedwriter/FeedWriter.php b/inc/3rdparty/libraries/feedwriter/FeedWriter.php index 777556903..aa064afba 100755 --- a/inc/3rdparty/libraries/feedwriter/FeedWriter.php +++ b/inc/3rdparty/libraries/feedwriter/FeedWriter.php @@ -97,13 +97,16 @@ define('JSONP', 3, true); header('X-content-type-options: nosniff'); } elseif ($this->version == JSON) { header('Content-type: application/json; charset=UTF-8'); - $this->json = new stdClass(); } elseif ($this->version == JSONP) { header('Content-type: application/javascript; charset=UTF-8'); - $this->json = new stdClass(); } } + if ($this->version == JSON || $this->version == JSONP) { + $this->json = new stdClass(); + } + + $this->printHead(); $this->printChannels(); $this->printItems(); @@ -202,7 +205,7 @@ define('JSONP', 3, true); public function setDescription($description) { $tag = ($this->version == ATOM)? 'subtitle' : 'description'; - $this->setChannelElement($tag, $desciption); + $this->setChannelElement($tag, $description); } /** From 79024eb004bfb9de77ec60d648315888e70033ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 29 May 2014 18:32:55 +0200 Subject: [PATCH 56/57] fix #344 FQDN with non-standard ports broken --- inc/poche/Tools.class.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/inc/poche/Tools.class.php b/inc/poche/Tools.class.php index 7f0640207..8073a3fe8 100755 --- a/inc/poche/Tools.class.php +++ b/inc/poche/Tools.class.php @@ -60,6 +60,10 @@ class Tools } $host = (isset($_SERVER['HTTP_X_FORWARDED_HOST']) ? $_SERVER['HTTP_X_FORWARDED_HOST'] : (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : $_SERVER['SERVER_NAME'])); + + if (strpos($host, ':') !== false) { + $serverport = ''; + } return 'http' . ($https ? 's' : '') . '://' . $host . $serverport . $scriptname; From 8038b38802769031e050c753fc0a388a2276629e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 29 May 2014 18:52:34 +0200 Subject: [PATCH 57/57] 1.7, premium version :) --- index.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/index.php b/index.php index 79838ed91..472e0fabc 100755 --- a/index.php +++ b/index.php @@ -8,7 +8,7 @@ * @license http://www.wtfpl.net/ see COPYING file */ -define ('POCHE', '1.6.1'); +define ('POCHE', '1.7.0'); require 'check_setup.php'; require_once 'inc/poche/global.inc.php';