Release wallabag 2.3.8

Merge pull request #3966 from wallabag/prepare-2.3.8
Prepare 2.3.8 release
2019-05-14 11:24:07 +02:00 · 2019-05-14 11:14:37 +02:00 · 2019-05-14 10:16:46 +02:00 · 2019-05-14 09:36:46 +02:00 · 2019-05-13 14:04:33 +02:00 · 2019-05-13 06:40:16 +02:00
33 changed files with 453 additions and 207 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,21 @@
 # Changelog

+## [2.3.8](https://github.com/wallabag/wallabag/tree/2.3.8)
+   [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.7...2.3.8)
+
+### Fixes
+
+- Jump to 2.3.8-dev [#3897](https://github.com/wallabag/wallabag/pull/3897)
+- material: fix left padding on non-entry pages [#3901](https://github.com/wallabag/wallabag/pull/3901)
+- Make dev/install/update script posix compatible [#3860](https://github.com/wallabag/wallabag/pull/3860)
+- epub: fix exception when articles have the same title [#3908](https://github.com/wallabag/wallabag/pull/3908)
+- Fix PHP warning [#3909](https://github.com/wallabag/wallabag/pull/3909)
+- Add ability to match many domains for credentials [#3937](https://github.com/wallabag/wallabag/pull/3937)
+- material: add metadata to list view [#3942](https://github.com/wallabag/wallabag/pull/3942)
+- Enable no-referrer on img tags, enable strict-origin-when-cross-origin by default [#3943](https://github.com/wallabag/wallabag/pull/3943)
+- Remove preview picture from share view page#3922
+- Fix Intl Locale issue [#3964](https://github.com/wallabag/wallabag/pull/3964)
+
 ## [2.3.7](https://github.com/wallabag/wallabag/tree/2.3.7)
   [Full Changelog](https://github.com/wallabag/wallabag/compare/2.3.6...2.3.7)

--- a/app/Resources/static/themes/material/css/cards.scss
+++ b/app/Resources/static/themes/material/css/cards.scss
@ -18,6 +18,24 @@ main {
  overflow: hidden;
 }

+@mixin mixin-reading-time {
+  .reading-time {
+    display: inline-flex;
+    vertical-align: middle;
+
+    .card-reading-time,
+    .card-created-at {
+      display: inline-flex;
+    }
+
+    span {
+      margin-right: 5px;
+    }
+
+    @content;
+  }
+}
+
 .card {
  .card-content .card-title,
  .card-reveal .card-title {
@ -98,19 +116,7 @@ main {
      margin-right: 5px !important;
    }

-    .reading-time {
-      display: inline-flex;
-      vertical-align: middle;
-
-      .card-reading-time,
-      .card-created-at {
-        display: inline-flex;
-      }
-
-      span {
-        margin-right: 5px;
-      }
-    }
+    @include mixin-reading-time;
  }

  .card-image {
@ -224,10 +230,18 @@ a.original:not(.waves-effect) {
  }

  div.metadata {
+    overflow: hidden;
+    height: 1.5em;
+    display: flex;
+
+    ul.tags {
+      margin-left: 4px;
+    }
+
    .chip {
      background-color: $blueAccentColor;
      padding: 0 7px;
-      margin: auto 2px;
+      margin: auto 1px;
      border-radius: 6px;
      line-height: 22px;
      height: 22px;
@ -244,6 +258,16 @@ a.original:not(.waves-effect) {
        padding-left: 8px;
      }
    }
+
+    @include mixin-reading-time {
+      padding: 0 5px;
+      flex-wrap: wrap;
+      margin-left: auto;
+
+      i.material-icons {
+        font-size: 20px;
+      }
+    }
  }

  div.card-content {
--- a/app/Resources/static/themes/material/css/media_queries.scss
+++ b/app/Resources/static/themes/material/css/media_queries.scss
@ -19,7 +19,7 @@
 }

@media screen and (min-width: 993px) {
-  main #content {
+  body.entry main #content {
    padding-left: 70px;
  }
 }
@ -173,6 +173,10 @@
  .row .col {
    padding: 0;
  }
+
+  .card-stacked div.metadata .reading-time {
+    display: none;
+  }
 }

@media screen and (max-width: 310px),
--- a/app/config/wallabag.yml
+++ b/app/config/wallabag.yml
@ -1,5 +1,5 @@
 wallabag_core:
-    version: 2.3.7
+    version: 2.3.8
    paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
    languages:
        en: 'English'
--- a/composer.json
+++ b/composer.json
@ -86,7 +86,8 @@
        "friendsofsymfony/jsrouting-bundle": "^1.6.3",
        "bdunogier/guzzle-site-authenticator": "^1.0.0",
        "defuse/php-encryption": "^2.1",
-        "html2text/html2text": "^4.1"
+        "html2text/html2text": "^4.1",
+        "sulu/symfony-intl-fix": "^1.0"
    },
    "require-dev": {
        "doctrine/doctrine-fixtures-bundle": "~2.2",
@ -125,7 +126,11 @@
    },
    "autoload": {
        "psr-4": { "Wallabag\\": "src/Wallabag/" },
-        "classmap": [ "app/AppKernel.php", "app/AppCache.php" ]
+        "classmap": [ "app/AppKernel.php", "app/AppCache.php" ],
+        "exclude-from-classmap": [
+             "vendor/symfony/intl/Locale.php",
+             "vendor/symfony/symfony/src/Symfony/Component/Intl/Locale.php"
+        ]
    },
    "autoload-dev": {
        "psr-4": { "Tests\\": "tests/" }
--- a/composer.lock
+++ b/composer.lock
@ -4,7 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
        "This file is @generated automatically"
    ],
-    "content-hash": "9cd56d6ca82444bb7d172424c0ffb378",
+    "content-hash": "ec8c25f2c3bce06d8d23599212a022dd",
    "packages": [
        {
            "name": "bdunogier/guzzle-site-authenticator",
@ -631,16 +631,16 @@
        },
        {
            "name": "doctrine/doctrine-bundle",
-            "version": "1.10.2",
+            "version": "1.10.3",
            "source": {
                "type": "git",
                "url": "https://github.com/doctrine/DoctrineBundle.git",
-                "reference": "1f99e6645030542079c57d4680601a4a8778a1bd"
+                "reference": "907dafe1ba73c4c3b0f0ae8cfc1b9958c002e58c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/1f99e6645030542079c57d4680601a4a8778a1bd",
-                "reference": "1f99e6645030542079c57d4680601a4a8778a1bd",
+                "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/907dafe1ba73c4c3b0f0ae8cfc1b9958c002e58c",
+                "reference": "907dafe1ba73c4c3b0f0ae8cfc1b9958c002e58c",
                "shasum": ""
            },
            "require": {
@ -712,7 +712,7 @@
                "orm",
                "persistence"
            ],
-            "time": "2019-02-06T13:18:04+00:00"
+            "time": "2019-04-04T08:03:53+00:00"
        },
        {
            "name": "doctrine/doctrine-cache-bundle",
@ -1299,16 +1299,16 @@
        },
        {
            "name": "fossar/htmlawed",
-            "version": "1.2.6",
+            "version": "1.2.7",
            "source": {
                "type": "git",
                "url": "https://github.com/fossar/HTMLawed.git",
-                "reference": "f83914ca2a5bf450e79462be22486f51a4ae7f79"
+                "reference": "4f7505e9622a96242923895c3008719b2c2283d3"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/fossar/HTMLawed/zipball/f83914ca2a5bf450e79462be22486f51a4ae7f79",
-                "reference": "f83914ca2a5bf450e79462be22486f51a4ae7f79",
+                "url": "https://api.github.com/repos/fossar/HTMLawed/zipball/4f7505e9622a96242923895c3008719b2c2283d3",
+                "reference": "4f7505e9622a96242923895c3008719b2c2283d3",
                "shasum": ""
            },
            "require": {
@ -1344,7 +1344,7 @@
                "strip",
                "tags"
            ],
-            "time": "2018-12-14T19:44:53+00:00"
+            "time": "2019-05-09T11:53:40+00:00"
        },
        {
            "name": "friendsofsymfony/jsrouting-bundle",
@ -1724,16 +1724,16 @@
        },
        {
            "name": "gedmo/doctrine-extensions",
-            "version": "v2.4.36",
+            "version": "v2.4.37",
            "source": {
                "type": "git",
                "url": "https://github.com/Atlantic18/DoctrineExtensions.git",
-                "reference": "87c78ff9fd4b90460386f753d95622f6fbbfcb27"
+                "reference": "5dd471f656e46d815f063bf3f12c667649ec7ffb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/Atlantic18/DoctrineExtensions/zipball/87c78ff9fd4b90460386f753d95622f6fbbfcb27",
-                "reference": "87c78ff9fd4b90460386f753d95622f6fbbfcb27",
+                "url": "https://api.github.com/repos/Atlantic18/DoctrineExtensions/zipball/5dd471f656e46d815f063bf3f12c667649ec7ffb",
+                "reference": "5dd471f656e46d815f063bf3f12c667649ec7ffb",
                "shasum": ""
            },
            "require": {
@ -1801,7 +1801,7 @@
                "tree",
                "uploadable"
            ],
-            "time": "2018-07-26T12:16:35+00:00"
+            "time": "2019-03-17T18:16:12+00:00"
        },
        {
            "name": "grandt/binstring",
@ -3126,16 +3126,16 @@
        },
        {
            "name": "j0k3r/graby",
-            "version": "1.19.1",
+            "version": "1.20.0",
            "source": {
                "type": "git",
                "url": "https://github.com/j0k3r/graby.git",
-                "reference": "6c1506f19d1bb876fb26bfc11e3e11a993eb7fe8"
+                "reference": "c7fcea010a6a09f6505b7be0d825ac78801cd831"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/j0k3r/graby/zipball/6c1506f19d1bb876fb26bfc11e3e11a993eb7fe8",
-                "reference": "6c1506f19d1bb876fb26bfc11e3e11a993eb7fe8",
+                "url": "https://api.github.com/repos/j0k3r/graby/zipball/c7fcea010a6a09f6505b7be0d825ac78801cd831",
+                "reference": "c7fcea010a6a09f6505b7be0d825ac78801cd831",
                "shasum": ""
            },
            "require": {
@ -3181,20 +3181,20 @@
                }
            ],
            "description": "Graby helps you extract article content from web pages",
-            "time": "2019-02-13T10:04:47+00:00"
+            "time": "2019-05-11T19:18:07+00:00"
        },
        {
            "name": "j0k3r/graby-site-config",
-            "version": "1.0.76",
+            "version": "1.0.83",
            "source": {
                "type": "git",
                "url": "https://github.com/j0k3r/graby-site-config.git",
-                "reference": "efc1be6a13c27414c2b7ad44568949b1045c6dc8"
+                "reference": "c1109a2969e7b8b7bead8453ad92c0822778dd03"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/efc1be6a13c27414c2b7ad44568949b1045c6dc8",
-                "reference": "efc1be6a13c27414c2b7ad44568949b1045c6dc8",
+                "url": "https://api.github.com/repos/j0k3r/graby-site-config/zipball/c1109a2969e7b8b7bead8453ad92c0822778dd03",
+                "reference": "c1109a2969e7b8b7bead8453ad92c0822778dd03",
                "shasum": ""
            },
            "require": {
@ -3221,20 +3221,20 @@
                }
            ],
            "description": "Graby site config files",
-            "time": "2019-03-04T09:22:34+00:00"
+            "time": "2019-05-14T08:12:36+00:00"
        },
        {
            "name": "j0k3r/php-readability",
-            "version": "1.2.1",
+            "version": "1.2.3",
            "source": {
                "type": "git",
                "url": "https://github.com/j0k3r/php-readability.git",
-                "reference": "3c0289bf8943cbef6a2cc89b645c33617fd38066"
+                "reference": "f808c1b0a21ae98ae6fd5bd623671c406efd74d0"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/j0k3r/php-readability/zipball/3c0289bf8943cbef6a2cc89b645c33617fd38066",
-                "reference": "3c0289bf8943cbef6a2cc89b645c33617fd38066",
+                "url": "https://api.github.com/repos/j0k3r/php-readability/zipball/f808c1b0a21ae98ae6fd5bd623671c406efd74d0",
+                "reference": "f808c1b0a21ae98ae6fd5bd623671c406efd74d0",
                "shasum": ""
            },
            "require": {
@ -3295,7 +3295,7 @@
                "extraction",
                "html"
            ],
-            "time": "2019-02-07T15:08:33+00:00"
+            "time": "2019-05-11T20:07:19+00:00"
        },
        {
            "name": "j0k3r/safecurl",
@ -3548,16 +3548,16 @@
        },
        {
            "name": "jms/serializer",
-            "version": "1.13.0",
+            "version": "1.14.0",
            "source": {
                "type": "git",
                "url": "https://github.com/schmittjoh/serializer.git",
-                "reference": "00863e1d55b411cc33ad3e1de09a4c8d3aae793c"
+                "reference": "ee96d57024af9a7716d56fcbe3aa94b3d030f3ca"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/00863e1d55b411cc33ad3e1de09a4c8d3aae793c",
-                "reference": "00863e1d55b411cc33ad3e1de09a4c8d3aae793c",
+                "url": "https://api.github.com/repos/schmittjoh/serializer/zipball/ee96d57024af9a7716d56fcbe3aa94b3d030f3ca",
+                "reference": "ee96d57024af9a7716d56fcbe3aa94b3d030f3ca",
                "shasum": ""
            },
            "require": {
@ -3597,7 +3597,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-1.x": "1.13-dev"
+                    "dev-1.x": "1.14-dev"
                }
            },
            "autoload": {
@ -3628,20 +3628,20 @@
                "serialization",
                "xml"
            ],
-            "time": "2018-07-25T13:58:54+00:00"
+            "time": "2019-04-17T08:12:16+00:00"
        },
        {
            "name": "jms/serializer-bundle",
-            "version": "2.4.3",
+            "version": "2.4.4",
            "source": {
                "type": "git",
                "url": "https://github.com/schmittjoh/JMSSerializerBundle.git",
-                "reference": "e5231652ce24b8673b2ac70bc76b0cabaf35deea"
+                "reference": "92ee808c64c1c180775a0e57d00e3be0674668fb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/e5231652ce24b8673b2ac70bc76b0cabaf35deea",
-                "reference": "e5231652ce24b8673b2ac70bc76b0cabaf35deea",
+                "url": "https://api.github.com/repos/schmittjoh/JMSSerializerBundle/zipball/92ee808c64c1c180775a0e57d00e3be0674668fb",
+                "reference": "92ee808c64c1c180775a0e57d00e3be0674668fb",
                "shasum": ""
            },
            "require": {
@ -3702,7 +3702,7 @@
                "serialization",
                "xml"
            ],
-            "time": "2018-12-09T07:52:19+00:00"
+            "time": "2019-03-30T10:26:09+00:00"
        },
        {
            "name": "kphoen/rulerz",
@ -3885,16 +3885,16 @@
        },
        {
            "name": "lexik/form-filter-bundle",
-            "version": "v5.0.7",
+            "version": "v5.0.10",
            "source": {
                "type": "git",
                "url": "https://github.com/lexik/LexikFormFilterBundle.git",
-                "reference": "c8014b678c8872dfc045c18b159d0b4b85cf7be3"
+                "reference": "92df0638173979dc906bda7a33a10b98429d2057"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/lexik/LexikFormFilterBundle/zipball/c8014b678c8872dfc045c18b159d0b4b85cf7be3",
-                "reference": "c8014b678c8872dfc045c18b159d0b4b85cf7be3",
+                "url": "https://api.github.com/repos/lexik/LexikFormFilterBundle/zipball/92df0638173979dc906bda7a33a10b98429d2057",
+                "reference": "92df0638173979dc906bda7a33a10b98429d2057",
                "shasum": ""
            },
            "require": {
@ -3904,8 +3904,11 @@
                "symfony/framework-bundle": "~2.8|~3.0|^4.0"
            },
            "require-dev": {
-                "doctrine/mongodb-odm-bundle": "~3.0",
-                "phpunit/phpunit": "^5.7|~6.0"
+                "doctrine/mongodb-odm-bundle": "^3.0",
+                "phpunit/phpunit": "~5.0|^7.5"
+            },
+            "suggest": {
+                "alcaeus/mongo-php-adapter": "Install this package if using the PHP 7 MongoDB Driver"
            },
            "type": "symfony-bundle",
            "extra": {
@ -3941,7 +3944,7 @@
                "form",
                "symfony"
            ],
-            "time": "2018-04-04T11:14:22+00:00"
+            "time": "2019-04-17T17:58:44+00:00"
        },
        {
            "name": "liip/theme-bundle",
@ -4534,16 +4537,16 @@
        },
        {
            "name": "php-amqplib/php-amqplib",
-            "version": "v2.8.1",
+            "version": "v2.9.2",
            "source": {
                "type": "git",
                "url": "https://github.com/php-amqplib/php-amqplib.git",
-                "reference": "84449ffd3f5a7466bbee3946facb3746ff11f075"
+                "reference": "76faddcd668dabb8d4f7c00e86b8a9decd781a59"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/php-amqplib/php-amqplib/zipball/84449ffd3f5a7466bbee3946facb3746ff11f075",
-                "reference": "84449ffd3f5a7466bbee3946facb3746ff11f075",
+                "url": "https://api.github.com/repos/php-amqplib/php-amqplib/zipball/76faddcd668dabb8d4f7c00e86b8a9decd781a59",
+                "reference": "76faddcd668dabb8d4f7c00e86b8a9decd781a59",
                "shasum": ""
            },
            "require": {
@ -4555,9 +4558,10 @@
                "videlalvaro/php-amqplib": "self.version"
            },
            "require-dev": {
+                "ext-curl": "*",
+                "nategood/httpful": "^0.2.20",
                "phpdocumentor/phpdocumentor": "^2.9",
                "phpunit/phpunit": "^4.8",
-                "scrutinizer/ocular": "^1.1",
                "squizlabs/php_codesniffer": "^2.5"
            },
            "type": "library",
@ -4603,7 +4607,7 @@
                "queue",
                "rabbitmq"
            ],
-            "time": "2018-11-13T09:35:17+00:00"
+            "time": "2019-04-24T15:36:21+00:00"
        },
        {
            "name": "php-amqplib/rabbitmq-bundle",
@ -5644,6 +5648,42 @@
            ],
            "time": "2017-12-24T16:06:50+00:00"
        },
+        {
+            "name": "sulu/symfony-intl-fix",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sulu/symfony-intl-fix.git",
+                "reference": "fabb07b8ac325ba6650e70516e94fd7ebb7a8f68"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sulu/symfony-intl-fix/zipball/fabb07b8ac325ba6650e70516e94fd7ebb7a8f68",
+                "reference": "fabb07b8ac325ba6650e70516e94fd7ebb7a8f68",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.5 || ^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "./Locale.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Alexander Schranz",
+                    "email": "alexander@sulu.io"
+                }
+            ],
+            "description": "Provides the symfony/intl fix for new php version also for symfony 2.8",
+            "time": "2019-04-26T09:40:38+00:00"
+        },
        {
            "name": "swiftmailer/swiftmailer",
            "version": "v5.4.12",
@ -5763,16 +5803,16 @@
        },
        {
            "name": "symfony/polyfill-apcu",
-            "version": "v1.10.0",
+            "version": "v1.11.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-apcu.git",
-                "reference": "19e1b73bf255265ad0b568f81766ae2a3266d8d2"
+                "reference": "a502face1da6a53289480166f24de2c3c68e5c3c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/19e1b73bf255265ad0b568f81766ae2a3266d8d2",
-                "reference": "19e1b73bf255265ad0b568f81766ae2a3266d8d2",
+                "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/a502face1da6a53289480166f24de2c3c68e5c3c",
+                "reference": "a502face1da6a53289480166f24de2c3c68e5c3c",
                "shasum": ""
            },
            "require": {
@ -5781,7 +5821,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-master": "1.11-dev"
                }
            },
            "autoload": {
@ -5815,20 +5855,20 @@
                "portable",
                "shim"
            ],
-            "time": "2018-08-06T14:22:27+00:00"
+            "time": "2019-02-06T07:57:58+00:00"
        },
        {
            "name": "symfony/polyfill-ctype",
-            "version": "v1.10.0",
+            "version": "v1.11.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19"
+                "reference": "82ebae02209c21113908c229e9883c419720738a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19",
-                "reference": "e3d826245268269cd66f8326bd8bc066687b4a19",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a",
+                "reference": "82ebae02209c21113908c229e9883c419720738a",
                "shasum": ""
            },
            "require": {
@ -5840,7 +5880,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-master": "1.11-dev"
                }
            },
            "autoload": {
@ -5873,20 +5913,20 @@
                "polyfill",
                "portable"
            ],
