12 files changed, 65 insertions, 11 deletions

diff --git a/.travis.yml b/.travis.yml
index 8c8093bf..29ca7dc3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,7 +44,6 @@ matrix:
         - php: 7.0
           env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite
     allow_failures:
-        - php: 7.1
         - php: nightly
 
 # exclude v1 branches
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a87f1d82..c5096fdf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,26 @@
 ## Changelog
 
+### 2.2.2 2017/03/02
+
+- [#2950](https://github.com/wallabag/wallabag/pull/2950) Fixed symlinks issue during release creation (@nicosomb)
+- [#2832](https://github.com/wallabag/wallabag/pull/2832) Search by term: extend to entries url (@Kdecherf)
+- [#2830](https://github.com/wallabag/wallabag/pull/2830) Fixed rendering of entry title in Twig views (@Kdecherf)
+- [#2892](https://github.com/wallabag/wallabag/pull/2892) Updated spanish translation (@ngosang)
+- [#2915](https://github.com/wallabag/wallabag/pull/2915) Import: we now skip messages when user is null (@nicosomb)
+- [#2905](https://github.com/wallabag/wallabag/pull/2905) Alert that 2FA must be authorized in app/config/parameters.yml (@nicofrand)
+- [#2832](https://github.com/wallabag/wallabag/pull/2832) Search by term: extend to entries url (@Kdecherf)
+- [#2878](https://github.com/wallabag/wallabag/pull/2878) Added italian documentation (@matteocoder)
+- [#2860](https://github.com/wallabag/wallabag/pull/2860) Documentation: update java wrapper, add cmd tool to add article (@Strubbl)
+- [#2874](https://github.com/wallabag/wallabag/pull/2874) Added informations about Apache 2.4 (@kgaut)
+- [#2869](https://github.com/wallabag/wallabag/pull/2869) Added log for restricted access value (@j0k3r)
+- [#2846](https://github.com/wallabag/wallabag/pull/2846) Fixed misspells in polish translation (@mruminski)
+- [#2842](https://github.com/wallabag/wallabag/pull/2842) Update RulerZ (@K-Phoen)
+- [#2841](https://github.com/wallabag/wallabag/pull/2841) Show active list in the left menu during search (@Kdecherf)
+- [#2788](https://github.com/wallabag/wallabag/pull/2788) Documentation on how to configure mobile apps to work with wallabag (@Zettt)
+- [#2839](https://github.com/wallabag/wallabag/pull/2839) Fixed `composer.phar: not found` in update script (@foxmask)
+- [#2818](https://github.com/wallabag/wallabag/pull/2818) Fix nav-panel-search height (@Kdecherf)
+- [#2824](https://github.com/wallabag/wallabag/pull/2824) Renamed Developer section to API client management (@nicosomb)
+
 ### 2.2.1 2017/01/31
 
 - [#2809](https://github.com/wallabag/wallabag/pull/2809) Fixed duplicate entry for share_public in craue_setting_table and added documentation about migration (@nicosomb)
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
index 744031e8..1203e159 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
@@ -1,4 +1,4 @@
-# settings_changed: Configuration updated
+settings_changed: Konfiguracja zaktualizowana
 download_pictures: Pobierz obrazy na swój serwer
 carrot: Włącz udostępnianie dla Carrot
 diaspora_url: Adres URL Diaspora, jeżeli usługa jest włączona
@@ -24,12 +24,12 @@ entry: "artykuł"
 export: "eksport"
 import: "import"
 misc: "różne"
-modify_settings: "zatwierdz"
+modify_settings: "zatwierdź"
 piwik_host: Host twojej strony Piwik (bez http:// lub https://)
 piwik_site_id: ID twojej strony Piwik
 piwik_enabled: Włacz Piwik
 demo_mode_enabled: "Włacz tryb demo? (używany wyłącznie dla publicznej demonstracji Wallabag)"
 demo_mode_username: "Użytkownik Demonstracyjny"
 share_public: Zezwalaj na publiczny adres url dla wpisow
-# download_images_enabled: Download images locally
-# restricted_access: Enable authentication for websites with paywall
+download_images_enabled: Pobierz obrazy lokalnie
+restricted_access: Włącz autoryzację dla stron z paywallem
diff --git a/app/config/config.yml b/app/config/config.yml
index 4e802c98..d7231112 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -30,7 +30,7 @@ framework:
     assets: ~
 
 wallabag_core:
-    version: 2.2.1
+    version: 2.2.2
     paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
     languages:
         en: 'English'
diff --git a/composer.json b/composer.json
index b919f446..c43d2dcf 100644
--- a/composer.json
+++ b/composer.json
@@ -58,7 +58,7 @@
         "jms/serializer-bundle": "~1.1",
         "nelmio/api-doc-bundle": "~2.7",
         "mgargano/simplehtmldom": "~1.5",
-        "tecnickcom/tc-lib-pdf": "dev-master",
+        "wallabag/tcpdf": "^6.2",
         "simplepie/simplepie": "~1.3.1",
         "willdurand/hateoas-bundle": "~1.0",
         "htmlawed/htmlawed": "~1.1.19",
diff --git a/docs/de/user/installation.rst b/docs/de/user/installation.rst
index cec62d18..0de6b6de 100644
--- a/docs/de/user/installation.rst
+++ b/docs/de/user/installation.rst
@@ -111,6 +111,12 @@ Virtualhosts
 Konfiguration von Apache
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
+Vergiss nicht, die *rewrite* mod von Apache zu aktivieren.
+
+.. code-block:: bash
+
+    a2enmod rewrite && systemctl reload apache2
+
 Angenommen du willst wallabag in das Verzeichnis ``/var/www/wallabag`` installieren und du willst PHP als Apache Modul nutzen, dann ist hier ein vhost für wallabag:
 
 ::
diff --git a/docs/en/developer/paywall.rst b/docs/en/developer/paywall.rst
index 365027b4..153afa6f 100644
--- a/docs/en/developer/paywall.rst
+++ b/docs/en/developer/paywall.rst
@@ -6,12 +6,16 @@ wallabag can fetch articles from websites which use a paywall system.
 Enable paywall authentication
 -----------------------------
 
-In internal settings, in the **Article** section, enable authentication for websites with paywall (with the value 1).
+In internal settings, as a wallabag administrator, in the **Article** section, enable authentication for websites with paywall (with the value 1).
 
 Configure credentials in wallabag
 ---------------------------------
 
-Edit your ``app/config/parameters.yml`` file to edit credentials for each website with paywall. Here is an example for some french websites:
+Edit your ``app/config/parameters.yml`` file to edit credentials for each website with paywall. For example, under Ubuntu:
+
+``sudo -u www-data nano /var/www/html/wallabag/app/config/parameters.yml``
+
+Here is an example for some french websites (be careful: don't use the "tab" key, only spaces):
 
 .. code:: yaml
 
@@ -28,7 +32,7 @@ Parsing configuration files
 
 .. note::
 
-    Read `this part of the documentation <http://doc.wallabag.org/en/master/user/errors_during_fetching.html>`_ to understand the configuration files.
+    Read `this part of the documentation <http://doc.wallabag.org/en/master/user/errors_during_fetching.html>`_ to understand the configuration files, which are located under ``vendor/j0k3r/graby-site-config/``. For most of the websites, this file is already configured: the following instructions are only for the websites that are not configured yet.
 
 Each parsing configuration file needs to be improved by adding ``requires_login``, ``login_uri``,
 ``login_username_field``, ``login_password_field`` and ``not_logged_in_xpath``.
@@ -54,3 +58,8 @@ For example:
     login_password_field: password
 
     not_logged_in_xpath: //body[@class="not-logged-in"]
+    
+Last step: clear the cache
+--------------------------
+    
+It's necessary to clear the wallabag cache with the following command (here under Ubuntu): ``sudo -u www-data php /var/www/html/wallabag/bin/console cache:clear -e=prod``
diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst
index 7fb81aeb..2b730b83 100644
--- a/docs/en/user/installation.rst
+++ b/docs/en/user/installation.rst
@@ -110,6 +110,12 @@ Virtual hosts
 Configuration on Apache
 ~~~~~~~~~~~~~~~~~~~~~~~
 
+Do not forget to active the *rewrite* mod of Apache
+
+.. code-block:: bash
+
+    a2enmod rewrite && systemctl reload apache2
+
 Assuming you install wallabag in the ``/var/www/wallabag`` folder and that you want to use PHP as an Apache module, here's a vhost for wallabag:
 
 ::
diff --git a/docs/fr/user/installation.rst b/docs/fr/user/installation.rst
index 319735af..5d29cb01 100644
--- a/docs/fr/user/installation.rst
+++ b/docs/fr/user/installation.rst
@@ -107,6 +107,12 @@ Virtual hosts
 Configuration avec Apache
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
+N'oubliez pas d'activer le mod *rewrite* de Apache
+
+.. code-block:: bash
+
+    a2enmod rewrite && systemctl reload apache2
+
 En imaginant que vous vouliez installer wallabag dans le dossier ``/var/www/wallabag`` et que vous utilisiez PHP comme un module Apache, voici un vhost pour wallabag :
 
 ::
diff --git a/docs/it/user/installation.rst b/docs/it/user/installation.rst
index cd6ebbef..a79a31d3 100644
--- a/docs/it/user/installation.rst
+++ b/docs/it/user/installation.rst
@@ -110,6 +110,12 @@ Host virtuali
 Configurazione su Apache
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
+Non dimenticate di attivare la mod *rewrite* di Apache
+
+.. code-block:: bash
+
+    a2enmod rewrite && systemctl reload apache2
+
 Assumendo che voi abbiate installato wallabag nella cartella ``/var/www/wallabag`` e che vogliate usare PHP come un modulo Apache, ecco un vhost per l’applicazione:
 
 ::
diff --git a/scripts/release.sh b/scripts/release.sh
index e118b87e..bfb65684 100644
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -12,6 +12,7 @@ mkdir $TMP_FOLDER/$RELEASE_FOLDER
 git clone git@github.com:wallabag/wallabag.git -b $VERSION $TMP_FOLDER/$RELEASE_FOLDER/$VERSION
 cd $TMP_FOLDER/$RELEASE_FOLDER/$VERSION && SYMFONY_ENV=$ENV composer up -n --no-dev
 cd $TMP_FOLDER/$RELEASE_FOLDER/$VERSION && php bin/console wallabag:install --env=$ENV
+cd $TMP_FOLDER/$RELEASE_FOLDER/$VERSION && php bin/console assets:install --env=$ENV --symlink --relative
 cd $TMP_FOLDER/$RELEASE_FOLDER && tar czf wallabag-$VERSION.tar.gz --exclude="var/cache/*" --exclude="var/logs/*" --exclude="var/sessions/*" --exclude=".git" $VERSION
 echo "MD5 checksum of the package for wallabag $VERSION"
 md5 $TMP_FOLDER/$RELEASE_FOLDER/wallabag-$VERSION.tar.gz
diff --git a/src/Wallabag/CoreBundle/Resources/views/base.html.twig b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
index 289458d4..020d8efc 100644
--- a/src/Wallabag/CoreBundle/Resources/views/base.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/base.html.twig
@@ -3,7 +3,7 @@
 <!--[if lte IE 7]><html class="no-js ie7 ie67 ie678" lang="en"><![endif]-->
 <!--[if IE 8]><html class="no-js ie8 ie678" lang="en"><![endif]-->
 <!--[if gt IE 8]><html class="no-js" lang="en"><![endif]-->
-<html lang="fr">
+<html>
     <head>
         {% block head %}
             <meta name="viewport" content="initial-scale=1.0">