-            "time": "2018-08-06T14:22:27+00:00"
+            "time": "2019-02-06T07:57:58+00:00"
        },
        {
            "name": "symfony/polyfill-intl-icu",
-            "version": "v1.10.0",
+            "version": "v1.11.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-intl-icu.git",
-                "reference": "f22a90256d577c7ef7efad8df1f0201663d57644"
+                "reference": "999878a3a09d73cae157b0cf89bb6fb2cc073057"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/f22a90256d577c7ef7efad8df1f0201663d57644",
-                "reference": "f22a90256d577c7ef7efad8df1f0201663d57644",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/999878a3a09d73cae157b0cf89bb6fb2cc073057",
+                "reference": "999878a3a09d73cae157b0cf89bb6fb2cc073057",
                "shasum": ""
            },
            "require": {
@ -5931,20 +5971,20 @@
                "portable",
                "shim"
            ],
-            "time": "2018-08-06T14:22:27+00:00"
+            "time": "2019-01-07T19:39:47+00:00"
        },
        {
            "name": "symfony/polyfill-mbstring",
-            "version": "v1.10.0",
+            "version": "v1.11.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "c79c051f5b3a46be09205c73b80b346e4153e494"
+                "reference": "fe5e94c604826c35a32fa832f35bd036b6799609"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/c79c051f5b3a46be09205c73b80b346e4153e494",
-                "reference": "c79c051f5b3a46be09205c73b80b346e4153e494",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fe5e94c604826c35a32fa832f35bd036b6799609",
+                "reference": "fe5e94c604826c35a32fa832f35bd036b6799609",
                "shasum": ""
            },
            "require": {
@ -5956,7 +5996,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-master": "1.11-dev"
                }
            },
            "autoload": {
@ -5990,20 +6030,20 @@
                "portable",
                "shim"
            ],
-            "time": "2018-09-21T13:07:52+00:00"
+            "time": "2019-02-06T07:57:58+00:00"
        },
        {
            "name": "symfony/polyfill-php56",
-            "version": "v1.10.0",
+            "version": "v1.11.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-php56.git",
-                "reference": "ff208829fe1aa48ab9af356992bb7199fed551af"
+                "reference": "f4dddbc5c3471e1b700a147a20ae17cdb72dbe42"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/ff208829fe1aa48ab9af356992bb7199fed551af",
-                "reference": "ff208829fe1aa48ab9af356992bb7199fed551af",
+                "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/f4dddbc5c3471e1b700a147a20ae17cdb72dbe42",
+                "reference": "f4dddbc5c3471e1b700a147a20ae17cdb72dbe42",
                "shasum": ""
            },
            "require": {
@ -6013,7 +6053,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-master": "1.11-dev"
                }
            },
            "autoload": {
@ -6046,20 +6086,20 @@
                "portable",
                "shim"
            ],
-            "time": "2018-09-21T06:26:08+00:00"
+            "time": "2019-02-06T07:57:58+00:00"
        },
        {
            "name": "symfony/polyfill-php70",
-            "version": "v1.10.0",
+            "version": "v1.11.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-php70.git",
-                "reference": "6b88000cdd431cd2e940caa2cb569201f3f84224"
+                "reference": "bc4858fb611bda58719124ca079baff854149c89"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/6b88000cdd431cd2e940caa2cb569201f3f84224",
-                "reference": "6b88000cdd431cd2e940caa2cb569201f3f84224",
+                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/bc4858fb611bda58719124ca079baff854149c89",
+                "reference": "bc4858fb611bda58719124ca079baff854149c89",
                "shasum": ""
            },
            "require": {
@ -6069,7 +6109,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-master": "1.11-dev"
                }
            },
            "autoload": {
@ -6105,20 +6145,20 @@
                "portable",
                "shim"
            ],
-            "time": "2018-09-21T06:26:08+00:00"
+            "time": "2019-02-06T07:57:58+00:00"
        },
        {
            "name": "symfony/polyfill-util",
-            "version": "v1.10.0",
+            "version": "v1.11.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-util.git",
-                "reference": "3b58903eae668d348a7126f999b0da0f2f93611c"
+                "reference": "b46c6cae28a3106735323f00a0c38eccf2328897"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/3b58903eae668d348a7126f999b0da0f2f93611c",
-                "reference": "3b58903eae668d348a7126f999b0da0f2f93611c",
+                "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/b46c6cae28a3106735323f00a0c38eccf2328897",
+                "reference": "b46c6cae28a3106735323f00a0c38eccf2328897",
                "shasum": ""
            },
            "require": {
@ -6127,7 +6167,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-master": "1.11-dev"
                }
            },
            "autoload": {
@ -6157,7 +6197,7 @@
                "polyfill",
                "shim"
            ],
-            "time": "2018-09-30T16:36:12+00:00"
+            "time": "2019-02-08T14:16:39+00:00"
        },
        {
            "name": "symfony/swiftmailer-bundle",
@ -6474,16 +6514,16 @@
        },
        {
            "name": "twig/twig",
-            "version": "v1.37.1",
+            "version": "v1.40.1",
            "source": {
                "type": "git",
                "url": "https://github.com/twigphp/Twig.git",
-                "reference": "66be9366c76cbf23e82e7171d47cbfa54a057a62"
+                "reference": "35889516bbd6bbe46a600c2c33b03515df4a076e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/66be9366c76cbf23e82e7171d47cbfa54a057a62",
-                "reference": "66be9366c76cbf23e82e7171d47cbfa54a057a62",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/35889516bbd6bbe46a600c2c33b03515df4a076e",
+                "reference": "35889516bbd6bbe46a600c2c33b03515df4a076e",
                "shasum": ""
            },
            "require": {
@ -6498,7 +6538,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.37-dev"
+                    "dev-master": "1.40-dev"
                }
            },
            "autoload": {
@ -6536,7 +6576,7 @@
            "keywords": [
                "templating"
            ],
-            "time": "2019-01-14T14:59:29+00:00"
+            "time": "2019-04-29T14:12:28+00:00"
        },
        {
            "name": "wallabag/php-mobi",
@ -6658,16 +6698,16 @@
        },
        {
            "name": "white-october/pagerfanta-bundle",
-            "version": "v1.2.3",
+            "version": "v1.2.4",
            "source": {
                "type": "git",
                "url": "https://github.com/whiteoctober/WhiteOctoberPagerfantaBundle.git",
-                "reference": "3a2f39fecde9b8aefe7c9cbd0baf06bc72ef3e5e"
+                "reference": "19bf14bf8c72e4205c9ca97028436701fe3991a6"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/whiteoctober/WhiteOctoberPagerfantaBundle/zipball/3a2f39fecde9b8aefe7c9cbd0baf06bc72ef3e5e",
-                "reference": "3a2f39fecde9b8aefe7c9cbd0baf06bc72ef3e5e",
+                "url": "https://api.github.com/repos/whiteoctober/WhiteOctoberPagerfantaBundle/zipball/19bf14bf8c72e4205c9ca97028436701fe3991a6",
+                "reference": "19bf14bf8c72e4205c9ca97028436701fe3991a6",
                "shasum": ""
            },
            "require": {
@ -6712,7 +6752,7 @@
                "page",
                "paging"
            ],
-            "time": "2018-12-05T16:58:18+00:00"
+            "time": "2019-02-14T08:42:52+00:00"
        },
        {
            "name": "willdurand/hateoas",
@ -7034,16 +7074,16 @@
    "packages-dev": [
        {
            "name": "composer/semver",
-            "version": "1.4.2",
+            "version": "1.5.0",
            "source": {
                "type": "git",
                "url": "https://github.com/composer/semver.git",
-                "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573"
+                "reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/c7cb9a2095a074d131b65a8a0cd294479d785573",
-                "reference": "c7cb9a2095a074d131b65a8a0cd294479d785573",
+                "url": "https://api.github.com/repos/composer/semver/zipball/46d9139568ccb8d9e7cdd4539cab7347568a5e2e",
+                "reference": "46d9139568ccb8d9e7cdd4539cab7347568a5e2e",
                "shasum": ""
            },
            "require": {
@ -7092,7 +7132,7 @@
                "validation",
                "versioning"
            ],
-            "time": "2016-08-30T16:08:34+00:00"
+            "time": "2019-03-19T17:25:45+00:00"
        },
        {
            "name": "composer/xdebug-handler",
@ -7559,16 +7599,16 @@
        },
        {
            "name": "symfony/phpunit-bridge",
-            "version": "v4.2.4",
+            "version": "v4.2.8",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/phpunit-bridge.git",
-                "reference": "2cc651a38fcb831a405c14fcb76fcb00320e7ee8"
+                "reference": "31f2e3c10bc9bd955ca1ae3e4da2bb489205714a"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/2cc651a38fcb831a405c14fcb76fcb00320e7ee8",
-                "reference": "2cc651a38fcb831a405c14fcb76fcb00320e7ee8",
+                "url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/31f2e3c10bc9bd955ca1ae3e4da2bb489205714a",
+                "reference": "31f2e3c10bc9bd955ca1ae3e4da2bb489205714a",
                "shasum": ""
            },
            "require": {
@ -7620,20 +7660,20 @@
            ],
            "description": "Symfony PHPUnit Bridge",
            "homepage": "https://symfony.com",
-            "time": "2019-02-18T06:49:49+00:00"
+            "time": "2019-04-23T14:37:24+00:00"
        },
        {
            "name": "symfony/polyfill-php72",
-            "version": "v1.10.0",
+            "version": "v1.11.0",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/polyfill-php72.git",
-                "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631"
+                "reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9050816e2ca34a8e916c3a0ae8b9c2fccf68b631",
-                "reference": "9050816e2ca34a8e916c3a0ae8b9c2fccf68b631",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/ab50dcf166d5f577978419edd37aa2bb8eabce0c",
+                "reference": "ab50dcf166d5f577978419edd37aa2bb8eabce0c",
                "shasum": ""
            },
            "require": {
@ -7642,7 +7682,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-master": "1.9-dev"
+                    "dev-master": "1.11-dev"
                }
            },
            "autoload": {
@ -7675,7 +7715,7 @@
                "portable",
                "shim"
            ],
-            "time": "2018-09-21T13:07:52+00:00"
+            "time": "2019-02-06T07:57:58+00:00"
        }
    ],
    "aliases": [],
--- a/scripts/dev.sh
+++ b/scripts/dev.sh
@ -3,10 +3,14 @@
 # eg: `sh dev.sh`

 COMPOSER_COMMAND='composer'
+REQUIRE_FILE='scripts/require.sh'

-DIR="${BASH_SOURCE}"
-if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi
-. "$DIR/require.sh"
+if [ ! -f "$REQUIRE_FILE" ]; then
+  echo "Cannot find $REQUIRE_FILE"
+  exit 1
+fi
+
+. "$REQUIRE_FILE"

 $COMPOSER_COMMAND install
 php bin/console wallabag:install
--- a/scripts/install.sh
+++ b/scripts/install.sh
@ -25,10 +25,14 @@ if [ "$IGNORE_ROOT" -eq 0 ] && [ "$EUID" == "0" ]; then
 fi

 COMPOSER_COMMAND='composer'
+REQUIRE_FILE='scripts/require.sh'

-DIR="${BASH_SOURCE}"
-if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi
-. "$DIR/require.sh"
+if [ ! -f "$REQUIRE_FILE" ]; then
+  echo "Cannot find $REQUIRE_FILE"
+  exit 1
+fi
+
+. "$REQUIRE_FILE"

 TAG=$(git describe --tags $(git rev-list --tags --max-count=1))

--- a/scripts/update.sh
+++ b/scripts/update.sh
@ -28,10 +28,14 @@ set -e
 set -u

 COMPOSER_COMMAND='composer'
+REQUIRE_FILE='scripts/require.sh'

-DIR="${BASH_SOURCE}"
-if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi
-. "$DIR/require.sh"
+if [ ! -f "$REQUIRE_FILE" ]; then
+  echo "Cannot find $REQUIRE_FILE"
+  exit 1
+fi
+
+. "$REQUIRE_FILE"

 rm -rf var/cache/*
 git fetch origin
--- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSiteCredentialData.php
+++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadSiteCredentialData.php
@ -5,19 +5,38 @@ namespace Wallabag\CoreBundle\DataFixtures\ORM;
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
 use Doctrine\Common\Persistence\ObjectManager;
+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Wallabag\CoreBundle\Entity\SiteCredential;

-class LoadSiteCredentialData extends AbstractFixture implements OrderedFixtureInterface
+class LoadSiteCredentialData extends AbstractFixture implements OrderedFixtureInterface, ContainerAwareInterface
 {
+    /**
+     * @var ContainerInterface
+     */
+    private $container;
+
+    public function setContainer(ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
+
    /**
     * {@inheritdoc}
     */
    public function load(ObjectManager $manager)
    {
        $credential = new SiteCredential($this->getReference('admin-user'));
-        $credential->setHost('example.com');
-        $credential->setUsername('foo');
-        $credential->setPassword('bar');
+        $credential->setHost('.super.com');
+        $credential->setUsername($this->container->get('wallabag_core.helper.crypto_proxy')->crypt('.super'));
+        $credential->setPassword($this->container->get('wallabag_core.helper.crypto_proxy')->crypt('bar'));
+
+        $manager->persist($credential);
+
+        $credential = new SiteCredential($this->getReference('admin-user'));
+        $credential->setHost('paywall.example.com');
+        $credential->setUsername($this->container->get('wallabag_core.helper.crypto_proxy')->crypt('paywall.example'));
+        $credential->setPassword($this->container->get('wallabag_core.helper.crypto_proxy')->crypt('bar'));

        $manager->persist($credential);

--- a/src/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilder.php
+++ b/src/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilder.php
@ -62,11 +62,24 @@ class GrabySiteConfigBuilder implements SiteConfigBuilder
            $host = substr($host, 4);
        }

-        $credentials = null;
-        if ($this->currentUser) {
-            $credentials = $this->credentialRepository->findOneByHostAndUser($host, $this->currentUser->getId());
+        if (!$this->currentUser) {
+            $this->logger->debug('Auth: no current user defined.');
+
+            return false;
        }

+        $hosts = [$host];
+        // will try to see for a host without the first subdomain (fr.example.org & .example.org)
+        $split = explode('.', $host);
+
+        if (\count($split) > 1) {
+            // remove first subdomain
+            array_shift($split);
+            $hosts[] = '.' . implode('.', $split);
+        }
+
+        $credentials = $this->credentialRepository->findOneByHostsAndUser($hosts, $this->currentUser->getId());
+
        if (null === $credentials) {
            $this->logger->debug('Auth: no credentials available for host.', ['host' => $host]);

--- a/src/Wallabag/CoreBundle/Helper/ContentProxy.php
+++ b/src/Wallabag/CoreBundle/Helper/ContentProxy.php
@ -47,6 +47,7 @@ class ContentProxy
     */
    public function updateEntry(Entry $entry, $url, array $content = [], $disableContentUpdate = false)
    {
+        $this->graby->toggleImgNoReferrer(true);
        if (!empty($content['html'])) {
            $content['html'] = $this->graby->cleanupHtml($content['html'], $url);
        }
@ -256,18 +257,17 @@ class ContentProxy
            $entry->setTitle($content['open_graph']['og_title']);
        }

-        $html = $content['html'];
-        if (false === $html) {
-            $html = $this->fetchingErrorMessage;
+        if (empty($content['html'])) {
+            $content['html'] = $this->fetchingErrorMessage;

            if (!empty($content['open_graph']['og_description'])) {
-                $html .= '<p><i>But we found a short description: </i></p>';
-                $html .= $content['open_graph']['og_description'];
+                $content['html'] .= '<p><i>But we found a short description: </i></p>';
+                $content['html'] .= $content['open_graph']['og_description'];
            }
        }

-        $entry->setContent($html);
-        $entry->setReadingTime(Utils::getReadingTime($html));
+        $entry->setContent($content['html']);
+        $entry->setReadingTime(Utils::getReadingTime($content['html']));

        if (!empty($content['status'])) {
            $entry->setHttpStatus($content['status']);
--- a/src/Wallabag/CoreBundle/Helper/EntriesExport.php
+++ b/src/Wallabag/CoreBundle/Helper/EntriesExport.php
@ -188,7 +188,7 @@ class EntriesExport
            foreach ($entry->getTags() as $tag) {
                $book->setSubject($tag->getLabel());
            }
-            $filename = sha1($entry->getTitle());
+            $filename = sha1(sprintf('%s:%s', $entry->getUrl(), $entry->getTitle()));

            $publishedBy = $entry->getPublishedBy();
            $authors = $this->translator->trans('export.unknown');
--- a/src/Wallabag/CoreBundle/Repository/SiteCredentialRepository.php
+++ b/src/Wallabag/CoreBundle/Repository/SiteCredentialRepository.php
@ -19,16 +19,16 @@ class SiteCredentialRepository extends \Doctrine\ORM\EntityRepository
    /**
     * Retrieve one username/password for the given host and userId.
     *
-     * @param string $host
-     * @param int    $userId
+     * @param array $hosts  An array of host to look for
+     * @param int   $userId
     *
     * @return array|null
     */
-    public function findOneByHostAndUser($host, $userId)
+    public function findOneByHostsAndUser($hosts, $userId)
    {
        $res = $this->createQueryBuilder('s')
            ->select('s.username', 's.password')
-            ->where('s.host = :hostname')->setParameter('hostname', $host)
+            ->where('s.host IN (:hosts)')->setParameter('hosts', $hosts)
            ->andWhere('s.user = :userId')->setParameter('userId', $userId)
            ->setMaxResults(1)
            ->getQuery()
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@ -550,7 +550,7 @@ site_credential:
    #     create_new_one: Create a new credential
    # form:
    #     username_label: 'Username'
-    #     host_label: 'Host'
+    #     host_label: 'Host (subdomain.example.org, .example.org, etc.)'
    #     password_label: 'Password'
    #     save: Save
    #     delete: Delete
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@ -550,7 +550,7 @@ site_credential:
        create_new_one: 'Einen neuen Seitenzugang anlegen'
    form:
        username_label: 'Benutzername'
-        host_label: 'Host'
+        host_label: 'Host (subdomain.example.org, .example.org, etc.)'
        password_label: 'Passwort'
        save: 'Speichern'
        delete: 'Löschen'
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@ -550,7 +550,7 @@ site_credential:
        create_new_one: Create a new credential
    form:
        username_label: 'Username'
-        host_label: 'Host'
+        host_label: 'Host (subdomain.example.org, .example.org, etc.)'
        password_label: 'Password'
        save: Save
        delete: Delete
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@ -550,7 +550,7 @@ site_credential:
    #     create_new_one: Create a new credential
    # form:
    #     username_label: 'Username'
-    #     host_label: 'Host'
+    #     host_label: 'Host (subdomain.example.org, .example.org, etc.)'
    #     password_label: 'Password'
    #     save: Save
    #     delete: Delete
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@ -550,7 +550,7 @@ site_credential:
    #     create_new_one: Create a new credential
    # form:
    #     username_label: 'Username'
-    #     host_label: 'Host'
+    #     host_label: 'Host (subdomain.example.org, .example.org, etc.)'
    #     password_label: 'Password'
    #     save: Save
    #     delete: Delete
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@ -550,7 +550,7 @@ site_credential:
        create_new_one: Créer un nouvel accès à un site
    form:
        username_label: 'Identifiant'
-        host_label: 'Domaine'
+        host_label: 'Domaine (subdomain.example.org, .example.org, etc.)'
        password_label: 'Mot de passe'
        save: "Sauvegarder"
        delete: "Supprimer"
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@ -550,7 +550,7 @@ site_credential:
    #     create_new_one: Create a new credential
    # form:
    #     username_label: 'Username'
-    #     host_label: 'Host'
+    #     host_label: 'Host (subdomain.example.org, .example.org, etc.)'
    #     password_label: 'Password'
    #     save: Save
    #     delete: Delete
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@ -550,7 +550,7 @@ site_credential:
         create_new_one: Crear un novèl identificant
    form:
        username_label: "Nom d'utilizaire"
-        host_label: 'Òste'
+        host_label: 'Òste (subdomain.example.org, .example.org, etc.)'
        password_label: 'Senhal'
        save: 'Enregistrar'
        delete: 'Suprimir'
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@ -550,7 +550,7 @@ site_credential:
        create_new_one: Stwórz nowe poświadczenie
    form:
        username_label: 'Nazwa użytkownika'
-        host_label: 'Host'
+        host_label: 'Host (subdomain.example.org, .example.org, etc.)'
        password_label: 'Hasło'
        save: Zapisz
        delete: Usuń
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@ -550,7 +550,7 @@ site_credential:
        # create_new_one: Create a new credential
    form:
        # username_label: 'Username'
-        # host_label: 'Host'
+        # host_label: 'Host (subdomain.example.org, .example.org, etc.)'
        # password_label: 'Password'
        save: 'Salvar'
        delete: 'Apagar'
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@ -550,7 +550,7 @@ site_credential:
    #     create_new_one: Create a new credential
    # form:
    #     username_label: 'Username'
-    #     host_label: 'Host'
+    #     host_label: 'Host (subdomain.example.org, .example.org, etc.)'
    #     password_label: 'Password'
    #     save: Save
    #     delete: Delete
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.th.yml
@ -548,7 +548,7 @@ site_credential:
        create_new_one: สร้างข้อมูลส่วนตัวใหม่
    form:
        username_label: 'ชื่อผู้ใช้'
-        host_label: 'โฮส'
+        host_label: 'โฮส (subdomain.example.org, .example.org, etc.)'
        password_label: 'รหัสผ่าน'
        save: บันทึก
        delete: ลบ
--- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
@ -8,6 +8,7 @@
        {% block head %}
            <meta name="viewport" content="initial-scale=1.0">
            <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+            <meta name="referrer" content="strict-origin-when-cross-origin">
            <!--[if IE]>
            <meta http-equiv="X-UA-Compatible" content="IE=10">
            <![endif]-->
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Entry/share.html.twig
@ -29,9 +29,6 @@
            <h1>{{ entry.title|e|raw }}</h1>
            <a href="{{ entry.url|e }}" target="_blank" rel="noopener" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e|raw }}" class="tool">{{ entry.domainName|removeWww }}</a>
            <p class="shared-by">{{ "entry.public.shared_by_wallabag"|trans({'%wallabag_instance%': url('homepage'), '%username%': entry.user.username})|raw }}.</p>
-            {% if entry.previewPicture is not null %}
-                <img class="preview" src="{{ entry.previewPicture }}" alt="{{ entry.title|striptags|e('html_attr') }}" />
-            {% endif %}
        </header>
        <article class="block">
            {{ entry.content | raw }}
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/Card/_content.html.twig
@ -8,8 +8,11 @@

    <div class="{{ subClass|default('original grey-text') }}">
        <a href="{{ entry.url|e }}" target="_blank" title="{{ entry.domainName|removeWww }}" class="tool grey-text">{{ entry.domainName|removeWww }}</a>
-        {% if withTags is defined %}
+        {% if withMetadata is defined %}
            {% include "@WallabagCore/themes/material/Entry/_tags.html.twig" with {'tags': entry.tags | slice(0, 3), 'entryId': entry.id, 'listClass': ' hide-on-med-and-down'} only %}
+            <div class="reading-time grey-text">
+                <div class="card-reading-time">{% include "@WallabagCore/themes/material/Entry/_reading_time.html.twig" with {'entry': entry} only %}</div>
+            </div>
        {% endif %}
    </div>
 </div>
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_list.html.twig
@ -5,7 +5,7 @@
            <span class="preview{{ previewClassModifier }}" style="background-image: url({{ entry.previewPicture | default(asset('wallassets/themes/_global/img/logo-square.svg')) }})"></span>
        </a>
    </div>
-    {% include "@WallabagCore/themes/material/Entry/Card/_content.html.twig" with {'entry': entry, 'withTags': true, 'subClass': 'metadata'} only %}
+    {% include "@WallabagCore/themes/material/Entry/Card/_content.html.twig" with {'entry': entry, 'withMetadata': true, 'subClass': 'metadata'} only %}
    <ul class="tools-list hide-on-small-only">
        <li>
            <a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isArchived == 0 %}done{% else %}unarchive{% endif %}</i></a>
--- a/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
+++ b/tests/Wallabag/CoreBundle/Controller/EntryControllerTest.php
@ -166,7 +166,7 @@ class EntryControllerTest extends WallabagCoreTestCase
        $this->assertSame($this->url, $content->getUrl());
        $this->assertContains('Google', $content->getTitle());
        $this->assertSame('fr', $content->getLanguage());
-        $this->assertSame('2016-04-07 19:01:35', $content->getPublishedAt()->format('Y-m-d H:i:s'));
+        $this->assertSame('2015-03-28 11:43:19', $content->getPublishedAt()->format('Y-m-d H:i:s'));
        $this->assertArrayHasKey('x-frame-options', $content->getHeaders());
        $client->getContainer()->get('craue_config')->set('store_article_headers', 0);
    }
--- a/tests/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilderTest.php
+++ b/tests/Wallabag/CoreBundle/GuzzleSiteAuthenticator/GrabySiteConfigBuilderTest.php
@ -5,26 +5,22 @@ namespace Tests\Wallabag\CoreBundle\GuzzleSiteAuthenticator;
 use Graby\SiteConfig\SiteConfig as GrabySiteConfig;
 use Monolog\Handler\TestHandler;
 use Monolog\Logger;
-use PHPUnit\Framework\TestCase;
 use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
+use Tests\Wallabag\CoreBundle\WallabagCoreTestCase;
 use Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder;

-class GrabySiteConfigBuilderTest extends TestCase
+class GrabySiteConfigBuilderTest extends WallabagCoreTestCase
 {
-    /** @var \Wallabag\CoreBundle\GuzzleSiteAuthenticator\GrabySiteConfigBuilder */
-    protected $builder;
-
    public function testBuildConfigExists()
    {
-        /* @var \Graby\SiteConfig\ConfigBuilder|\PHPUnit_Framework_MockObject_MockObject */
        $grabyConfigBuilderMock = $this->getMockBuilder('Graby\SiteConfig\ConfigBuilder')
            ->disableOriginalConstructor()
            ->getMock();

        $grabySiteConfig = new GrabySiteConfig();
        $grabySiteConfig->requires_login = true;
-        $grabySiteConfig->login_uri = 'http://www.example.com/login';
+        $grabySiteConfig->login_uri = 'http://api.example.com/login';
        $grabySiteConfig->login_username_field = 'login';
        $grabySiteConfig->login_password_field = 'password';
        $grabySiteConfig->login_extra_fields = ['field=value'];
@ -32,7 +28,7 @@ class GrabySiteConfigBuilderTest extends TestCase

        $grabyConfigBuilderMock
            ->method('buildForHost')
-            ->with('example.com')
+            ->with('api.example.com')
            ->will($this->returnValue($grabySiteConfig));

        $logger = new Logger('foo');
@ -43,8 +39,8 @@ class GrabySiteConfigBuilderTest extends TestCase
            ->disableOriginalConstructor()
            ->getMock();
        $siteCrentialRepo->expects($this->once())
-            ->method('findOneByHostAndUser')
-            ->with('example.com', 1)
+            ->method('findOneByHostsAndUser')
+            ->with(['api.example.com', '.example.com'], 1)
            ->willReturn(['username' => 'foo', 'password' => 'bar']);

        $user = $this->getMockBuilder('Wallabag\UserBundle\Entity\User')
@ -59,18 +55,18 @@ class GrabySiteConfigBuilderTest extends TestCase
        $tokenStorage = new TokenStorage();
        $tokenStorage->setToken($token);

-        $this->builder = new GrabySiteConfigBuilder(
+        $builder = new GrabySiteConfigBuilder(
            $grabyConfigBuilderMock,
            $tokenStorage,
            $siteCrentialRepo,
            $logger
        );

-        $config = $this->builder->buildForHost('www.example.com');
+        $config = $builder->buildForHost('api.example.com');

-        $this->assertSame('example.com', $config->getHost());
+        $this->assertSame('api.example.com', $config->getHost());
        $this->assertTrue($config->requiresLogin());
-        $this->assertSame('http://www.example.com/login', $config->getLoginUri());
+        $this->assertSame('http://api.example.com/login', $config->getLoginUri());
        $this->assertSame('login', $config->getUsernameField());
        $this->assertSame('password', $config->getPasswordField());
        $this->assertSame(['field' => 'value'], $config->getExtraFields());
@ -85,7 +81,6 @@ class GrabySiteConfigBuilderTest extends TestCase

    public function testBuildConfigDoesntExist()
    {
-        /* @var \Graby\SiteConfig\ConfigBuilder|\PHPUnit_Framework_MockObject_MockObject */
        $grabyConfigBuilderMock = $this->getMockBuilder('\Graby\SiteConfig\ConfigBuilder')
            ->disableOriginalConstructor()
            ->getMock();
@ -103,8 +98,8 @@ class GrabySiteConfigBuilderTest extends TestCase
            ->disableOriginalConstructor()
            ->getMock();
        $siteCrentialRepo->expects($this->once())
-            ->method('findOneByHostAndUser')
-            ->with('unknown.com', 1)
+            ->method('findOneByHostsAndUser')
+            ->with(['unknown.com', '.com'], 1)
            ->willReturn(null);

        $user = $this->getMockBuilder('Wallabag\UserBundle\Entity\User')
@ -119,14 +114,14 @@ class GrabySiteConfigBuilderTest extends TestCase
        $tokenStorage = new TokenStorage();
        $tokenStorage->setToken($token);

-        $this->builder = new GrabySiteConfigBuilder(
+        $builder = new GrabySiteConfigBuilder(
            $grabyConfigBuilderMock,
            $tokenStorage,
            $siteCrentialRepo,
            $logger
        );

-        $config = $this->builder->buildForHost('unknown.com');
+        $config = $builder->buildForHost('unknown.com');

        $this->assertFalse($config);

@ -134,4 +129,121 @@ class GrabySiteConfigBuilderTest extends TestCase

        $this->assertCount(1, $records, 'One log was recorded');
    }
+
+    public function testBuildConfigUserNotDefined()
+    {
+        $grabyConfigBuilderMock = $this->getMockBuilder('\Graby\SiteConfig\ConfigBuilder')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $grabyConfigBuilderMock
+            ->method('buildForHost')
+            ->with('unknown.com')
+            ->will($this->returnValue(new GrabySiteConfig()));
+
+        $logger = new Logger('foo');
+        $handler = new TestHandler();
+        $logger->pushHandler($handler);
+
+        $siteCrentialRepo = $this->getMockBuilder('Wallabag\CoreBundle\Repository\SiteCredentialRepository')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $tokenStorage = new TokenStorage();
+
+        $builder = new GrabySiteConfigBuilder(
+            $grabyConfigBuilderMock,
+            $tokenStorage,
+            $siteCrentialRepo,
+            $logger
+        );
+
+        $config = $builder->buildForHost('unknown.com');
+
+        $this->assertFalse($config);
+    }
+
+    public function dataProviderCredentials()
+    {
+        return [
+            [
+                'host' => 'example.com',
+            ],
+            [
+                'host' => 'other.example.com',
+            ],
+            [
+                'host' => 'paywall.example.com',
+                'expectedUsername' => 'paywall.example',
+                'expectedPassword' => 'bar',
+            ],
+            [
+                'host' => 'api.super.com',
+                'expectedUsername' => '.super',
+                'expectedPassword' => 'bar',
+            ],
+            [
+                'host' => '.super.com',
+                'expectedUsername' => '.super',
+                'expectedPassword' => 'bar',
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider dataProviderCredentials
+     */
+    public function testBuildConfigWithDbAccess($host, $expectedUsername = null, $expectedPassword = null)
+    {
+        $grabyConfigBuilderMock = $this->getMockBuilder('Graby\SiteConfig\ConfigBuilder')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $grabySiteConfig = new GrabySiteConfig();
+        $grabySiteConfig->requires_login = true;
+        $grabySiteConfig->login_uri = 'http://api.example.com/login';
+        $grabySiteConfig->login_username_field = 'login';
+        $grabySiteConfig->login_password_field = 'password';
+        $grabySiteConfig->login_extra_fields = ['field=value'];
+        $grabySiteConfig->not_logged_in_xpath = '//div[@class="need-login"]';
+
+        $grabyConfigBuilderMock
+            ->method('buildForHost')
+            ->with($host)
+            ->will($this->returnValue($grabySiteConfig));
+
+        $user = $this->getMockBuilder('Wallabag\UserBundle\Entity\User')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $user->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
+
+        $token = new UsernamePasswordToken($user, 'pass', 'provider');
+
+        $tokenStorage = new TokenStorage();
+        $tokenStorage->setToken($token);
+
+        $logger = new Logger('foo');
+        $handler = new TestHandler();
+        $logger->pushHandler($handler);
+
+        $builder = new GrabySiteConfigBuilder(
+            $grabyConfigBuilderMock,
+            $tokenStorage,
+            $this->getClient()->getContainer()->get('wallabag_core.site_credential_repository'),
+            $logger
+        );
+
+        $config = $builder->buildForHost($host);
+
+        if (null === $expectedUsername && null === $expectedPassword) {
+            $this->assertFalse($config);
+
+            return;
+        }
+
+        $this->assertSame($expectedUsername, $config->getUsername());
+        $this->assertSame($expectedPassword, $config->getPassword());
+    }
 }
--- a/web/wallassets/material.css
+++ b/web/wallassets/material.css
Author	SHA1	Message	Date
Jeremy Benoist	9bbafdaad4	Release wallabag 2.3.8	2019-05-14 11:24:07 +02:00
Jérémy Benoist	227a1a27f1	Merge pull request #3966 from wallabag/prepare-2.3.8 Prepare 2.3.8 release	2019-05-14 11:14:37 +02:00
Jeremy Benoist	cc181629a0	Prepare 2.3.8 release	2019-05-14 10:16:46 +02:00
Kevin Decherf	eb06edba0c	Merge pull request #3964 from wallabag/fix/intl Fix Intl Locale issue	2019-05-14 09:36:46 +02:00
Jeremy Benoist	b50ecd0c8a	Fix Intl Locale issue Some issue appeared after the release of PHP 7.2.17 about Intl Memory Leak / infinite loop. To fix it we should upgrade to Symfony 3.4 (which is done in wallabag 2.4) but for the 2.3 branch, we'll use a temporary fix for the Locale issue.	2019-05-13 14:04:33 +02:00
Jérémy Benoist	a73cb8a689	Merge pull request #3922 from burkemw3/patch-5 Remove preview picture from share view page for #1875	2019-05-13 06:40:16 +02:00
Kevin Decherf	295b714426	Merge pull request #3943 from wallabag/img-referrer Enable no-referrer on img tags, enable strict-origin-when-cross-origin by default	2019-05-12 23:44:33 +02:00
Matt Burke	19822ecb31	Remove preview picture from share view page for #1875 Essentially, same as commit `038fccd` for single entry views. From that commit: > Showing the preview picture usually leads to showing a duplicate > image, and frequently leads to showing duplicate images directly > adjacent to each other.	2019-05-12 12:32:22 -04:00
Kevin Decherf	9ae5bd9e10	assets: regenerate material.css Signed-off-by: Kevin Decherf <kevin@kdecherf.com>	2019-05-10 23:08:23 +02:00
Kevin Decherf	2dbb5b2307	Enable no-referrer on img tags, enable strict-origin-when-cross-origin by default Fixes #3889 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>	2019-05-10 23:07:26 +02:00
Jérémy Benoist	570113208b	Merge pull request #3942 from wallabag/issue-3838 material: add metadata to list view	2019-05-09 15:45:07 +03:00
Kevin Decherf	4b5b228650	material: add metadata to list view Add reading time and creation date to rows of list view. Refactor styles using a sass mixin. Fixes #3838 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>	2019-05-01 15:47:48 +02:00
Jérémy Benoist	ea54c2adb1	Merge pull request #3937 from wallabag/fix/credential-subdomain Add ability to match many domains for credentials	2019-04-27 10:58:26 +02:00
Jeremy Benoist	35359bd3c6	Adding more tests to cover different scenario	2019-04-24 15:28:15 +02:00
Jeremy Benoist	ff8f338dc2	FIx unrelated failing test	2019-04-23 22:48:04 +02:00
Jeremy Benoist	f45496336f	Add ability to match many domains for credentials Instead of fetching one domain, we use the same method as in site config (to retrieve the matching file) and handle api.example.org, example.org, .org (yes the last one isn’t useful). If one of these match, we got it and use it.	2019-04-23 22:39:31 +02:00
Jérémy Benoist	bfd69c74e5	Merge pull request #3909 from wallabag/fix/html-not-defined Fix PHP warning	2019-03-18 09:26:33 +01:00
Jérémy Benoist	8ab5dcc467	Merge pull request #3908 from wallabag/epub-issue-3642 epub: fix exception when articles have the same title	2019-03-18 09:26:16 +01:00
Jérémy Benoist	893f107fa1	Merge pull request #3860 from baurmatt/fix/posix_compatibility Make dev/install/update script posix compatible	2019-03-18 09:25:00 +01:00
Jeremy Benoist	8ca858ee73	Fix PHP warning Looks like sometimes (usually from import) the `html` key isn’t available.	2019-03-18 06:23:41 +01:00
Kevin Decherf	41d476d7e7	epub: fix exception when articles have the same title This commit fixes an exception occuring when exporting as epub several articles with the same title. The chapter filename is now derived from title and url. Fixes #3642 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>	2019-03-17 23:36:10 +01:00
Matthias Baur	7c553a6017	Properly source require.sh Fixes #3571.	2019-03-12 15:44:38 +01:00
Kevin Decherf	a48ff25d4c	Merge pull request #3901 from wallabag/fix-pr-3893 material: fix left padding on non-entry pages introduced by #3893	2019-03-09 12:19:31 +01:00
Kevin Decherf	cf0010cf4a	material: fix left padding on non-entry pages introduced by #3893 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>	2019-03-09 00:27:50 +01:00
Jérémy Benoist	13d2fe6d2e	Merge pull request #3897 from wallabag/2.3.8-dev Jump to 2.3.8-dev	2019-03-04 15:23:06 +01:00
Jeremy Benoist	3d7a1f4caf	Jump to 2.3.8-dev	2019-03-04 13:49:23 +01:00