Release wallabag 2.0.4

2016-05-07 20:02:18 +02:00
663 changed files with 23545 additions and 162407 deletions
--- a/.editorconfig
+++ b/.editorconfig
@ -8,7 +8,3 @@ indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
 insert_final_newline = true
 [*.{js,css}]
 indent_style = space
 indent_size = 2
--- a/.eslintrc.json
+++ b/.eslintrc.json
@ -1,14 +0,0 @@
 {
    "extends": "airbnb-base",
    "parser": "babel-eslint",
    "env": {
        "browser": true,
        "es6": true
    },
    "globals": {
        "Routing": true
    },
    "rules": {
        "import/no-extraneous-dependencies": ["error", {"devDependencies": true, "optionalDependencies": true, "peerDependencies": true}]
    }
 }
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@ -3,11 +3,22 @@
 ## You found a bug
 Please [open a new issue](https://github.com/wallabag/wallabag/issues/new).
-To fix the bug quickly, we need some infos: please answer to the questions in the issue form.
+To fix the bug quickly, we need some infos:
 * your wallabag version (in `app/config/config.yml`, see `wallabag_core.version`)
 * your webserver installation :
  * type of hosting (shared or dedicated)
  * in case of a dedicated server, the server and OS used
  * the php version used, eventually `phpinfo()`
 * which storage system you choose at install (SQLite, MySQL/MariaDB or PostgreSQL)
 * any particular details which could be related
-If you have the skills, look for errors into php, server and application (see `var/logs`) logs.
+If relevant :
 * the link you want to save and which causes problem
 * the file you want to import into wallabag, or just an extract
 If you have the skills, look for errors into php, server and application (see `var/logs`) logs
 Note : If you have large portions of text, use [Github's Gist service](https://gist.github.com/) or other pastebin-like.
 ## You want to fix a bug or to add a feature
-Please fork wallabag and work with **the master branch**.
+Please fork wallabag and work with **the v2 branch** only. **Do not work on master branch**.
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@ -1,5 +1,3 @@
 :warning: If your issue is about an error during fetching a link, please read: http://doc.wallabag.org/en/master/user/errors_during_fetching.html#how-can-i-help-to-fix-that
 ### Issue details
 Please provide issue details here.
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@ -1,16 +1,11 @@
 | Q             | A
 | ------------- | ---
-| Bug fix?      | yes/no
+| Bug fix?      | yes|no
-| New feature?  | yes/no
+| New feature?  | yes|no
-| BC breaks?    | yes/no
+| BC breaks?    | yes|no
-| Deprecations? | yes/no
+| Deprecations? | yes|no
-| Tests pass?   | yes/no
+| Tests pass?   | yes|no
-| Documentation | yes/no
+| Documentation | yes|no
-| Translation   | yes/no
+| Translation   | yes|no
-| Fixed tickets | #...
+| Fixed tickets | comma-separated list of tickets fixed by the PR, if any
 | License       | MIT
 <!--
 - Please fill in this template according to the PR you're about to submit.
 - Replace this comment by a description of what your PR is solving.
 -->
--- a/.gitignore
+++ b/.gitignore
@ -10,9 +10,6 @@
 /var/sessions/*
 !var/sessions/.gitkeep
 !var/SymfonyRequirements.php
 /bin/*
 !/bin/console
 !/bin/symfony_requirements
 # Parameters
 /app/config/parameters.yml
@ -21,12 +18,8 @@
 /vendor/
 # Assets and user uploads
-web/uploads/
+/web/bundles/
-!web/bundles
+/web/uploads/
 web/bundles/*
 !web/bundles/wallabagcore
 /web/assets/images/*
 !web/assets/images/.gitkeep
 # Build
 /app/build
@ -36,6 +29,7 @@ web/bundles/*
 /composer.phar
 # Data for wallabag
 data/assets/*
 data/db/wallabag*.sqlite
 # Docker container logs and data
@ -44,10 +38,3 @@ docker/data/
 # To avoid crazy stuff on some PR, we must manually FORCE ADD IT on each new release
 composer.lock
 # assets stuff
 node_modules/
 bin
 app/Resources/build/
 !/src/Wallabag/CoreBundle/Resources/public
 /src/Wallabag/CoreBundle/Resources/public/*
--- a/.stylelintrc
+++ b/.stylelintrc
@ -1,3 +0,0 @@
 {
  "extends": "stylelint-config-standard"
 }
--- a/.travis.yml
+++ b/.travis.yml
@ -1,9 +1,5 @@
 language: php
 services:
  - rabbitmq
  - redis
 # faster builds on docker-container setup
 sudo: false
@ -19,19 +15,12 @@ cache:
    directories:
        - vendor
        - $HOME/.composer/cache
        - node_modules
        - $HOME/.cache/bower
        - $HOME/.npm
 php:
    - 5.5
    - 5.6
    - 7.0
-    - 7.1
+    - hhvm
    - nightly
 node_js:
    - "5"
 env:
    - DB=mysql
@ -42,10 +31,12 @@ matrix:
    fast_finish: true
    include:
        - php: 7.0
-          env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run ASSETS=build DB=sqlite
+          env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite
    exclude:
        - php: hhvm
          env: DB=pgsql  # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency
    allow_failures:
-        - php: 7.1
+        - php: hhvm
        - php: nightly
 # exclude v1 branches
 branches:
@ -53,17 +44,10 @@ branches:
        - legacy
 before_script:
-    - PHP=$TRAVIS_PHP_VERSION
+    - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
-    - if [[ ! $PHP = hhvm* ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
+    - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi;
    # xdebug isn't enable for PHP 7.1
    - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi
    - composer self-update --no-progress
-    - if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi;
+    - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag_test;' -U postgres; fi;
 install:
    - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 6.7; fi;
    - if [[ $ASSETS = build ]]; then npm install -g npm@latest; fi;
    - if [[ $ASSETS = build ]]; then npm install; fi;
 before_install:
    - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
@ -71,9 +55,6 @@ before_install:
 script:
    - travis_wait composer update --no-interaction --no-progress
    - ant prepare-$DB
-    - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then ./bin/simple-phpunit -v ; fi;
+    - bin/phpunit -v
-    - if [[ $CS_FIXER = run ]]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi;
+    - if [ "$CS_FIXER" = "run" ]; then php bin/php-cs-fixer fix src/ --verbose --dry-run ; fi;
-    - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;
+    - if [ "$VALIDATE_TRANSLATION_FILE" = "run" ]; then php bin/console lint:yaml src/Wallabag/CoreBundle/Resources/translations -v ; fi;
    - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml app/Resources/CraueConfigBundle/translations -v ; fi;
    - if [[ $VALIDATE_TRANSLATION_FILE = run ]]; then php bin/console lint:yaml src/Wallabag/UserBundle/Resources/translations -v ; fi;
    - if [[ $ASSETS = build ]]; then ./node_modules/grunt-cli/bin/grunt tests; fi;
--- a/.zappr.yaml
+++ b/.zappr.yaml
@ -1,26 +0,0 @@
 # see https://zappr.opensource.zalan.do/
 autobranch: false
 commit: false
 approvals:
  minimum: 1
  ignore: pr_opener
  pattern: "^(:\\+1:|👍)$"
  veto:
    pattern: "^(:\\-1:|👎)$"
  from:
    orgs:
      - wallabag
    collaborators: true
 specification:
  title:
    minimum-length:
      enabled: true
      length: 8
  body:
    minimum-length:
      enabled: true
      length: 8
    contains-url: false
    contains-issue-number: false
  template:
    differs-from-body: true
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,579 +1,122 @@
-## Changelog
+# Changelog
-### 2.2.1 2017/01/31
+All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
- [#2809](https://github.com/wallabag/wallabag/pull/2809) Fixed duplicate entry for share_public in craue_setting_table and added documentation about migration (@nicosomb)
+## [2.0.4] - 2016-05-07
-### 2.2.0 2017/01/27
+### Added
 - [#2789](https://github.com/wallabag/wallabag/pull/2789) Added indexes on is_archived and is_starred (@nicosomb)
 - [#2763](https://github.com/wallabag/wallabag/pull/2763) Sort list of available tags (@janLo)
 - [#2646](https://github.com/wallabag/wallabag/pull/2646) Added explanations about migrations (@nicosomb, @jlnostr)
 - [#2787](https://github.com/wallabag/wallabag/pull/2787) Lock kphoen/rulerz to avoid breaking changes (@j0k3r)
 - [#2750](https://github.com/wallabag/wallabag/pull/2750) Added migration to rename uuid to uid (@nicosomb)
 - [#2774](https://github.com/wallabag/wallabag/pull/2774) add cli export (@tcitworld)
 - [#2742](https://github.com/wallabag/wallabag/pull/2742) Avoid false preview image (@j0k3r)
 - [#2733](https://github.com/wallabag/wallabag/pull/2733) Fixed API error No matching accepted Response format could be determined (@nicosomb)
 - [#2735](https://github.com/wallabag/wallabag/pull/2735) Removed the small element on reading time (@nicosomb)
 - [#2729](https://github.com/wallabag/wallabag/pull/2729) Fix double overlay on expanded right sidenav (@Simounet)
 - [#2728](https://github.com/wallabag/wallabag/pull/2728) Fix right side-nav scrolling on low height window (@Simounet)
 - [#2725](https://github.com/wallabag/wallabag/pull/2725) Share to Shaarli - Include tags (@lapineige,)
 - [#2732](https://github.com/wallabag/wallabag/pull/2732) Firefox add-on URL updated (@Simounet)
 - [#2730](https://github.com/wallabag/wallabag/pull/2730) Access to search, filters, export on mobile (@Simounet)
 - [#2731](https://github.com/wallabag/wallabag/pull/2731) Minor typo fix (@llune)
 - [#2702](https://github.com/wallabag/wallabag/pull/2702) Added index on entry.uuid (@nicosomb)
 - [#2724](https://github.com/wallabag/wallabag/pull/2724) Fix entry reading time (@Simounet)
 - [#2723](https://github.com/wallabag/wallabag/pull/2723) Fixed export by tags with a tag which contains space (@nicosomb)
 - [#2696](https://github.com/wallabag/wallabag/pull/2696) Run migration on each test (@j0k3r)
 - [#2714](https://github.com/wallabag/wallabag/pull/2714) Fix the box shadow on the card entry (@Simounet)
 - [#2616](https://github.com/wallabag/wallabag/pull/2616) Change documentation links to HTTPS (@mathieui)
 - [#2682](https://github.com/wallabag/wallabag/pull/2682) Ensure craue_config_setting migration are ok (@nicosomb, @j0k3r)
 - [#2690](https://github.com/wallabag/wallabag/pull/2690) Added QoS for RabbitMQ (@nicosomb)
 - [#2701](https://github.com/wallabag/wallabag/pull/2701) Removed outputWalkers for pagination (@nicosomb)
 - [#2667](https://github.com/wallabag/wallabag/pull/2667) Upgrade to Symfony 3.2 (@nicosomb, @j0k3r)
 - [#2699](https://github.com/wallabag/wallabag/pull/2699) Removed user join in query builder (@nicosomb)
 - [#2697](https://github.com/wallabag/wallabag/pull/2697) Add default value for list_mode (@j0k3r)
 - [#2691](https://github.com/wallabag/wallabag/pull/2691) Moved total messages from import (@nicosomb)
 - [#2689](https://github.com/wallabag/wallabag/pull/2689) Replaced chmod for download pictures feature (@nicosomb)
 - [#2688](https://github.com/wallabag/wallabag/pull/2688) Fixed imports with is_starred and is_archived (@nicosomb)
 - [#2686](https://github.com/wallabag/wallabag/pull/2686) Casted maxIterations for Redis import (@nicosomb)
 - [#2680](https://github.com/wallabag/wallabag/pull/2680) Limit rule to 255 (@j0k3r)
 - [#2679](https://github.com/wallabag/wallabag/pull/2679) Fix content from imported entried being discarded when URL goes bad (@j0k3r, @jcharaoui)
 - [#2677](https://github.com/wallabag/wallabag/pull/2677) add translations/wallabag_user.de.yml (fixes #2673) (@Strubbl)
 - [#2676](https://github.com/wallabag/wallabag/pull/2676) Updated addons links (@nicosomb)
 - [#2674](https://github.com/wallabag/wallabag/pull/2674) Fixed 404 for wallabag logo in 2FA (@nicosomb)
 - [#2672](https://github.com/wallabag/wallabag/pull/2672) Fixed typo in asynchronous documentation (@nicosomb)
 - [#2670](https://github.com/wallabag/wallabag/pull/2670) Added floating button on entry view for mobile (@nicosomb)
 - [#2650](https://github.com/wallabag/wallabag/pull/2650) Added hasColumn() in migration to check column existence (@nicosomb)
 - [#2662](https://github.com/wallabag/wallabag/pull/2662) Add list view (@nicosomb)
 - [#2663](https://github.com/wallabag/wallabag/pull/2663) Removed FOSUser attributes removed in alpha4 (@nicosomb)
 - [#2659](https://github.com/wallabag/wallabag/pull/2659) Fix incorrect reading time calculation for entries in non-latin languages. (@akovalyov)
 - [#2654](https://github.com/wallabag/wallabag/pull/2654) Enforce lowercase on domain name filter (@Kdecherf)
 - [#2622](https://github.com/wallabag/wallabag/pull/2622) Material UI Changes (@nicosomb, @Kdecherf)
 - [#2642](https://github.com/wallabag/wallabag/pull/2642) Fixed logout shortcut (@nicosomb)
 - [#2620](https://github.com/wallabag/wallabag/pull/2620) Fix password layout (@j0k3r)
 - [#2640](https://github.com/wallabag/wallabag/pull/2640) Fixed entry shortcuts available in list view (@nicosomb)
 - [#2637](https://github.com/wallabag/wallabag/pull/2637) Update messages.pl.yml (@wallabag)
 - [#2317](https://github.com/wallabag/wallabag/pull/2317) Added authentication for restricted access articles (@nicosomb, @bdunogier)
 - [#2612](https://github.com/wallabag/wallabag/pull/2612) Added help about shortcuts (@nicosomb)
 - [#2635](https://github.com/wallabag/wallabag/pull/2635) Return 304 when content isn't reloaded using the API (@j0k3r)
 - [#2613](https://github.com/wallabag/wallabag/pull/2613) Fix card action overlap (@j0k3r)
 - [#2614](https://github.com/wallabag/wallabag/pull/2614) Add ability to reload entry from API (@j0k3r)
 - [#2632](https://github.com/wallabag/wallabag/pull/2632) Update messages.pl.yml (@wallabag)
 - [#2630](https://github.com/wallabag/wallabag/pull/2630) Add white-text class to card-title too (@ThibaudDauce)
 - [#2600](https://github.com/wallabag/wallabag/pull/2600) Install assets for shortcuts (@j0k3r)
 - [#2601](https://github.com/wallabag/wallabag/pull/2601) Added http_status in Entry entity (@nicosomb)
 - [#2593](https://github.com/wallabag/wallabag/pull/2593) Put log in the most common failure tests (@j0k3r)
 - [#2592](https://github.com/wallabag/wallabag/pull/2592) Update messages.pl.yml (@wallabag)
 - [#2547](https://github.com/wallabag/wallabag/pull/2547) Added a configuration to define the redirection after archiving an entry (@j0k3r, @nicosomb, @Strubbl)
 - [#2495](https://github.com/wallabag/wallabag/pull/2495) Added shortcuts (@nicosomb, @tcitworld)
 - [#2566](https://github.com/wallabag/wallabag/pull/2566) Added unmark.it sharing (@nicosomb)
 - [#2564](https://github.com/wallabag/wallabag/pull/2564) Update messages.pl.yml (@wallabag)
 - [#2553](https://github.com/wallabag/wallabag/pull/2553) Added new tag form in mobile view for Material theme (@nicosomb)
 - [#2548](https://github.com/wallabag/wallabag/pull/2548) Add Pinboard import (@Strubbl, @j0k3r)
 - [#2551](https://github.com/wallabag/wallabag/pull/2551) Removed Maintenance bundle (@nicosomb)
 - [#2541](https://github.com/wallabag/wallabag/pull/2541) Update messages.pl.yml (@wallabag)
 - [#2540](https://github.com/wallabag/wallabag/pull/2540) Update of the OC version (@Quent-in)
 - [#2535](https://github.com/wallabag/wallabag/pull/2535) Use created_at as default sort (@j0k3r)
 - [#2180](https://github.com/wallabag/wallabag/pull/2180) Download pictures (@j0k3r, @tcitworld)
 - [#2523](https://github.com/wallabag/wallabag/pull/2523) Added QRCode and link to configure android application (@tcitworld, @nicosomb)
 - [#2499](https://github.com/wallabag/wallabag/pull/2499) Added relation between API Client and User (@nicosomb)
 - [#2496](https://github.com/wallabag/wallabag/pull/2496) Update messages.pl.yml (@wallabag)
 - [#2401](https://github.com/wallabag/wallabag/pull/2401) Reset account (@j0k3r)
 - [#1890](https://github.com/wallabag/wallabag/pull/1890) bring annotations to API (@j0k3r, @nicosomb, @tcitworld)
 - [#2456](https://github.com/wallabag/wallabag/pull/2456) use new tcpdf library version (@tcitworld)
 - [#2453](https://github.com/wallabag/wallabag/pull/2453) Fix API export (@j0k3r)
 - [#2438](https://github.com/wallabag/wallabag/pull/2438) Update messages.pl.yml (@wallabag)
 - [#2372](https://github.com/wallabag/wallabag/pull/2372) API: ability to export entry in all available format (epub, pdf, etc...) (@j0k3r, @pmartin)
 - [#2409](https://github.com/wallabag/wallabag/pull/2409) Occitan version update (@Quent-in, @nicosomb)
 - [#2177](https://github.com/wallabag/wallabag/pull/2177) Delete user (@j0k3r, @nicosomb, @tcitworld)
-### 2.1.6 2017/01/18
+- [#2016](https://github.com/wallabag/wallabag/pull/2016) Big updates in [our documentation](http://doc.wallabag.org/en/master/) (Nicolas Lœuillet)
- [#2759](https://github.com/wallabag/wallabag/pull/2759) Prepare wallabag 2.1.6 :rocket: (@nicosomb)
+- [#2028](https://github.com/wallabag/wallabag/pull/2028) Documentation about android application (Strubbl)
- [#2758](https://github.com/wallabag/wallabag/pull/2758) Fixed possible JS injection via the title edition (@nicosomb)
+- [#2019](https://github.com/wallabag/wallabag/pull/2019) Italian translation (Daniele Conca)
- [#2736](https://github.com/wallabag/wallabag/pull/2736) Update copyright year (@lex111)
+- [#2011](https://github.com/wallabag/wallabag/pull/2011) Documentation about wallabag upgrade (biva)
- [#2624](https://github.com/wallabag/wallabag/pull/2624) Fix #2056 update config.yml (@Rurik19)
+- [#1985](https://github.com/wallabag/wallabag/pull/1985) Documentation about rights access (FoxMaSk)
 - [#1969](https://github.com/wallabag/wallabag/pull/1969) Third resources for API in documentation (Nicolas Lœuillet)
 - [#1967](https://github.com/wallabag/wallabag/pull/1967) FAQ page in documentation (Nicolas Lœuillet)
-### 2.1.5 2016/11/21
+### Changed
 - [#2625](https://github.com/wallabag/wallabag/pull/2625) Prepare wallabag 2.1.5 (@nicosomb)
 - [#2623](https://github.com/wallabag/wallabag/pull/2623) Force composer to run as PHP 5.5.9 (@j0k3r)
 - [#2608](https://github.com/wallabag/wallabag/pull/2608) Change version to 2.2.0-dev (@nicosomb)
 - [#2607](https://github.com/wallabag/wallabag/pull/2607) Updated changelog for 2.1.4 (@nicosomb)
-### 2.1.4 2016/11/19
+- [#1977](https://github.com/wallabag/wallabag/pull/1977) Spanish documentation (jami7)
 - [#2604](https://github.com/wallabag/wallabag/pull/2604) wallabag can’t work on PostgreSQL <= 9.1 (@j0k3r)
 - [#2605](https://github.com/wallabag/wallabag/pull/2605) Add .travis.yml change to RELEASE_PROCESS (@j0k3r)
 - [#2603](https://github.com/wallabag/wallabag/pull/2603) Fix clear-cache problem using —no-dev (@j0k3r)
 - [#2596](https://github.com/wallabag/wallabag/pull/2596) Prepare wallabag 2.1.4 :rocket: (@nicosomb)
 - [#2550](https://github.com/wallabag/wallabag/pull/2550) Reordered documentation (@jlnostr, @nicosomb)
 - [#2578](https://github.com/wallabag/wallabag/pull/2578) Added help on config screen (@nicosomb)
 - [#2570](https://github.com/wallabag/wallabag/pull/2570) Added creation date on entries view (@nicosomb)
 - [#2587](https://github.com/wallabag/wallabag/pull/2587) User-agents have moved to site-config (@j0k3r)
 - [#2584](https://github.com/wallabag/wallabag/pull/2584) fix #2582 - Documentation, Nginx config: disable all other PHP file from symphony (@blankoworld)
 - [#2577](https://github.com/wallabag/wallabag/pull/2577) Added tooltips in header bar (@nicosomb)
 - [#2562](https://github.com/wallabag/wallabag/pull/2562) Bigger image preview in case of only image content (@j0k3r)
 - [#2571](https://github.com/wallabag/wallabag/pull/2571) Changed behavior when we change language (@nicosomb)
 - [#2565](https://github.com/wallabag/wallabag/pull/2565) Removed support website on about page (@nicosomb)
 - [#2563](https://github.com/wallabag/wallabag/pull/2563) Improve PR template (@j0k3r)
 - [#2561](https://github.com/wallabag/wallabag/pull/2561) fix #2559 (@Rurik19)
 - [#2555](https://github.com/wallabag/wallabag/pull/2555) Reorder variable assignation in update.sh script, fix #2554 (@dkrmr)
 - [#2556](https://github.com/wallabag/wallabag/pull/2556) Replaced TokenStorage with TokenStorageInterface (@nicosomb)
 - [#2552](https://github.com/wallabag/wallabag/pull/2552) Round readingtime to avoid crazy number (@j0k3r)
 - [#2546](https://github.com/wallabag/wallabag/pull/2546) Updated default parameters.yml file in documentation (@nicosomb)
 - [#2545](https://github.com/wallabag/wallabag/pull/2545) Update the upgrade documentation (@nicosomb)
-### 2.1.3 2016/11/04
+### Fixed
 - [#2536](https://github.com/wallabag/wallabag/pull/2536) Prepare wallabag 2.1.3 :rocket: (@nicosomb)
 - [#2460](https://github.com/wallabag/wallabag/pull/2460) UI Changes (@tcitworld, @j0k3r)
 - [#2534](https://github.com/wallabag/wallabag/pull/2534) Use created_at as default sort (@j0k3r)
 - [#2530](https://github.com/wallabag/wallabag/pull/2530) Added documentation about failed to load external entity error (@j0k3r, @Strubbl, @nicosomb)
 - [#2519](https://github.com/wallabag/wallabag/pull/2519) Translation update - French (@j0k3r, @Jibec)
 - [#2528](https://github.com/wallabag/wallabag/pull/2528) Force user-agent for .slashdot.org (@Kdecherf)
 - [#2524](https://github.com/wallabag/wallabag/pull/2524) Add Instapaper to CLI import (@lologhi)
 - [#2521](https://github.com/wallabag/wallabag/pull/2521) fix path for  the install scripts (@foxmask)
 - [#2520](https://github.com/wallabag/wallabag/pull/2520) Inject parameter instead of service (@j0k3r)
 - [#2518](https://github.com/wallabag/wallabag/pull/2518) docs: fix link to wallabag-stats project (@Strubbl)
 - [#2514](https://github.com/wallabag/wallabag/pull/2514) docs: update 3rd party projects by Strubbl (@Strubbl)
 - [#2513](https://github.com/wallabag/wallabag/pull/2513) Updated Capistrano configuration (@nicosomb)
 - [#2506](https://github.com/wallabag/wallabag/pull/2506) Fixed entries export filtered with a tag (@nicosomb)
 - [#2509](https://github.com/wallabag/wallabag/pull/2509) Exploded WallabagRestController into many controllers (@nicosomb)
 - [#2508](https://github.com/wallabag/wallabag/pull/2508) Added the whole path to parameters.yml file (@nicosomb)
 - [#2507](https://github.com/wallabag/wallabag/pull/2507) Added require.sh to check if composer is installed (@nicosomb)
 - [#2500](https://github.com/wallabag/wallabag/pull/2500) Added a check in Makefile to see if composer is installed (@nicosomb)
 - [#2504](https://github.com/wallabag/wallabag/pull/2504) Added tag label in the page title (@nicosomb)
 - [#2473](https://github.com/wallabag/wallabag/pull/2473) Portuguese (Brazilian) translation (@pmichelazzo, @j0k3r, @nicosomb, @Quent-in, @danbartram, @even-allmighty, @Strubbl, @tcitworld, @benages, @Simounet, @charno6, @Rurik19, @bmillemathias, @cstuder, @egilli, @pmartin)
 - [#2493](https://github.com/wallabag/wallabag/pull/2493) Add relevant links to fetch content error page (@nicosomb, @bmillemathias)
 - [#2486](https://github.com/wallabag/wallabag/pull/2486) Added :fr: documentation for wallabag backup (@jlnostr, @nicosomb)
 - [#2484](https://github.com/wallabag/wallabag/pull/2484) Document what to backup in Wallabag (@bmillemathias)
 - [#2485](https://github.com/wallabag/wallabag/pull/2485) Fix missing words in Android application documentation (@bmillemathias)
 - [#2481](https://github.com/wallabag/wallabag/pull/2481) Some fixes (@j0k3r)
 - [#2482](https://github.com/wallabag/wallabag/pull/2482) If reload content failed, don’t update it (@j0k3r)
 - [#2467](https://github.com/wallabag/wallabag/pull/2467) Update wallabag version for master branch (@nicosomb)
 - [#2466](https://github.com/wallabag/wallabag/pull/2466) Removed MD5 hash in documentation (@nicosomb)
-### 2.1.2 2016/10/17
+- [#2023](https://github.com/wallabag/wallabag/pull/2023) Fix translation for validators (Nicolas Lœuillet)
- [#2452](https://github.com/wallabag/wallabag/pull/2452) Prepare wallabag 2.1.2 :rocket: (@nicosomb)
+- [#2020](https://github.com/wallabag/wallabag/pull/2020) Fix number of entries in tag/list (Nicolas Lœuillet)
- [#2464](https://github.com/wallabag/wallabag/pull/2464) Fixed hardcoded title for internal settings (@nicosomb)
+- [#2022](https://github.com/wallabag/wallabag/pull/2022) Fix pagination bar on small devices (Nicolas Lœuillet)
- [#2455](https://github.com/wallabag/wallabag/pull/2455) Fix tabs on material (@tcitworld)
+- [#2013](https://github.com/wallabag/wallabag/pull/2013) Fix tag listing (Nicolas Lœuillet)
- [#2454](https://github.com/wallabag/wallabag/pull/2454) Fix baggy display on small screens (@tcitworld)
+- [#1976](https://github.com/wallabag/wallabag/pull/1976) Fix filter reading time (Nicolas Lœuillet)
- [#2459](https://github.com/wallabag/wallabag/pull/2459) German: improve existing and add missing translation (@Strubbl)
+- [#2005](https://github.com/wallabag/wallabag/pull/2005) Fix reading speed not defined when user was created via config page (Nicolas Lœuillet)
- [#2457](https://github.com/wallabag/wallabag/pull/2457) add link to German documentation in about page (@Strubbl)
+- [#2010](https://github.com/wallabag/wallabag/pull/2010) Set the title via POST /api/entries (Nicolas Lœuillet)
 - [#2451](https://github.com/wallabag/wallabag/pull/2451) Bring make dev (@tcitworld)
 - [#2450](https://github.com/wallabag/wallabag/pull/2450) View improvements (@tcitworld)
 - [#2412](https://github.com/wallabag/wallabag/pull/2412) Fix PostgreSQL migrations (@j0k3r)
 - [#2446](https://github.com/wallabag/wallabag/pull/2446) Added information about tagging rules in documentation (@Strubbl, @nicosomb)
 - [#2447](https://github.com/wallabag/wallabag/pull/2447) Fixed french and german doc homepages (@nicosomb)
 - [#2444](https://github.com/wallabag/wallabag/pull/2444) Mention example instance in docs (@Kaligule)
 - [#1](https://github.com/wallabag/wallabag/pull/1) Mention example instance (@Kaligule)
 - [#2435](https://github.com/wallabag/wallabag/pull/2435) Added french documentation for upgrade (@nicosomb, @Strubbl)
 - [#2434](https://github.com/wallabag/wallabag/pull/2434) Added french documentation for parameters.yml (@Strubbl, @nicosomb)
 - [#2439](https://github.com/wallabag/wallabag/pull/2439) Minor fixes in the english documentation (@zertrin)
 - [#2432](https://github.com/wallabag/wallabag/pull/2432) Update ISSUE_TEMPLATE.md (@j0k3r)
 - [#2429](https://github.com/wallabag/wallabag/pull/2429) Lock deps for FOSUser (@j0k3r)
 - [#2422](https://github.com/wallabag/wallabag/pull/2422) Fixed display for note in installation page (@nicosomb)
 - [#2426](https://github.com/wallabag/wallabag/pull/2426) Fix links on english documentation homepage (@nicosomb)
 - [#2420](https://github.com/wallabag/wallabag/pull/2420) Avoid error when Redis isn't here in tests (@j0k3r)
 - [#2403](https://github.com/wallabag/wallabag/pull/2403) Cleaned up documentation for installation process (@nicosomb, @j0k3r, @Strubbl)
 - [#2419](https://github.com/wallabag/wallabag/pull/2419) Fixed Twitter Cards by adding a description tag (@nicosomb)
 - [#2418](https://github.com/wallabag/wallabag/pull/2418) Added support of Twitter Cards for public articles (@nicosomb)
 - [#2417](https://github.com/wallabag/wallabag/pull/2417) Define a dev version for the master (@j0k3r)
 - [#2411](https://github.com/wallabag/wallabag/pull/2411) Fix entities definition (@j0k3r)
 - [#2414](https://github.com/wallabag/wallabag/pull/2414) Remove automatic closing of the window from bookmarklet (@szafranek)
 - [#2413](https://github.com/wallabag/wallabag/pull/2413) When a sub command fail, display error message (@j0k3r)
 - [#2410](https://github.com/wallabag/wallabag/pull/2410) Optimize tag list display (@j0k3r)
 - [#2406](https://github.com/wallabag/wallabag/pull/2406) Show number of annotations instead of nbAnnotations placeholder (@szafranek)
 - [#2405](https://github.com/wallabag/wallabag/pull/2405) Fix few invalid HTML tags (@szafranek)
 - [#2402](https://github.com/wallabag/wallabag/pull/2402) Removed 1.x stuff in CHANGELOG (@nicosomb)
 - [#2351](https://github.com/wallabag/wallabag/pull/2351) Changed relation between API client and refresh token (@j0k3r, @nicosomb)
 - [#2393](https://github.com/wallabag/wallabag/pull/2393) Ability to check multiple urls in API (@j0k3r)
 - [#2397](https://github.com/wallabag/wallabag/pull/2397) Ensure orphan tag are remove in API (@j0k3r)
 - [#2399](https://github.com/wallabag/wallabag/pull/2399) Use default locale for user config (@j0k3r)
 - [#2400](https://github.com/wallabag/wallabag/pull/2400) Set env to prod in documentation (@j0k3r)
 - [#2396](https://github.com/wallabag/wallabag/pull/2396) Update messages.pl.yml (@wallabag)
 - [#2395](https://github.com/wallabag/wallabag/pull/2395) Add ability to use socket (@j0k3r)
 - [#2386](https://github.com/wallabag/wallabag/pull/2386) Changed Changelog by using github-changelog-generator from @skywinder (@nicosomb)
 - [#2389](https://github.com/wallabag/wallabag/pull/2389) Added default picture if preview picture is null (@nicosomb)
 - [#2388](https://github.com/wallabag/wallabag/pull/2388) Fixed two-factor checkbox display in user admin panel (@nicosomb)
 - [#2385](https://github.com/wallabag/wallabag/pull/2385) Added documentation about siteconfig fix (@nicosomb)
 - [#2383](https://github.com/wallabag/wallabag/pull/2383) Added OpenGraph support for public articles (@nicosomb)
 - [#2332](https://github.com/wallabag/wallabag/pull/2332) Fix relations export for Entry (@j0k3r)
 - [#2377](https://github.com/wallabag/wallabag/pull/2377) Fix exists API call (@j0k3r, @tcitworld)
 - [#2374](https://github.com/wallabag/wallabag/pull/2374) Clickable tags (@tcitworld)
 - [#2375](https://github.com/wallabag/wallabag/pull/2375) try to reduce assets build npm connection failing by updating nodejs (@tcitworld)
 - [#2363](https://github.com/wallabag/wallabag/pull/2363) Remove mouf/nodejs-installer from composer (@j0k3r)
-### 2.1.1 2016/10/04
+## [2.0.3] - 2016-04-22
 - [#2349](https://github.com/wallabag/wallabag/pull/2349) Prepare wallabag 2.1.1 (@nicosomb, @j0k3r)
 - [#2353](https://github.com/wallabag/wallabag/pull/2353) Basically, fix everything (@tcitworld, @nicosomb, @j0k3r)
 - [#2359](https://github.com/wallabag/wallabag/pull/2359) Create config even if user is disabled (@j0k3r)
 - [#2354](https://github.com/wallabag/wallabag/pull/2354) Add php-bcmath extension to requirements (@Zayon)
 - [#2341](https://github.com/wallabag/wallabag/pull/2341) Update messages.pl.yml (@mruminski)
 - [#2340](https://github.com/wallabag/wallabag/pull/2340) small improvement for german translation (@Strubbl)
 - [#2338](https://github.com/wallabag/wallabag/pull/2338) Fix for 2.1 installation (@j0k3r)
-### 2.1.0 2016/10/03
+### Added
 - [#2334](https://github.com/wallabag/wallabag/pull/2334) Prepare wallabag 2.1.0 :rocket: (@nicosomb)
 - [#2335](https://github.com/wallabag/wallabag/pull/2335) Fixed CSS for quickstart links (@nicosomb)
 - [#2333](https://github.com/wallabag/wallabag/pull/2333) for 2.1, translate all strings to German, which haven't been translated yet (@j0k3r, @nicosomb, @jlnostr, @Strubbl)
 - [#2314](https://github.com/wallabag/wallabag/pull/2314) Assets work (@tcitworld)
 - [#2331](https://github.com/wallabag/wallabag/pull/2331) Fix parameters in API _links (@j0k3r)
 - [#2327](https://github.com/wallabag/wallabag/pull/2327) Add users management UI (@j0k3r)
 - [#2330](https://github.com/wallabag/wallabag/pull/2330) Remove error message when creating ePub versions (@pmichelazzo)
 - [#2325](https://github.com/wallabag/wallabag/pull/2325) Add an exists endpoint in API (@j0k3r)
 - [#2328](https://github.com/wallabag/wallabag/pull/2328) Avoid duplicate url with accents (@j0k3r)
 - [#2326](https://github.com/wallabag/wallabag/pull/2326) Changed quickstart layout (@j0k3r, @nicosomb)
 - [#2324](https://github.com/wallabag/wallabag/pull/2324) Add ability to edit a tagging rule (@j0k3r)
 - [#2323](https://github.com/wallabag/wallabag/pull/2323) Add simple stats in footer (@j0k3r)
 - [#2329](https://github.com/wallabag/wallabag/pull/2329) Occitan version update (@j0k3r, @Quent-in)
 - [#2322](https://github.com/wallabag/wallabag/pull/2322) Customize errors templates (@j0k3r)
 - [#2320](https://github.com/wallabag/wallabag/pull/2320) Create user config in one place. (@j0k3r)
 - [#2319](https://github.com/wallabag/wallabag/pull/2319) Docker : install PHP 'gd' extension (@pmartin)
 - [#2318](https://github.com/wallabag/wallabag/pull/2318) Removed duplicated templates files (@nicosomb)
 - [#2315](https://github.com/wallabag/wallabag/pull/2315) Fixes about upgrade (@nicosomb, @Strubbl, @jlnostr)
 - [#2316](https://github.com/wallabag/wallabag/pull/2316) Update messages.pl.yml (@mruminski)
 - [#2313](https://github.com/wallabag/wallabag/pull/2313) Remove CSS class who caused long loading on Firefox (@nicosomb)
 - [#2309](https://github.com/wallabag/wallabag/pull/2309) Update messages.pl.yml (@mruminski)
 - [#2192](https://github.com/wallabag/wallabag/pull/2192) Import Firefox & Chrome bookmarks into wallabag (@nicosomb, @j0k3r, @tcitworld)
 - [#2308](https://github.com/wallabag/wallabag/pull/2308) Fix duplicate tags on import (@j0k3r)
 - [#2306](https://github.com/wallabag/wallabag/pull/2306) Some checks about Redis & RabbitMQ (@j0k3r)
 - [#2301](https://github.com/wallabag/wallabag/pull/2301) fix feeds not syncing on android app (@tcitworld, @nicosomb, @Quent-in, @j0k3r, @danbartram, @even-allmighty, @Strubbl, @benages, @Simounet, @charno6, @Rurik19, @bmillemathias, @cstuder, @egilli)
 - [#2239](https://github.com/wallabag/wallabag/pull/2239) Update documentation with new features for 2.1 (@nicosomb)
 - [#2299](https://github.com/wallabag/wallabag/pull/2299) polish version (@mruminski)
 - [#2297](https://github.com/wallabag/wallabag/pull/2297) Fix issue #2296: epub export with special chars in the title. (@egilli)
 - [#1941](https://github.com/wallabag/wallabag/pull/1941) Use asynchronous jobs for imports (@j0k3r, @nicosomb)
 - [#2292](https://github.com/wallabag/wallabag/pull/2292) Fixed label for mark as read link in entry view (@nicosomb)
 - [#2291](https://github.com/wallabag/wallabag/pull/2291) Add links to translations in documentation homepage (@nicosomb)
 - [#2287](https://github.com/wallabag/wallabag/pull/2287) Remove footer part (@nicosomb)
 - [#2290](https://github.com/wallabag/wallabag/pull/2290) Update messages.oc.yml (@Quent-in)
 - [#2279](https://github.com/wallabag/wallabag/pull/2279) Check if asset is enable instead of opposite (@j0k3r)
 - [#2275](https://github.com/wallabag/wallabag/pull/2275) Export dates from entries (@j0k3r)
 - [#2274](https://github.com/wallabag/wallabag/pull/2274) Re-use JsonResponse (@j0k3r)
-### 2.0.8 2016/09/07
+- [#1962](https://github.com/wallabag/wallabag/pull/1962) cURL examples in documentation about API (Dirk Deimeke)
 - [#2271](https://github.com/wallabag/wallabag/pull/2271) Prepare wallabag 2.0.8 (@nicosomb)
 - [#2266](https://github.com/wallabag/wallabag/pull/2266) Added tags counter in sidebar (material theme) (@nicosomb)
 - [#2267](https://github.com/wallabag/wallabag/pull/2267) Occitan  updated (@Quent-in)
 - [#2263](https://github.com/wallabag/wallabag/pull/2263) Instead of selecting the whole data, just count it (@j0k3r)
 - [#2002](https://github.com/wallabag/wallabag/pull/2002) Feature display items number (@nicosomb)
 - [#2262](https://github.com/wallabag/wallabag/pull/2262) Add a check for the database connection (@j0k3r)
 - [#2260](https://github.com/wallabag/wallabag/pull/2260) Fixed different font-size for labels in config screen (@nicosomb)
 - [#2252](https://github.com/wallabag/wallabag/pull/2252) Fixed last merge who caused CSS/JS bugs (@j0k3r, @nicosomb)
 - [#2242](https://github.com/wallabag/wallabag/pull/2242) Fix print / article views (@nicosomb)
 - [#2258](https://github.com/wallabag/wallabag/pull/2258) Update messages.pl.yml (@mruminski)
 - [#2255](https://github.com/wallabag/wallabag/pull/2255) Add Readability import (@nicosomb, @j0k3r)
 - [#2243](https://github.com/wallabag/wallabag/pull/2243) Add untagged entries (@j0k3r, @nicosomb)
 - [#2245](https://github.com/wallabag/wallabag/pull/2245) Changed where page title is displayed (@nicosomb)
 - [#2240](https://github.com/wallabag/wallabag/pull/2240) Add icon for public share link (@nicosomb)
 - [#2241](https://github.com/wallabag/wallabag/pull/2241) Fix issue #1991: correction of the height field to add articles (@modos189)
 - [#2238](https://github.com/wallabag/wallabag/pull/2238) V2 improve view (@modos189)
 - [#2237](https://github.com/wallabag/wallabag/pull/2237) Add original link in public view of the article (@nicosomb)
 - [#1904](https://github.com/wallabag/wallabag/pull/1904) Share entry with a public URL (@j0k3r, @nicosomb)
 - [#2236](https://github.com/wallabag/wallabag/pull/2236) Allow failure for PHP 7.1 (@j0k3r)
 - [#2186](https://github.com/wallabag/wallabag/pull/2186) Add option to disable registration (@nicosomb, @j0k3r, @tcitworld)
 - [#2234](https://github.com/wallabag/wallabag/pull/2234) Fixes mailto link in documentation (@cstuder)
 - [#2235](https://github.com/wallabag/wallabag/pull/2235) Add configuration for german documentation (@nicosomb)
 - [#2230](https://github.com/wallabag/wallabag/pull/2230) Cut entries title in card view: continued (@bmillemathias)
 - [#2218](https://github.com/wallabag/wallabag/pull/2218) Delete tag or tags by label (@j0k3r, @tcitworld, @nicosomb)
-### 2.0.7 2016/08/22
+### Fixed
 - [#2226](https://github.com/wallabag/wallabag/pull/2226) Prepare wallabag 2.0.7 (@nicosomb)
 - [#2222](https://github.com/wallabag/wallabag/pull/2222) Added creation date and reading time on article view (@j0k3r, @nicosomb)
 - [#2221](https://github.com/wallabag/wallabag/pull/2221) Replaced favorite word/icon with star one (@nicosomb)
 - [#2224](https://github.com/wallabag/wallabag/pull/2224) Avoid breaking import when fetching fail (@j0k3r)
 - [#2220](https://github.com/wallabag/wallabag/pull/2220) Enable PATCH method for CORS in API part (@Rurik19)
 - [#2134](https://github.com/wallabag/wallabag/pull/2134) Run tests on an uptodate HHVM (@j0k3r)
 - [#2095](https://github.com/wallabag/wallabag/pull/2095) Fix form user display when 2FA is disabled (@j0k3r, @nicosomb)
 - [#2216](https://github.com/wallabag/wallabag/pull/2216) Enable CORS headers for OAUTH part (@Rurik19)
-### 2.0.6 2016/08/10
+- Forgot `composer.lock` file in 2.0.2 release so some users may encounter `Fatal error: Out of memory` error during installation
 - [#2212](https://github.com/wallabag/wallabag/pull/2212) Prepare release 2.0.6 (@nicosomb)
 - [#2202](https://github.com/wallabag/wallabag/pull/2202) add some missing phpdoc parameters (@tcitworld)
 - [#2200](https://github.com/wallabag/wallabag/pull/2200) Fixed typo in entry:notice:entry_saved (@charno6)
 - [#2199](https://github.com/wallabag/wallabag/pull/2199) Handling socials links into a config file (@Simounet)
 - [#2198](https://github.com/wallabag/wallabag/pull/2198) FIX image inside a figure element max-width (@Simounet)
 - [#2195](https://github.com/wallabag/wallabag/pull/2195) Remove binary from repo (@j0k3r)
 - [#2048](https://github.com/wallabag/wallabag/pull/2048) Run PHP 7.1 on Travis (@j0k3r)
 - [#2194](https://github.com/wallabag/wallabag/pull/2194) Fixed spelling Artúclos --> Artículos (@benages)
 - [#2183](https://github.com/wallabag/wallabag/pull/2183) Bring tags on entries view to baggy (@tcitworld)
 - [#2185](https://github.com/wallabag/wallabag/pull/2185) Fix 3rd-Party Apps links (Chrome & Firefox) (@tcitworld)
 - [#2174](https://github.com/wallabag/wallabag/pull/2174) Add filter for tags on API (@tcitworld)
 - [#2176](https://github.com/wallabag/wallabag/pull/2176) Add since parameter (@tcitworld)
 - [#2170](https://github.com/wallabag/wallabag/pull/2170) Add tags on entries view and minor ui fixes (@tcitworld)
 - [#2172](https://github.com/wallabag/wallabag/pull/2172) Change the way to login user in tests (@j0k3r)
 - [#2169](https://github.com/wallabag/wallabag/pull/2169) fix font paths (@tcitworld)
 - [#2168](https://github.com/wallabag/wallabag/pull/2168) Add modules when NodeJS versions are too low. (@tcitworld)
 - [#2157](https://github.com/wallabag/wallabag/pull/2157) Handle only upper or only lower reading filter (@j0k3r)
 - [#2165](https://github.com/wallabag/wallabag/pull/2165) Fix a few french translations typos (@tcitworld)
 - [#2142](https://github.com/wallabag/wallabag/pull/2142) Manage assets through npm (@tcitworld)
 - [#2132](https://github.com/wallabag/wallabag/pull/2132) Jump to Symfony 3.1 (@j0k3r)
 - [#2160](https://github.com/wallabag/wallabag/pull/2160) Update symlink to php-cs-fixer (@j0k3r)
 - [#2155](https://github.com/wallabag/wallabag/pull/2155) Use friendsofphp instead of fabpot (@j0k3r)
 - [#2156](https://github.com/wallabag/wallabag/pull/2156) Try to find bad redirection after delete (@j0k3r)
 - [#2148](https://github.com/wallabag/wallabag/pull/2148) translate documentation to German (@Strubbl)
 - [#2145](https://github.com/wallabag/wallabag/pull/2145) Corrected Regex for lighttpd rewrite (@even-allmighty)
-### 2.0.5 2016/05/31
+## [2.0.2] - 2016-04-21
 - [#2118](https://github.com/wallabag/wallabag/pull/2118) Prepare wallabag 2.0.5 (@nicosomb)
 - [#2122](https://github.com/wallabag/wallabag/pull/2122) Fix the deletion of Tags/Entries relation when delete an entry (@j0k3r, @nicosomb)
 - [#2052](https://github.com/wallabag/wallabag/pull/2052) Add unread filter to entries pages (@danbartram)
 - [#2112](https://github.com/wallabag/wallabag/pull/2112) Docs proposal (@Poorchop)
 - [#2111](https://github.com/wallabag/wallabag/pull/2111) add screenshots of android docu in English (@Strubbl)
 - [#2109](https://github.com/wallabag/wallabag/pull/2109) Improve English translation (@Poorchop)
 - [#2097](https://github.com/wallabag/wallabag/pull/2097) Fix image path in 2-factor authentification email (@bmillemathias)
 - [#2098](https://github.com/wallabag/wallabag/pull/2098) CS (@j0k3r)
 - [#2092](https://github.com/wallabag/wallabag/pull/2092) Starred and Archived clears if article is already exists (@Rurik19)
 - [#2093](https://github.com/wallabag/wallabag/pull/2093) Replace vertical dots in material theme with horizontal dots (@nicosomb)
 - [#2094](https://github.com/wallabag/wallabag/pull/2094) Update CONTRIBUTING file (@nicosomb)
 - [#2069](https://github.com/wallabag/wallabag/pull/2069) Do not specify language in Firefox addon link (@merwan)
 - [#2068](https://github.com/wallabag/wallabag/pull/2068) Added information about permissions on data/ (@mariovor)
 - [#2054](https://github.com/wallabag/wallabag/pull/2054) Update CraueConfigBundle.it.yml (@jamiroconca)
 - [#2049](https://github.com/wallabag/wallabag/pull/2049) Update api.rst (@joshp23)
 - [#2044](https://github.com/wallabag/wallabag/pull/2044) Update api.rst (@joshp23)
 - [#2038](https://github.com/wallabag/wallabag/pull/2038) new details in the doc about the rights access again;) (@foxmask)
-### 2.0.4 2016/05/07
+### Added
 - [#2035](https://github.com/wallabag/wallabag/pull/2035) Prepare wallabag 2.0.4 (@nicosomb)
 - [#2023](https://github.com/wallabag/wallabag/pull/2023) Fix translation for validators (@nicosomb)
 - [#2016](https://github.com/wallabag/wallabag/pull/2016) Update documentation (@nicosomb)
 - [#2020](https://github.com/wallabag/wallabag/pull/2020) Fix number of entries in tag/list (@nicosomb)
 - [#2024](https://github.com/wallabag/wallabag/pull/2024) Update messages.it.yml (@jamiroconca)
 - [#2029](https://github.com/wallabag/wallabag/pull/2029) Change Travis/Scrutinizer pictures in README (@nicosomb)
 - [#2028](https://github.com/wallabag/wallabag/pull/2028) Docu for android app (@Strubbl)
 - [#2022](https://github.com/wallabag/wallabag/pull/2022) Fix pagination bar on small devices (@nicosomb)
 - [#2017](https://github.com/wallabag/wallabag/pull/2017) Create messages.it.yml (@jamiroconca)
 - [#2018](https://github.com/wallabag/wallabag/pull/2018) Update config.yml, add italian as available language (@jamiroconca)
 - [#2019](https://github.com/wallabag/wallabag/pull/2019) Create CraueConfigBundle.it.yml (@jamiroconca)
 - [#2013](https://github.com/wallabag/wallabag/pull/2013) Fix tags listing (@nicosomb)
 - [#1976](https://github.com/wallabag/wallabag/pull/1976) Fix filter reading time (@nicosomb)
 - [#2005](https://github.com/wallabag/wallabag/pull/2005) Fix reading speed not defined when user was created via config page (@nicosomb)
 - [#2012](https://github.com/wallabag/wallabag/pull/2012) integrate upgrade.rst (@biva)
 - [#2011](https://github.com/wallabag/wallabag/pull/2011) upgrade.rst (Creation of an upgrade page in the documentation) (@biva)
 - [#2010](https://github.com/wallabag/wallabag/pull/2010) Set the title via POST /api/entries (@nicosomb)
 - [#2001](https://github.com/wallabag/wallabag/pull/2001) Fix old branch name urls (@tcitworld)
 - [#1992](https://github.com/wallabag/wallabag/pull/1992) Update CraueConfigBundle.es.yml (@jami7)
 - [#1985](https://github.com/wallabag/wallabag/pull/1985) Rights access to the folders of the project (@foxmask)
 - [#1977](https://github.com/wallabag/wallabag/pull/1977) Es translation (@j0k3r, @jami7)
 - [#1970](https://github.com/wallabag/wallabag/pull/1970) Fix typos in API documentation (@nicosomb)
 - [#1969](https://github.com/wallabag/wallabag/pull/1969) Create 3rd Resources chapter in API documentation (@nicosomb)
 - [#1967](https://github.com/wallabag/wallabag/pull/1967) Add FAQ page in documentation (@nicosomb)
-### 2.0.3 2016/04/22
+- [#1945](https://github.com/wallabag/wallabag/pull/1945) cURL examples in documentation about API (Dirk Deimeke)
- [#1965](https://github.com/wallabag/wallabag/pull/1965) Prepare release 2.0.3 (@nicosomb)
+- [#1911](https://github.com/wallabag/wallabag/pull/1911) Add title hover on entry titles (Thomas Citharel)
 - [#1962](https://github.com/wallabag/wallabag/pull/1962) Update API documentation with cURL examples (@nicosomb)
-### 2.0.2 2016/04/21
+### Changed
 - [#1948](https://github.com/wallabag/wallabag/pull/1948) Prepare release 2.0.2 (@nicosomb)
 - [#1957](https://github.com/wallabag/wallabag/pull/1957) Fix translation for Go to your account button after subscription (@nicosomb)
 - [#1945](https://github.com/wallabag/wallabag/pull/1945) Added some curl examples (@ddeimeke)
 - [#1954](https://github.com/wallabag/wallabag/pull/1954) Update links in documentation (@nicosomb)
 - [#1953](https://github.com/wallabag/wallabag/pull/1953) Actualisation des liens morts (Documentation de traduction) (@maxi62330)
 - [#1942](https://github.com/wallabag/wallabag/pull/1942) Optimize import (@nicosomb)
 - [#1944](https://github.com/wallabag/wallabag/pull/1944) Update Travis configuration with branches renaming (@nicosomb)
-### 1.9.2 2016/04/18
+- [#1944](https://github.com/wallabag/wallabag/pull/1944), [#1953](https://github.com/wallabag/wallabag/pull/1953), [#1954](https://github.com/wallabag/wallabag/pull/1954) Due to branches renaming, update documentation and configuration (maxi62330, Nicolas Lœuillet)
- [#1938](https://github.com/wallabag/wallabag/pull/1938) Display pagination only if we have more than one page (@nicosomb)
+- [#1942](https://github.com/wallabag/wallabag/pull/1942) Optimize import (Nicolas Lœuillet)
- [#1935](https://github.com/wallabag/wallabag/pull/1935) Update messages.es.yml (@jami7)
+- [#1935](https://github.com/wallabag/wallabag/pull/1935) Update spanish translation (jami7)
- [#1933](https://github.com/wallabag/wallabag/pull/1933) Hide pagination if we only have one entry to display (@nicosomb)
+- [#1929](https://github.com/wallabag/wallabag/pull/1929) Change guid and link in RSS feeds to give original entry URL (Nicolas Lœuillet)
- [#1925](https://github.com/wallabag/wallabag/pull/1925) Redirect to homepage if referer is null (@nicosomb)
+- [#1918](https://github.com/wallabag/wallabag/pull/1918) Improve pagination when user has lot of entries (Nicolas Lœuillet)
- [#1929](https://github.com/wallabag/wallabag/pull/1929) Change guid and link in RSS feeds to give original entry URL (@nicosomb)
+- [#1916](https://github.com/wallabag/wallabag/pull/1916) Change PHP arrays and move test parameters in a separated file (Jeremy Benoist)
 - [#1916](https://github.com/wallabag/wallabag/pull/1916) Convert array + phpDoc (@j0k3r)
 - [#1918](https://github.com/wallabag/wallabag/pull/1918) Improve pagination when user has lot of entries (@nicosomb)
 - [#1919](https://github.com/wallabag/wallabag/pull/1919) Remove useless dependancy (@nicosomb)
 - [#1911](https://github.com/wallabag/wallabag/pull/1911) add title hover on entry titles (@tcitworld)
 - [#1915](https://github.com/wallabag/wallabag/pull/1915) Fix doc links (@j0k3r)
-### 2.0.1 2016/04/11
+### Fixed
 - [#1912](https://github.com/wallabag/wallabag/pull/1912) Move setup config outside setupAdmin (@j0k3r)
 - [#1909](https://github.com/wallabag/wallabag/pull/1909) Prepare release 2.0.1 (@nicosomb)
 - [#1902](https://github.com/wallabag/wallabag/pull/1902) Add changelog (@nicosomb)
 - [#1823](https://github.com/wallabag/wallabag/pull/1823) Translation fa (@j0k3r, @mabkenar)
 - [#1903](https://github.com/wallabag/wallabag/pull/1903) Force server version to avoid connexion error (@j0k3r)
 - [#1901](https://github.com/wallabag/wallabag/pull/1901) Update Spanish translation (@j0k3r, @jami7)
 - [#1887](https://github.com/wallabag/wallabag/pull/1887) Fix duplicate article when added via the bookmarklet (@nicosomb)
 - [#1895](https://github.com/wallabag/wallabag/pull/1895) All the entries are fetched via GET /api/entries (@nicosomb)
 - [#1900](https://github.com/wallabag/wallabag/pull/1900) Remove empty portugese documentation (@nicosomb)
 - [#1899](https://github.com/wallabag/wallabag/pull/1899) Add documentation about importing large file into nginx (@nicosomb)
 - [#1898](https://github.com/wallabag/wallabag/pull/1898) Fix estimated reading time in material view (@nicosomb)
 - [#1896](https://github.com/wallabag/wallabag/pull/1896) Fix internal settings (@nicosomb)
 - [#1894](https://github.com/wallabag/wallabag/pull/1894) Fix documentation link in developer page (@nicosomb)
 - [#1891](https://github.com/wallabag/wallabag/pull/1891) Fix typo on configuration page (@nicosomb)
 - [#1824](https://github.com/wallabag/wallabag/pull/1824) Remove SMTP configuration environment overrides (@nicosomb)
 - [#1879](https://github.com/wallabag/wallabag/pull/1879) Move tag form in Material theme (@nicosomb)
 - [#1884](https://github.com/wallabag/wallabag/pull/1884) Change the installation method in issue template (@nicosomb)
 - [#1804](https://github.com/wallabag/wallabag/pull/1804) Force user-agent for iansommerville.com (@j0k3r)
 - [#1868](https://github.com/wallabag/wallabag/pull/1868) Remove keyboard shortcut and add tagging rule panel in baggy (@nicosomb)
 - [#1862](https://github.com/wallabag/wallabag/pull/1862) Add production environment for CLI import (@nicosomb)
 - [#1861](https://github.com/wallabag/wallabag/pull/1861) Round estimated time and add reading speed for Baggy (@nicosomb)
 - [#1856](https://github.com/wallabag/wallabag/pull/1856) Documentation about wallabag v1 CLI import (@nicosomb)
 - [#1840](https://github.com/wallabag/wallabag/pull/1840) Fix Archive page title translation (@nicosomb)
-### 2.0.0 2016/04/03
+- [#1957](https://github.com/wallabag/wallabag/pull/1957) Fix translation for `Go to your account` button (Nicolas Lœuillet)
- [#1835](https://github.com/wallabag/wallabag/pull/1835) :rocket: Prepare v2.0.0 :birthday: (@nicosomb)
+- [#1925](https://github.com/wallabag/wallabag/pull/1925) Redirect to homepage if refered is null (Nicolas Lœuillet)
- [#1838](https://github.com/wallabag/wallabag/pull/1838) Hide search buttons (@nicosomb)
+- [#1912](https://github.com/wallabag/wallabag/pull/1912) Fix 500 Internal Server Error -> "Setting piwik_enabled couldn't be found" (Jeremy Benoist)
 - [#1832](https://github.com/wallabag/wallabag/pull/1832) Check selected PDO driver on install (@j0k3r)
 - [#3](https://github.com/wallabag/wallabag/pull/3) Fix simple quote (@j0k3r)
 - [#1822](https://github.com/wallabag/wallabag/pull/1822) Update messages.es.yml (@jami7)
 - [#1820](https://github.com/wallabag/wallabag/pull/1820) Refacto wallabag import (@j0k3r)
 - [#1821](https://github.com/wallabag/wallabag/pull/1821) Update messages.es.yml (@jami7)
 - [#1805](https://github.com/wallabag/wallabag/pull/1805) Fix #1768 Split tags with commas from UI (@j0k3r)
 - [#1819](https://github.com/wallabag/wallabag/pull/1819) Some cleanup (@j0k3r)
 - [#1818](https://github.com/wallabag/wallabag/pull/1818) add migration docs (@tcitworld)
 - [#1817](https://github.com/wallabag/wallabag/pull/1817) Correct translation (@mruminski)
 - [#1813](https://github.com/wallabag/wallabag/pull/1813) [v2] German translation (@wallabag)
 - [#1807](https://github.com/wallabag/wallabag/pull/1807) fix typo diaspora* share (@nikaro)
 - [#1806](https://github.com/wallabag/wallabag/pull/1806) Translate flash message in baggy theme (@nicosomb)
 - [#1774](https://github.com/wallabag/wallabag/pull/1774) Switch to keys in translated files (@j0k3r)
 - [#1767](https://github.com/wallabag/wallabag/pull/1767) Setting for reading time (@nicosomb)
 - [#1799](https://github.com/wallabag/wallabag/pull/1799) fix tabs display on mobile view (@tcitworld)
 - [#1791](https://github.com/wallabag/wallabag/pull/1791) fix api properties and typo (@tcitworld)
 - [#1797](https://github.com/wallabag/wallabag/pull/1797) Don't add entry through API if it already exists (@tcitworld)
 - [#1792](https://github.com/wallabag/wallabag/pull/1792) add tests on user in API responses (@tcitworld)
 - [#1786](https://github.com/wallabag/wallabag/pull/1786) API shows just what needed for user (@tcitworld)
 - [#1784](https://github.com/wallabag/wallabag/pull/1784) add refresh-token grant-type (@tcitworld)
-### 2.0.0-beta.2 2016/03/12
+## [2.0.1] - 2016-04-11
- [#1775](https://github.com/wallabag/wallabag/pull/1775) Some fixes (@j0k3r)
+### Added
 - [#1776](https://github.com/wallabag/wallabag/pull/1776) clarify that wllbg is compatible php 7 (@tcitworld)
 - [#1763](https://github.com/wallabag/wallabag/pull/1763) Prepare files for 2.0.0-beta.2 (@nicosomb)
 - [#1771](https://github.com/wallabag/wallabag/pull/1771) Docker timezone (@DjayDev)
 - [#1766](https://github.com/wallabag/wallabag/pull/1766) Fix #1756: Added 'wallabag' in page title (@nicosomb)
 - [#1762](https://github.com/wallabag/wallabag/pull/1762) Change documentation links in quickstart (@nicosomb)
 - [#1761](https://github.com/wallabag/wallabag/pull/1761) V2 api version (@tcitworld, @ZeddZull)
 - [#1675](https://github.com/wallabag/wallabag/pull/1675) Ability to create new client for the API (@j0k3r, @nicosomb, @tcitworld)
 - [#1750](https://github.com/wallabag/wallabag/pull/1750) Documentation about filters / Quickstart changes (@nicosomb)
 - [#1670](https://github.com/wallabag/wallabag/pull/1670) Mark all imported articles as read (@j0k3r, @tcitworld)
 - [#1754](https://github.com/wallabag/wallabag/pull/1754) Add starred & archive properties to API (@j0k3r, @tcitworld)
 - [#1753](https://github.com/wallabag/wallabag/pull/1753) Doc: fix typo in php-hash ext name (@Horgix)
 - [#1745](https://github.com/wallabag/wallabag/pull/1745) V2 spanish translation (@benages)
 - [#1743](https://github.com/wallabag/wallabag/pull/1743) Releasing documentation (@nicosomb)
 - [#1615](https://github.com/wallabag/wallabag/pull/1615) Added RELEASE_PROCESS document (@bdunogier)
 - [#1740](https://github.com/wallabag/wallabag/pull/1740) minor typofix again (@goofy-bz)
 - [#1742](https://github.com/wallabag/wallabag/pull/1742) Add the way to install (package or composer) (@nicosomb)
-### 2.0.0-beta.1 2016/03/01
+- [Documentation about importing large file](http://doc.wallabag.org/en/v2/user/installation.html#installing-on-nginx) into nginx. (Nicolas Lœuillet)
- [#1738](https://github.com/wallabag/wallabag/pull/1738) Prepare wallabag for first beta :rocket: (@nicosomb)
+- [Documentation about wallabag API](http://doc.wallabag.org/en/v2/developer/api.html) (Nicolas Lœuillet)
- [#1739](https://github.com/wallabag/wallabag/pull/1739) minor typofix + missing quotes (@goofy-bz)
+- [#1861](https://github.com/wallabag/wallabag/pull/1861) Round estimated time and add reading speed for Baggy (Nicolas Lœuillet)
- [#1736](https://github.com/wallabag/wallabag/pull/1736) Update Capistrano libraries with last versions (@nicosomb)
+- [Documentation about wallabag v1 CLI import](http://doc.wallabag.org/en/v2/user/migration.html#import-via-command-line-interface-cli) (Nicolas Lœuillet)
- [#1734](https://github.com/wallabag/wallabag/pull/1734) Remove extra definition (@j0k3r)
+- [Add migrate link](http://doc.wallabag.org/en/v2/user/migration.html) in documentation (Nicolas Lœuillet)
 - [#1732](https://github.com/wallabag/wallabag/pull/1732) Adding Danish translations to Wallabag v2 (@mjjzf)
 - [#1731](https://github.com/wallabag/wallabag/pull/1731) Fix: #1703: authentication for PR by external contributors (@nicosomb)
 - [#1653](https://github.com/wallabag/wallabag/pull/1653) V2 annotator comments (@nicosomb, @tcitworld)
 - [#1728](https://github.com/wallabag/wallabag/pull/1728) Fix #1717: Change remove tag icon in entry view with material theme (@wallabag)
 - [#1723](https://github.com/wallabag/wallabag/pull/1723) Make English welcome message more natural (@shtrom)
 - [#1712](https://github.com/wallabag/wallabag/pull/1712) Fix #1711: Update CONTRIBUTING file (@nicosomb)
 - [#1716](https://github.com/wallabag/wallabag/pull/1716) Fix #1603: Enhance requirements in InstallCommand (@j0k3r, @tcitworld)
 - [#1710](https://github.com/wallabag/wallabag/pull/1710) Fix #811: Display a human message when graby fails to fetch articles (@nicosomb)
 - [#1715](https://github.com/wallabag/wallabag/pull/1715) Fix #1694 #1669 #1684: Add contributors and 3rd party libraries (@wallabag)
 - [#1714](https://github.com/wallabag/wallabag/pull/1714) Change wording for create a new user (@j0k3r)
 - [#1683](https://github.com/wallabag/wallabag/pull/1683) Demonstration mode to prevent password changes (@j0k3r)
 - [#1701](https://github.com/wallabag/wallabag/pull/1701) Fix #1351: add maintenance mode (@j0k3r)
 - [#1709](https://github.com/wallabag/wallabag/pull/1709) Fix #1708: typos in french documentation (@wallabag)
 - [#1702](https://github.com/wallabag/wallabag/pull/1702) Added Piwik implementation (@j0k3r)
 - [#1707](https://github.com/wallabag/wallabag/pull/1707) typo in french documentation (@nicosomb)
 - [#1706](https://github.com/wallabag/wallabag/pull/1706) Documentation for wallabag installation (@tcitworld, @nicosomb)
 - [#1705](https://github.com/wallabag/wallabag/pull/1705) French translation for documentation (@nicosomb)
 - [#1699](https://github.com/wallabag/wallabag/pull/1699) Move assignTagsToEntry in ContentProxy helper (@j0k3r)
 - [#1700](https://github.com/wallabag/wallabag/pull/1700) Fix #1551 - Redirect to the last page when current page is out of range (@delyriand)
 - [#1693](https://github.com/wallabag/wallabag/pull/1693) Fix #1691 create ISSUE_TEMPLATE and PULL_REQUEST_TEMPLATE (@wallabag)
 - [#1696](https://github.com/wallabag/wallabag/pull/1696) Add some missing french translations (@wallabag)
 - [#1688](https://github.com/wallabag/wallabag/pull/1688) Create messages.pl.yml (@mruminski)
 - [#1690](https://github.com/wallabag/wallabag/pull/1690) translate estimated time minutes (@tcitworld)
 - [#1689](https://github.com/wallabag/wallabag/pull/1689) Create validators.pl.yml (@mruminski)
 - [#1686](https://github.com/wallabag/wallabag/pull/1686) Polish translation (@mruminski)
 - [#1687](https://github.com/wallabag/wallabag/pull/1687) Translated another two files into romanian. (@0wnrepo)
 - [#1681](https://github.com/wallabag/wallabag/pull/1681) two more Persian translated files (@mabkenar)
 - [#1679](https://github.com/wallabag/wallabag/pull/1679) Documentation about translation (@wallabag)
 - [#1680](https://github.com/wallabag/wallabag/pull/1680) Update Capistrano configuration for symfony3 (@wallabag)
 - [#1678](https://github.com/wallabag/wallabag/pull/1678) Translation file for the 'Romanian' language. Also recognised by ro_RO. Known in romanian as "Română". (@0wnrepo)
 - [#1676](https://github.com/wallabag/wallabag/pull/1676) Translation for Persian (@mabkenar)
 - [#1668](https://github.com/wallabag/wallabag/pull/1668) Few updates (@j0k3r)
 - [#1672](https://github.com/wallabag/wallabag/pull/1672) improve baggy theme (add new tag panel) (@tcitworld)
 - [#1671](https://github.com/wallabag/wallabag/pull/1671) display pictures properly (@tcitworld)
 - [#1658](https://github.com/wallabag/wallabag/pull/1658) import tags from v1 (#1657) (@tcitworld)
 - [#1656](https://github.com/wallabag/wallabag/pull/1656) fix labels on new user prompt (@tcitworld)
 - [#1654](https://github.com/wallabag/wallabag/pull/1654) fix #1636 (@tcitworld)
 - [#1663](https://github.com/wallabag/wallabag/pull/1663) remove tag from entry #1377 (@tcitworld)
 - [#1665](https://github.com/wallabag/wallabag/pull/1665) lots of diverse translation stuff & some typos (@tcitworld)
 - [#1666](https://github.com/wallabag/wallabag/pull/1666) reimport v1 entries if they were not fetched (@tcitworld)
 - [#1659](https://github.com/wallabag/wallabag/pull/1659) Update README.md with the environment parameters (@0wnrepo)
 - [#1651](https://github.com/wallabag/wallabag/pull/1651) Test if some keys are missing in v2 import (@wallabag)
 - [#1650](https://github.com/wallabag/wallabag/pull/1650) Exported entries were added twice in export file (@wallabag)
 - [#1652](https://github.com/wallabag/wallabag/pull/1652) User created via wallabag:install is now a SUPER_ADMIN :crown: (@wallabag)
 - [#1648](https://github.com/wallabag/wallabag/pull/1648) Fix project version in installation command (@lologhi)
 - [#1647](https://github.com/wallabag/wallabag/pull/1647) Force prod env on project creation (@j0k3r)
 - [#1633](https://github.com/wallabag/wallabag/pull/1633) Exporttxt (@j0k3r, @tcitworld)
 - [#1642](https://github.com/wallabag/wallabag/pull/1642) Unescape content for Material card (@j0k3r)
 - [#1644](https://github.com/wallabag/wallabag/pull/1644) Fix #1622: parameter for FosUser confirmation (@wallabag)
 - [#1645](https://github.com/wallabag/wallabag/pull/1645) Fix #1643: fix the way to load the HTML template in 2factor auth (@wallabag)
 - [#1612](https://github.com/wallabag/wallabag/pull/1612) Settings page (@j0k3r)
 - [#1641](https://github.com/wallabag/wallabag/pull/1641) Update import.rst to fix a doc typo (@nicosomb)
 - [#1601](https://github.com/wallabag/wallabag/pull/1601) [#1590] Add JSON import from wallabag v2 (@wallabag)
 - [#1605](https://github.com/wallabag/wallabag/pull/1605) [#1604] First draft to fix SensioLabsInsight report (@wallabag)
 - [#1639](https://github.com/wallabag/wallabag/pull/1639) Fix #1635: change database name for test environments (mysql/pgsql) (@wallabag)
 - [#1630](https://github.com/wallabag/wallabag/pull/1630) Add @GitterHQ badge on README (@nicosomb)
 - [#1629](https://github.com/wallabag/wallabag/pull/1629) fix #1620 and introduce new parameters to export (@tcitworld)
 - [#1628](https://github.com/wallabag/wallabag/pull/1628) Add Turkish translation (@ogunkarakus)
 - [#1625](https://github.com/wallabag/wallabag/pull/1625) [#1621] Add default address for FosUser (@nicosomb)
 - [#1619](https://github.com/wallabag/wallabag/pull/1619) Move public assets for themes (@j0k3r)
 - [#1618](https://github.com/wallabag/wallabag/pull/1618) Updated version in README (@wallabag)
-### 2.0.0-alpha.2 2016/01/22
+### Changed
 - [#1614](https://github.com/wallabag/wallabag/pull/1614) Few fixes (@j0k3r)
 - [#1565](https://github.com/wallabag/wallabag/pull/1565) Use HTML email for 2FA (@j0k3r)
 - [#1610](https://github.com/wallabag/wallabag/pull/1610) Disable xdebug all the time (@j0k3r)
 - [#1606](https://github.com/wallabag/wallabag/pull/1606) Remove tag relation when removing an entry (@j0k3r)
 - [#1607](https://github.com/wallabag/wallabag/pull/1607) Ignore composer.lock (@j0k3r)
 - [#1599](https://github.com/wallabag/wallabag/pull/1599) Add configuration for portuguese documentation (@wallabag)
 - [#1594](https://github.com/wallabag/wallabag/pull/1594) Create index.rst (@araujo0205)
 - [#1587](https://github.com/wallabag/wallabag/pull/1587) Use translator interface instead of final class (@j0k3r)
 - [#1584](https://github.com/wallabag/wallabag/pull/1584) some cleanup (@wallabag)
 - [#1564](https://github.com/wallabag/wallabag/pull/1564) Remove Flattr references (@wallabag)
 - [#1583](https://github.com/wallabag/wallabag/pull/1583) Fix `findOneByUrl` side effect in tests (@j0k3r)
 - [#1524](https://github.com/wallabag/wallabag/pull/1524) Upgrade to Symfony 3.0 (@j0k3r)
 - [#1560](https://github.com/wallabag/wallabag/pull/1560) Fix #1501 Quickstart for beginners (@nicosomb)
 - [#1574](https://github.com/wallabag/wallabag/pull/1574) Fix typo and set version in the README (@jjanvier)
 - [#1561](https://github.com/wallabag/wallabag/pull/1561) Add basic docker-compose configuration (@FabienM)
 - [#1563](https://github.com/wallabag/wallabag/pull/1563) #1394 Fixed 'mark as read' and 'mark as unread' links (@nicosomb)
 - [#1562](https://github.com/wallabag/wallabag/pull/1562) add import link on baggy theme (@nicosomb)
 - [#1558](https://github.com/wallabag/wallabag/pull/1558) [v2] documentation cleaning (@wallabag)
 - [#1559](https://github.com/wallabag/wallabag/pull/1559) Installation & configuration of Doctrine Migrations (@j0k3r)
-### 2.0.0-alpha.1 2016/01/07
+- [#1823](https://github.com/wallabag/wallabag/pull/1823) Persian translation (Masoud Abkenar)
- [#1493](https://github.com/wallabag/wallabag/pull/1493) v2 – 1st draft for Pocket import via API & Wallabag v1 import (@nicosomb, @j0k3r)
+- [#1901](https://github.com/wallabag/wallabag/pull/1901) Spanish translation (Jeremy Benoist)
- [#1553](https://github.com/wallabag/wallabag/pull/1553) Hide export button if we are not on entries list (@nicosomb)
+- [#1879](https://github.com/wallabag/wallabag/pull/1879) Move tag form in Material theme (Nicolas Lœuillet)
- [#1545](https://github.com/wallabag/wallabag/pull/1545) v2 – Remove user reference in tag (@j0k3r)
+
- [#1546](https://github.com/wallabag/wallabag/pull/1546) v2 – Ability to reload an entry (@j0k3r)
+### Fixed
- [#1547](https://github.com/wallabag/wallabag/pull/1547) v2 – Fix wrong if when deleting an entry (@j0k3r)
+
- [#1544](https://github.com/wallabag/wallabag/pull/1544) v2 – Add custom email for 2FA (@j0k3r)
+- [#1903](https://github.com/wallabag/wallabag/pull/1903) Force server version to avoid connection error (Jeremy Benoist)
- [#1540](https://github.com/wallabag/wallabag/pull/1540) v2 –  Don't redirect to the content page after deletion (@j0k3r)
+- [#1887](https://github.com/wallabag/wallabag/pull/1887) Fix duplicate article when added via the bookmarklet (Nicolas Lœuillet)
- [#1542](https://github.com/wallabag/wallabag/pull/1542) v2 –  Avoid multiple tag creation (@j0k3r)
+- [#1895](https://github.com/wallabag/wallabag/pull/1895) API: All the entries are fetched via GET /api/entries (Nicolas Lœuillet)
- [#1488](https://github.com/wallabag/wallabag/pull/1488) Slug for tags (@wallabag)
+- [#1898](https://github.com/wallabag/wallabag/pull/1898) Fix estimated reading time in material view #1893 (Nicolas Lœuillet)
- [#1537](https://github.com/wallabag/wallabag/pull/1537) Updated composer.lock (@bdunogier)
+- [#1896](https://github.com/wallabag/wallabag/pull/1896) remove download_picture setting and manage show_printlink in material theme #1867 (Nicolas Lœuillet)
- [#1529](https://github.com/wallabag/wallabag/pull/1529) changed table name for tagging rule (@nicosomb)
+- [#1894](https://github.com/wallabag/wallabag/pull/1894) Fix documentation link in developer page (Nicolas Lœuillet)
- [#1478](https://github.com/wallabag/wallabag/pull/1478) Rule based tags (@K-Phoen)
+- [#1891](https://github.com/wallabag/wallabag/pull/1891) Fix typo on configuration page (Nicolas Lœuillet)
- [#1523](https://github.com/wallabag/wallabag/pull/1523) Typo (@tcitworld)
+- [#1884](https://github.com/wallabag/wallabag/pull/1884) Change the installation method in issue template (Nicolas Lœuillet)
- [#1518](https://github.com/wallabag/wallabag/pull/1518) Set SMTP from environment variables (@mathbruyen)
+- [#1844](https://github.com/wallabag/wallabag/pull/1844) Lock ocramius/proxy-manager (Jeremy Benoist)
- [#1422](https://github.com/wallabag/wallabag/pull/1422) V2 – Export entries (@j0k3r, @tcitworld)
+- [#1840](https://github.com/wallabag/wallabag/pull/1840) Fix Archive page title translation (Nicolas Lœuillet)
- [#1500](https://github.com/wallabag/wallabag/pull/1500) Fix quote strategy for reserved keyword in Postgres (@j0k3r)
+- [#1801](https://github.com/wallabag/wallabag/pull/1804) Force user-agent for iansommerville.com (Jeremy Benoist)
- [#1510](https://github.com/wallabag/wallabag/pull/1510) v2 – Fix some deprecated for Symfony3 (@j0k3r)
+
- [#1505](https://github.com/wallabag/wallabag/pull/1505) Add graby log (@j0k3r)
+### Removed
- [#1495](https://github.com/wallabag/wallabag/pull/1495) add docs (@wallabag)
+
- [#1496](https://github.com/wallabag/wallabag/pull/1496) fix #1005 V2 redirect after deletion (@wallabag)
+- [#1900](https://github.com/wallabag/wallabag/pull/1900) Remove empty portugese documentation (Nicolas Lœuillet)
- [#1491](https://github.com/wallabag/wallabag/pull/1491) Add german translation. (@jlnostr)
+- [#1868](https://github.com/wallabag/wallabag/pull/1868) Remove keyboard shortcut and add tagging rule panel in baggy (Nicolas Lœuillet)
- [#1446](https://github.com/wallabag/wallabag/pull/1446) [WIP] language selection on config screen (@j0k3r, @nicosomb)
+- [#1824](https://github.com/wallabag/wallabag/pull/1824) Remove SMTP configuration environment overrides (Mathieu Bruyen)
- [#1484](https://github.com/wallabag/wallabag/pull/1484) 2factor authentication via email (@wallabag)
+
- [#1475](https://github.com/wallabag/wallabag/pull/1475) V2 material (@modos189)
+## [2.0.0] - 2016-04-03
- [#1472](https://github.com/wallabag/wallabag/pull/1472) fix #1470: clean material theme (@wallabag)
+### Added
- [#1471](https://github.com/wallabag/wallabag/pull/1471) implement bookmarklet (@wallabag)
+
- [#1468](https://github.com/wallabag/wallabag/pull/1468) fix bug on detect active theme (@wallabag)
+* save an article, read it, favorite it, archive it. (Hopefully)
- [#1464](https://github.com/wallabag/wallabag/pull/1464) fix type hint for User (@wallabag)
+* annotations: In each article you read, you can write annotations. ([read the doc](http://doc.wallabag.org/en/v2/user/annotations.html))
- [#1436](https://github.com/wallabag/wallabag/pull/1436) Public registration & oAuth2 \o/ (@j0k3r, @nicosomb)
+* filter entries by reading time, domain name, creation date, status, etc.
- [#1461](https://github.com/wallabag/wallabag/pull/1461) fix #1433: add test for removeWww Twig Extension (@wallabag)
+* assign tags to entries
- [#1459](https://github.com/wallabag/wallabag/pull/1459) fix #1457 & update materialize (@tcitworld)
+* edit article titles
- [#1447](https://github.com/wallabag/wallabag/pull/1447) typo (@tcitworld)
+* a REST API ([you can have a look to the documentation](http://v2.wallabag.org/api/doc))
- [#1441](https://github.com/wallabag/wallabag/pull/1441) Add french translation (@nicosomb)
+* authorization via oAuth2
- [#1437](https://github.com/wallabag/wallabag/pull/1437) some cleanup on material theme (@nicosomb)
+* a new default theme, called `material`
- [#1439](https://github.com/wallabag/wallabag/pull/1439) fix Capistrano configuration (@nicosomb)
+* RSS feeds (with ability to limit number of articles)
- [#1440](https://github.com/wallabag/wallabag/pull/1440) fix #1433: remove www. on entries view (@nicosomb)
+* create a new account from the config page (for super admin only)
- [#1434](https://github.com/wallabag/wallabag/pull/1434) Add multiple database tests on Travis (@j0k3r)
+* recover passwords from login page (you have to fill your email on config page)
- [#1435](https://github.com/wallabag/wallabag/pull/1435) Enabled created user from Config (@j0k3r)
+* picture preview, if available, is displayed for each entry
- [#1429](https://github.com/wallabag/wallabag/pull/1429) V2 – Handle language in entry (@j0k3r)
+* Public registration
 * migration from wallabag v1/v2 (based on JSON export) ([read the doc](http://doc.wallabag.org/en/v2/user/import.html))
 * migration from Pocket (it works, but we need to implement asynchronous import: if you have too many articles, it can fail) ([read the doc](http://doc.wallabag.org/en/v2/user/import.html))
 * exports in many formats (PDF, JSON, EPUB, MOBI, XML, CSV and TXT).
 * 2-Factor authentication via email ([read the doc](http://doc.wallabag.org/en/v2/user/configuration.html#two-factor-authentication))
 * Tagging rule: create a rule to automatically assign tags to entries! ([read the doc](http://doc.wallabag.org/en/v2/user/configuration.html#tagging-rules))
 * Occitan, German, French, Turkish, Persian, Romanian, Polish, Danish, Spanish and English translations
 * Quickstart for beginners (when you don't have any entries)
 * Internal settings for administrator (the account created during installation)
 * For 3rd apps developers, a developer page is available to create API token
--- a/COPYING.md
+++ b/COPYING.md
@ -1,4 +1,4 @@
-Copyright (c) 2013-2017 Nicolas Lœuillet
+Copyright (c) 2013-2016 Nicolas Lœuillet
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/2
+++ b/2
@ -7,8 +7,6 @@ require 'capistrano/setup'
 # Include default deployment tasks
 require 'capistrano/deploy'
 require 'capistrano/composer'
 require 'capistrano/file-permissions'
 require 'capistrano/symfony'
 # Load custom tasks from `lib/capistrano/tasks` if you have any defined
--- a/3
+++ b/3
@ -1,6 +1,5 @@
 source "https://rubygems.org"
 gem 'capistrano',  '~> 3.4'
 gem 'capistrano-composer'
 gem 'capistrano-symfony', '~> 1.0.0.rc1'
-gem 'capistrano-file-permissions'
+gem 'capistrano-composer', '~> 0.0.3'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -29,9 +29,8 @@ PLATFORMS
 DEPENDENCIES
  capistrano (~> 3.4)
-  capistrano-composer
+  capistrano-composer (~> 0.0.3)
  capistrano-file-permissions
  capistrano-symfony (~> 1.0.0.rc1)
 BUNDLED WITH
-   1.13.5
+   1.11.2
--- a/Gruntfile.js
+++ b/Gruntfile.js
@ -1,230 +0,0 @@
 module.exports = function (grunt) {
  require('load-grunt-tasks')(grunt);
  grunt.initConfig({
    appDir: 'app/Resources/static',
    buildDir: 'app/Resources/build',
    modulesDir: 'node_modules',
    releaseDir: 'web/bundles/wallabagcore',
    postcss: {
      material: {
        options: {
          processors: [
            require('pixrem')(),
            require('autoprefixer')({ browsers: 'last 2 versions' }),
            require('cssnano')(),
          ],
        },
        src: '<%= buildDir %>/material.css',
        dest: '<%= releaseDir %>/themes/material/css/style.min.css',
      },
      baggy: {
        options: {
          processors: [
            require('pixrem')(),
            require('autoprefixer')({ browsers: 'last 2 versions' }),
            require('cssnano')(),
          ],
        },
        src: '<%= buildDir %>/baggy.css',
        dest: '<%= releaseDir %>/themes/baggy/css/style.min.css',
      },
    },
    concat: {
      options: {
        separator: ';',
      },
      cssMaterial: {
        src: [
          'node_modules/materialize-css/bin/materialize.css',
          '<%= appDir %>/themes/material/css/*.css',
        ],
        dest: '<%= buildDir %>/material.css',
      },
      cssBaggy: {
        src: [
          '<%= appDir %>/themes/baggy/css/*.css',
        ],
        dest: '<%= buildDir %>/baggy.css',
      },
    },
    browserify: {
      dist: {
        files: {
          '<%= buildDir %>/material.browser.js': ['<%= appDir %>/themes/material/js/init.js'],
          '<%= buildDir %>/baggy.browser.js': ['<%= appDir %>/themes/baggy/js/init.js']
        }
      },
      options: {
        sourceType: "module",
        transform: [
          ["babelify", {
          presets: ["es2015"]
        }], ["browserify-shim", {
            "jquery": {
              "exports": "$"
            },
            "materialize": "materialize",
            "jquery-ui": {
              "depends": "jquery",
              "exports": null
            }
          }]
        ],
        browserifyOptions: {
          browser: {
            "jQuery": "./node_modules/jquery/dist/jquery.js",
            "jquery.tinydot": "./node_modules/jquery.tinydot/src/jquery.tinydot.js",
            "jquery.ui": "./node_modules/jquery-ui-browserify/dist/jquery-ui.js"
          }
        }
      }
    },
    uglify: {
      material: {
        files: {
          '<%= releaseDir %>/themes/material/js/material.min.js':
            ['<%= buildDir %>/material.browser.js'],
        }
      },
      baggy: {
        files: {
          '<%= releaseDir %>/themes/baggy/js/baggy.min.js':
            ['<%= buildDir %>/baggy.browser.js'],
        }
      },
    },
    copy: {
      pickerjs: {
        expand: true,
        cwd: '<%= modulesDir %>/pickadate/lib',
        src: 'picker.js',
        dest: '<%= buildDir %>',
      },
      annotator: {
        expand: true,
        cwd: '<%= modulesDir %>/annotator/pkg',
        src: 'annotator.min.js',
        dest: '<%= buildDir %>/themes/_global/js/',
      },
      baggyfonts: {
        files: [
          {
            expand: true,
            cwd: '<%= modulesDir %>/icomoon-free-npm/Font',
            src: 'IcoMoon-Free.ttf',
            dest: '<%= releaseDir %>/themes/baggy/fonts/',
          },
          {
            expand: true,
            cwd: '<%= modulesDir %>/ptsans-npm-webfont/fonts',
            src: 'ptsansbold.woff',
            dest: '<%= releaseDir %>/themes/baggy/fonts/',
          },
          {
            expand: true,
            cwd: '<%= modulesDir %>/material-design-icons-iconfont/dist/fonts/',
            src: ['MaterialIcons-Regular.eot', 'MaterialIcons-Regular.woff2', 'MaterialIcons-Regular.woff', 'MaterialIcons-Regular.ttf'],
            dest: '<%= releaseDir %>/themes/baggy/fonts/',
          },
        ],
      },
      materialfonts: {
        files: [
          {
            expand: true,
            overwrite: true,
            cwd: '<%= modulesDir %>/icomoon-free-npm/Font',
            src: 'IcoMoon-Free.ttf',
            dest: '<%= releaseDir %>/themes/material/fonts',
          },
          {
            expand: true,
            overwrite: true,
            cwd: '<%= modulesDir %>/roboto-fontface/fonts/Roboto',
            src: '*',
            dest: '<%= releaseDir %>/themes/material/font/roboto',
          },
          {
            expand: true,
            overwrite: true,
            cwd: '<%= modulesDir %>/material-design-icons-iconfont/dist/fonts/',
            src: ['MaterialIcons-Regular.eot', 'MaterialIcons-Regular.woff2', 'MaterialIcons-Regular.woff', 'MaterialIcons-Regular.ttf'],
            dest: '<%= releaseDir %>/themes/material/fonts/',
          },
        ],
      },
    },
    symlink: {
      pics: {
        files: [
          {
            expand: true,
            overwrite: true,
            cwd: '<%= appDir %>/themes/_global/',
            src: 'img',
            dest: '<%= releaseDir %>/themes/_global/',
          },
        ],
      },
    },
    clean: {
      css: {
        src: ['<%= buildDir %>/**/*.css'],
      },
      js: {
        src: ['<%= buildDir %>/**/*.js', '<%= buildDir %>/**/*.map'],
      },
      all: {
        src: ['./<%= buildDir %>'],
      },
      release: {
        src: ['./<%= releaseDir %>/*'],
      }
    },
    eslint: {
      target: ['<%= appDir %>/themes/material/js/init.js', '<%= appDir %>/themes/baggy/js/init.js']
    },
    stylelint: {
      target: ['<%= appDir %>/themes/material/css/*.css', '<%= appDir %>/themes/baggy/css/*.css']
    },
    watch: {
      files: ['<%= appDir %>/**/*.css', '<%= appDir %>/**/*.js'],
      tasks: ['css', 'js']
    }
  });
  grunt.registerTask(
    'fonts',
    'Install fonts',
    ['copy:baggyfonts', 'copy:materialfonts']
    );
  grunt.registerTask(
    'js',
    'Build and install js files',
    ['clean:js', 'copy:pickerjs', 'browserify', 'uglify']
    );
  grunt.registerTask(
    'default',
    'Build and install everything',
    ['clean', 'copy:pickerjs', 'concat', 'browserify', 'uglify', 'postcss', 'copy', 'symlink']
    );
  grunt.registerTask(
    'css',
    'Compiles the stylesheets.',
    ['clean:css', 'concat:cssMaterial', 'concat:cssBaggy', 'postcss']
  );
  grunt.registerTask(
      'tests',
      'Test css and js style conformity',
      ['eslint', 'stylelint', 'default']
  ),
  grunt.loadNpmTasks('grunt-contrib-watch');
 };
--- a/45
+++ b/45
@ -1,45 +0,0 @@
 TMP_FOLDER=/tmp
 RELEASE_FOLDER=wllbg-release
 ifndef ENV
 	ENV=prod
 endif
 help: ## Display this help menu
 	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
 clean: ## Clear the application cache
 	@rm -rf var/cache/*
 install: ## Install wallabag with the latest version
 	@sh scripts/install.sh $(ENV)
 update: ## Update the wallabag installation to the latest version
 	@sh scripts/update.sh $(ENV)
 dev: ## Install the latest dev version
 	@sh scripts/dev.sh
 run: ## Run the wallabag built-in server
 	@php bin/console server:run --env=$(ENV)
 build: ## Run grunt
 	@grunt
 test: ## Launch wallabag testsuite
 	@ant prepare && bin/simple-phpunit -v
 release: ## Create a package. Need a VERSION parameter (eg: `make release VERSION=master`).
 ifndef VERSION
 	$(error VERSION is not set)
 endif
 	@sh scripts/release.sh $(VERSION) $(TMP_FOLDER) $(RELEASE_FOLDER) $(ENV)
 travis: ## Make some stuff for Travis-CI
 deploy: ## Deploy wallabag
 	@bundle exec cap staging deploy
 .PHONY: help clean install update build test release travis deploy run dev
 .DEFAULT_GOAL := install
--- a/README.md
+++ b/README.md
@ -1,27 +1,28 @@
 [![Build Status](https://api.travis-ci.org/wallabag/wallabag.svg?branch=master)](https://travis-ci.org/wallabag/wallabag)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wallabag/wallabag/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/wallabag/wallabag/?branch=master)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wallabag/wallabag/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/wallabag/wallabag/?branch=v2)
 [![Gitter](https://badges.gitter.im/gitterHQ/gitter.svg)](https://gitter.im/wallabag/wallabag)
 # What is wallabag?
 wallabag is a self hostable application allowing you to not miss any content anymore.
 Click, save and read it when you can. It extracts content so that you can read it when you have time.
-More information on our website: [wallabag.org](https://wallabag.org).
+More informations on our website: [wallabag.org](https://wallabag.org)
 ![wallabag logo](https://raw.githubusercontent.com/wallabag/logo/master/_default/typo-horizontal/png/sm/logo-typo-horizontal-black-no-bg-no-border-sm.png)
 # Install wallabag
 Please read [the documentation to see the wallabag requirements](http://doc.wallabag.org/en/master/user/installation.html#requirements).
 If you don't have it yet, please [install composer](https://getcomposer.org/download/).
 Then you can install wallabag by executing the following commands:
 ```
-git clone https://github.com/wallabag/wallabag.git
+    git clone https://github.com/wallabag/wallabag.git
-cd wallabag && make install
+    cd wallabag
-make run
+    git checkout 2.0.4
    SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
    php bin/console wallabag:install --env=prod
    php bin/console server:run --env=prod
 ```
-# License
+## License
-Copyright © 2013-2017 Nicolas Lœuillet <nicolas@loeuillet.org>
+Copyright © 2013-2016 Nicolas Lœuillet <nicolas@loeuillet.org>
 This work is free. You can redistribute it and/or modify it under the
 terms of the MIT License. See the COPYING file for more details.
--- a/RELEASE_PROCESS.md
+++ b/RELEASE_PROCESS.md
@ -1,58 +1,47 @@
 ## Definition
 A release is mostly a git tag of http://github.com/wallabag/wallabag, following [semantic versioning](http://semver.org).
 The last release at the time of writing is 2.0.0-alpha.2, from the v2 branch.
 ### Steps to release
-During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE`.
+During this documentation, we assume the release is `release-2.0.0-beta.1`.
 #### Files to edit
 - `app/config/config.yml` (`wallabag_core.version`)
- `CHANGELOG.md` (by using this command `github-changes -o wallabag -r wallabag -k YOURGITHUBTOKEN --only-pulls --use-commit-body --title Changelog --date-format YYYY/MM/DD --between-tags 2.0.0-alpha.0...master -n 2.1.3`. [github-changes is available here](https://github.com/lalitkapoor/github-changes))
+- `README.md` (`composer create-project` command)
 - `docs/en/user/installation.rst` and its translations (`composer create-project` command)
 #### Create release on GitHub
 - Run these commands to create the tag:
 ```
-git checkout master
+    git checkout v2
-git pull origin master
+    git pull origin v2
-git checkout -b release-$LAST_WALLABAG_RELEASE
+    git checkout -b release-2.0.0-beta.1
-SYMFONY_ENV=prod composer up --no-dev
+    SYMFONY_ENV=prod composer up --no-dev
    git add --force composer.lock
    git add README.md
    git commit -m "Release wallabag 2.0.0-beta.1"
    git push origin release-2.0.0-beta.1
 ```
- Update `.travis.yml` file and replace the composer line with this one:
+- Create a new pull request with this title `DON'T MERGE Release wallabag 2.0.0-beta.1`. This pull request is used to launch builds on Travis-CI.
-
+- Run these commands to create the package:
 ```diff
 script:
 -    - travis_wait bash composer install -o  --no-interaction --no-progress --prefer-dist
 +    - travis_wait composer update --no-interaction --no-progress
 ```
 - Then continue with these commands:
 ```
-git add --force composer.lock .travis.yml
+    git clone git@github.com:wallabag/wallabag.git -b release-2.0.0-beta.1 release-2.0.0-beta.1
-git commit -m "Release wallabag $LAST_WALLABAG_RELEASE"
+    SYMFONY_ENV=prod composer up -d=release-2.0.0-beta.1 --no-dev
-git push origin release-$LAST_WALLABAG_RELEASE
+    tar czf wallabag-release-2.0.0-beta.1.tar.gz --exclude="var/*" --exclude=".git" release-2.0.0-beta.1
 ```
 - Create a new pull request with this title `DON'T MERGE Release wallabag $LAST_WALLABAG_RELEASE`. This pull request is used to launch builds on Travis-CI.
 - Run these command to create the package:
 ```
 make release master /tmp wllbg-release prod
 ```
 - [Create the new release on GitHub](https://github.com/wallabag/wallabag/releases/new). You have to upload on this page the package.
- Delete the `release-$LAST_WALLABAG_RELEASE` branch and close the pull request (**DO NOT MERGE IT**).
+- Delete the `release-2.0.0-beta.1` branch and close the pull request (**DO NOT MERGE IT**).
 - Update the URL shortener (used on `wllbg.org` to generate links like `http://wllbg.org/latest-v2-package` or `http://wllbg.org/latest-v2`)
 - Update [the downloads page](https://github.com/wallabag/wallabag.org/blob/master/content/pages/download.md) on the website (MD5 sum, release date)
- Update Dockerfile https://github.com/wallabag/docker (and create a new tag)
+- Drink a beer!
 - Update wallabag.org website (downloads, releases and new blog post)
 - Put the next patch version suffixed with `-dev` in `app/config/config.yml` (`wallabag_core.version`)
 - Drink a :beer:!
 ### `composer.lock`
 A release tag must contain a `composer.lock` file. It sets which dependencies were available at the time a release was done,
--- a/app/AppKernel.php
+++ b/app/AppKernel.php
@ -13,6 +13,7 @@ class AppKernel extends Kernel
            new Symfony\Bundle\TwigBundle\TwigBundle(),
            new Symfony\Bundle\MonologBundle\MonologBundle(),
            new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
            new Symfony\Bundle\AsseticBundle\AsseticBundle(),
            new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
            new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
            new FOS\RestBundle\FOSRestBundle(),
@ -29,9 +30,8 @@ class AppKernel extends Kernel
            new KPhoen\RulerZBundle\KPhoenRulerZBundle(),
            new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
            new Craue\ConfigBundle\CraueConfigBundle(),
            new Lexik\Bundle\MaintenanceBundle\LexikMaintenanceBundle(),
            new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),
            new FOS\JsRoutingBundle\FOSJsRoutingBundle(),
            new BD\GuzzleSiteAuthenticatorBundle\BDGuzzleSiteAuthenticatorBundle(),
            // wallabag bundles
            new Wallabag\CoreBundle\WallabagCoreBundle(),
@ -39,7 +39,6 @@ class AppKernel extends Kernel
            new Wallabag\UserBundle\WallabagUserBundle(),
            new Wallabag\ImportBundle\WallabagImportBundle(),
            new Wallabag\AnnotationBundle\WallabagAnnotationBundle(),
            new OldSound\RabbitMqBundle\OldSoundRabbitMqBundle(),
        ];
        if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
--- a/app/DoctrineMigrations/Version20160410190541.php
+++ b/app/DoctrineMigrations/Version20160410190541.php
@ -1,64 +0,0 @@
 <?php
 namespace Application\Migrations;
 use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 /**
 * Added foreign keys for account resetting
 */
 class Version20160410190541 extends AbstractMigration implements ContainerAwareInterface
 {
    /**
     * @var ContainerInterface
     */
    private $container;
    public function setContainer(ContainerInterface $container = null)
    {
        $this->container = $container;
    }
    private function getTable($tableName)
    {
        return $this->container->getParameter('database_table_prefix').$tableName;
    }
    /**
     * @param Schema $schema
     */
    public function up(Schema $schema)
    {
        $entryTable = $schema->getTable($this->getTable('entry'));
        $this->skipIf($entryTable->hasColumn('uid') || $entryTable->hasColumn('uuid'), 'It seems that you already played this migration.');
        $entryTable->addColumn('uid', 'string', [
            'notnull' => false,
            'length' => 23,
        ]);
        $sharePublic = $this->container
            ->get('doctrine.orm.default_entity_manager')
            ->getConnection()
            ->fetchArray('SELECT * FROM '.$this->getTable('craue_config_setting')." WHERE name = 'share_public'");
        if (false === $sharePublic) {
            $this->addSql('INSERT INTO '.$this->getTable('craue_config_setting')." (name, value, section) VALUES ('share_public', '1', 'entry')");
        }
    }
    /**
     * @param Schema $schema
     */
    public function down(Schema $schema)
    {
        $entryTable = $schema->getTable($this->getTable('entry'));
        $entryTable->dropColumn('uid');
        $this->addSql('DELETE FROM '.$this->getTable('craue_config_setting')." WHERE name = 'share_public'");
    }
 }
--- a/app/DoctrineMigrations/Version20160812120952.php
+++ b/app/DoctrineMigrations/Version20160812120952.php
@ -1,49 +0,0 @@
 <?php
 namespace Application\Migrations;
 use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 /**
 * Added name field on wallabag_oauth2_clients
 */
 class Version20160812120952 extends AbstractMigration implements ContainerAwareInterface
 {
    /**
     * @var ContainerInterface
     */
    private $container;
    public function setContainer(ContainerInterface $container = null)
    {
        $this->container = $container;
    }
    private function getTable($tableName)
    {
        return $this->container->getParameter('database_table_prefix').$tableName;
    }
    /**
     * @param Schema $schema
     */
    public function up(Schema $schema)
    {
        $clientsTable = $schema->getTable($this->getTable('oauth2_clients'));
        $this->skipIf($clientsTable->hasColumn('name'), 'It seems that you already played this migration.');
        $clientsTable->addColumn('name', 'blob');
    }
    /**
     * @param Schema $schema
     */
    public function down(Schema $schema)
    {
        $clientsTable = $schema->getTable($this->getTable('oauth2_clients'));
        $clientsTable->dropColumn('name');
    }
 }
--- a/app/DoctrineMigrations/Version20160911214952.php
+++ b/app/DoctrineMigrations/Version20160911214952.php
@ -1,64 +0,0 @@
 <?php
 namespace Application\Migrations;
 use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 /**
 * Added settings for RabbitMQ and Redis imports
 */
 class Version20160911214952 extends AbstractMigration implements ContainerAwareInterface
 {
    /**
     * @var ContainerInterface
     */
    private $container;
    public function setContainer(ContainerInterface $container = null)
    {
        $this->container = $container;
    }
    private function getTable($tableName)
    {
        return $this->container->getParameter('database_table_prefix').$tableName;
    }
    /**
     * @param Schema $schema
     */
    public function up(Schema $schema)
    {
        $redis = $this->container
            ->get('doctrine.orm.default_entity_manager')
            ->getConnection()
            ->fetchArray('SELECT * FROM '.$this->getTable('craue_config_setting')." WHERE name = 'import_with_redis'");
        if (false === $redis) {
            $this->addSql('INSERT INTO '.$this->getTable('craue_config_setting')." (name, value, section) VALUES ('import_with_redis', 0, 'import')");
        }
        $rabbitmq = $this->container
            ->get('doctrine.orm.default_entity_manager')
            ->getConnection()
            ->fetchArray('SELECT * FROM '.$this->getTable('craue_config_setting')." WHERE name = 'import_with_rabbitmq'");
        if (false === $rabbitmq) {
            $this->addSql('INSERT INTO '.$this->getTable('craue_config_setting')." (name, value, section) VALUES ('import_with_rabbitmq', 0, 'import')");
        }
        $this->skipIf(false !== $rabbitmq && false !== $redis, 'It seems that you already played this migration.');
    }
    /**
     * @param Schema $schema
     */
    public function down(Schema $schema)
    {
        $this->addSql('DELETE FROM '.$this->getTable('craue_config_setting')." WHERE name = 'import_with_redis';");
        $this->addSql('DELETE FROM '.$this->getTable('craue_config_setting')." WHERE name = 'import_with_rabbitmq';");
    }
 }
--- a/app/DoctrineMigrations/Version20160916201049.php
+++ b/app/DoctrineMigrations/Version20160916201049.php
@ -1,52 +0,0 @@
 <?php
 namespace Application\Migrations;
 use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 /**
 * Added pocket_consumer_key field on wallabag_config
 */
 class Version20160916201049 extends AbstractMigration implements ContainerAwareInterface
 {
    /**
     * @var ContainerInterface
     */
    private $container;
    public function setContainer(ContainerInterface $container = null)
    {
        $this->container = $container;
    }
    private function getTable($tableName)
    {
        return $this->container->getParameter('database_table_prefix').$tableName;
    }
    /**
     * @param Schema $schema
     */
    public function up(Schema $schema)
    {
        $configTable = $schema->getTable($this->getTable('config'));
        $this->skipIf($configTable->hasColumn('pocket_consumer_key'), 'It seems that you already played this migration.');
        $configTable->addColumn('pocket_consumer_key', 'string', ['notnull' => false]);
        $this->addSql('DELETE FROM '.$this->getTable('craue_config_setting')." WHERE name = 'pocket_consumer_key';");
    }
    /**
     * @param Schema $schema
     */
    public function down(Schema $schema)
    {
        $configTable = $schema->getTable($this->getTable('config'));
        $configTable->dropColumn('pocket_consumer_key');
        $this->addSql('INSERT INTO '.$this->getTable('craue_config_setting')." (name, value, section) VALUES ('pocket_consumer_key', NULL, 'import')");
    }
 }
--- a/app/DoctrineMigrations/Version20161001072726.php
+++ b/app/DoctrineMigrations/Version20161001072726.php
@ -1,127 +0,0 @@
 <?php
 namespace Application\Migrations;
 use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Doctrine\DBAL\Migrations\SkipMigrationException;
 /**
 * Added pocket_consumer_key field on wallabag_config
 */
 class Version20161001072726 extends AbstractMigration implements ContainerAwareInterface
 {
    /**
     * @var ContainerInterface
     */
    private $container;
    public function setContainer(ContainerInterface $container = null)
    {
        $this->container = $container;
    }
    private function getTable($tableName)
    {
        return $this->container->getParameter('database_table_prefix').$tableName;
    }
    /**
     * @param Schema $schema
     */
    public function up(Schema $schema)
    {
        $this->skipIf($this->connection->getDatabasePlatform()->getName() == 'sqlite', 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
        // remove all FK from entry_tag
        switch ($this->connection->getDatabasePlatform()->getName()) {
            case 'mysql':
                $query = $this->connection->query("
                    SELECT CONSTRAINT_NAME
                    FROM information_schema.key_column_usage
                    WHERE TABLE_NAME = '".$this->getTable('entry_tag')."' AND CONSTRAINT_NAME LIKE 'FK_%'
                    AND TABLE_SCHEMA = '".$this->connection->getDatabase()."'"
                );
                $query->execute();
                foreach ($query->fetchAll() as $fk) {
                    $this->addSql('ALTER TABLE '.$this->getTable('entry_tag').' DROP FOREIGN KEY '.$fk['CONSTRAINT_NAME']);
                }
                break;
            case 'postgresql':
                // http://dba.stackexchange.com/questions/36979/retrieving-all-pk-and-fk
                $query = $this->connection->query("
                    SELECT conrelid::regclass AS table_from
                          ,conname
                          ,pg_get_constraintdef(c.oid)
                    FROM   pg_constraint c
                    JOIN   pg_namespace n ON n.oid = c.connamespace
                    WHERE  contype = 'f'
                    AND    conrelid::regclass::text = '".$this->getTable('entry_tag')."'
                    AND    n.nspname = 'public';"
                );
                $query->execute();
                foreach ($query->fetchAll() as $fk) {
                    $this->addSql('ALTER TABLE '.$this->getTable('entry_tag').' DROP CONSTRAINT '.$fk['conname']);
                }
                break;
        }
        $this->addSql('ALTER TABLE '.$this->getTable('entry_tag').' ADD CONSTRAINT FK_entry_tag_entry FOREIGN KEY (entry_id) REFERENCES '.$this->getTable('entry').' (id) ON DELETE CASCADE');
        $this->addSql('ALTER TABLE '.$this->getTable('entry_tag').' ADD CONSTRAINT FK_entry_tag_tag FOREIGN KEY (tag_id) REFERENCES '.$this->getTable('tag').' (id) ON DELETE CASCADE');
        // remove entry FK from annotation
        switch ($this->connection->getDatabasePlatform()->getName()) {
            case 'mysql':
                $query = $this->connection->query("
                    SELECT CONSTRAINT_NAME
                    FROM information_schema.key_column_usage
                    WHERE TABLE_NAME = '".$this->getTable('annotation')."'
                    AND CONSTRAINT_NAME LIKE 'FK_%'
                    AND COLUMN_NAME = 'entry_id'
                    AND TABLE_SCHEMA = '".$this->connection->getDatabase()."'"
                );
                $query->execute();
                foreach ($query->fetchAll() as $fk) {
                    $this->addSql('ALTER TABLE '.$this->getTable('annotation').' DROP FOREIGN KEY '.$fk['CONSTRAINT_NAME']);
                }
                break;
            case 'postgresql':
                // http://dba.stackexchange.com/questions/36979/retrieving-all-pk-and-fk
                $query = $this->connection->query("
                    SELECT conrelid::regclass AS table_from
                          ,conname
                          ,pg_get_constraintdef(c.oid)
                    FROM   pg_constraint c
                    JOIN   pg_namespace n ON n.oid = c.connamespace
                    WHERE  contype = 'f'
                    AND    conrelid::regclass::text = '".$this->getTable('annotation')."'
                    AND    n.nspname = 'public'
                    AND    pg_get_constraintdef(c.oid) LIKE '%entry_id%';"
                );
                $query->execute();
                foreach ($query->fetchAll() as $fk) {
                    $this->addSql('ALTER TABLE '.$this->getTable('annotation').' DROP CONSTRAINT '.$fk['conname']);
                }
                break;
        }
        $this->addSql('ALTER TABLE '.$this->getTable('annotation').' ADD CONSTRAINT FK_annotation_entry FOREIGN KEY (entry_id) REFERENCES '.$this->getTable('entry').' (id) ON DELETE CASCADE');
    }
    /**
     * @param Schema $schema
     */
    public function down(Schema $schema)
    {
        throw new SkipMigrationException('Too complex ...');
    }
 }
--- a/app/DoctrineMigrations/Version20161022134138.php
+++ b/app/DoctrineMigrations/Version20161022134138.php
@ -1,85 +0,0 @@
 <?php
 namespace Application\Migrations;
 use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 /**
 * Converted database to utf8mb4 encoding (for MySQL only)
 */
 class Version20161022134138 extends AbstractMigration implements ContainerAwareInterface
 {
    /**
     * @var ContainerInterface
     */
    private $container;
    public function setContainer(ContainerInterface $container = null)
    {
        $this->container = $container;
    }
    private function getTable($tableName)
    {
        return $this->container->getParameter('database_table_prefix').$tableName;
    }
    /**
     * @param Schema $schema
     */
    public function up(Schema $schema)
    {
        $this->skipIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'This migration only apply to MySQL');
        $this->addSql('ALTER DATABASE '.$this->connection->getParams()['dbname'].' CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci;');
        // convert field length for utf8mb4
        // http://stackoverflow.com/a/31474509/569101
        $this->addSql('ALTER TABLE '.$this->getTable('user').' CHANGE confirmation_token confirmation_token VARCHAR(180) DEFAULT NULL;');
        $this->addSql('ALTER TABLE '.$this->getTable('user').' CHANGE salt salt VARCHAR(180) NOT NULL;');
        $this->addSql('ALTER TABLE '.$this->getTable('user').' CHANGE password password VARCHAR(180) NOT NULL;');
        $this->addSql('ALTER TABLE '.$this->getTable('annotation').' CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
        $this->addSql('ALTER TABLE '.$this->getTable('entry').' CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
        $this->addSql('ALTER TABLE '.$this->getTable('tag').' CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
        $this->addSql('ALTER TABLE '.$this->getTable('user').' CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
        $this->addSql('ALTER TABLE '.$this->getTable('annotation').' CHANGE `text` `text` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
        $this->addSql('ALTER TABLE '.$this->getTable('annotation').' CHANGE `quote` `quote` VARCHAR(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
        $this->addSql('ALTER TABLE '.$this->getTable('entry').' CHANGE `title` `title` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
        $this->addSql('ALTER TABLE '.$this->getTable('entry').' CHANGE `content` `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
        $this->addSql('ALTER TABLE '.$this->getTable('tag').' CHANGE `label` `label` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
        $this->addSql('ALTER TABLE '.$this->getTable('user').' CHANGE `name` `name` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
    }
    /**
     * @param Schema $schema
     */
    public function down(Schema $schema)
    {
        $this->skipIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'This migration only apply to MySQL');
        $this->addSql('ALTER DATABASE '.$this->connection->getParams()['dbname'].' CHARACTER SET = utf8 COLLATE = utf8_unicode_ci;');
        $this->addSql('ALTER TABLE '.$this->getTable('annotation').' CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
        $this->addSql('ALTER TABLE '.$this->getTable('entry').' CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
        $this->addSql('ALTER TABLE '.$this->getTable('tag').' CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
        $this->addSql('ALTER TABLE '.$this->getTable('user').' CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
        $this->addSql('ALTER TABLE '.$this->getTable('annotation').' CHANGE `text` `text` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
        $this->addSql('ALTER TABLE '.$this->getTable('annotation').' CHANGE `quote` `quote` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
        $this->addSql('ALTER TABLE '.$this->getTable('entry').' CHANGE `title` `title` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
        $this->addSql('ALTER TABLE '.$this->getTable('entry').' CHANGE `content` `content` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
        $this->addSql('ALTER TABLE '.$this->getTable('tag').' CHANGE `label` `label` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
        $this->addSql('ALTER TABLE '.$this->getTable('user').' CHANGE `name` `name` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;');
    }
 }
--- a/app/DoctrineMigrations/Version20161024212538.php
+++ b/app/DoctrineMigrations/Version20161024212538.php
@ -1,67 +0,0 @@
 <?php
 namespace Application\Migrations;
 use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 /**
 * Added user_id column on oauth2_clients to prevent users to delete API clients from other users
 */
 class Version20161024212538 extends AbstractMigration implements ContainerAwareInterface
 {
    /**
     * @var ContainerInterface
     */
    private $container;
    private $constraintName = 'IDX_user_oauth_client';
    public function setContainer(ContainerInterface $container = null)
    {
        $this->container = $container;
    }
    private function getTable($tableName)
    {
        return $this->container->getParameter('database_table_prefix').$tableName;
    }
    /**
     * @param Schema $schema
     */
    public function up(Schema $schema)
    {
        $clientsTable = $schema->getTable($this->getTable('oauth2_clients'));
        $this->skipIf($clientsTable->hasColumn('user_id'), 'It seems that you already played this migration.');
        $clientsTable->addColumn('user_id', 'integer', ['notnull' => false]);
        $clientsTable->addForeignKeyConstraint(
            $this->getTable('user'),
            ['user_id'],
            ['id'],
            ['onDelete' => 'CASCADE'],
            $this->constraintName
        );
    }
    /**
     * @param Schema $schema
     */
    public function down(Schema $schema)
    {
        $clientsTable = $schema->getTable($this->getTable('oauth2_clients'));
        $this->skipIf(!$clientsTable->hasColumn('user_id'), 'It seems that you already played this migration.');
        $clientsTable->dropColumn('user_id', 'integer');
        if ($this->connection->getDatabasePlatform()->getName() != 'sqlite') {
            $clientsTable->removeForeignKey($this->constraintName);
        }
    }
 }
--- a/app/DoctrineMigrations/Version20161031132655.php
+++ b/app/DoctrineMigrations/Version20161031132655.php
@ -1,52 +0,0 @@
 <?php
 namespace Application\Migrations;
 use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 /**
 * Added the internal setting to enable/disable downloading pictures
 */
 class Version20161031132655 extends AbstractMigration implements ContainerAwareInterface
 {
    /**
     * @var ContainerInterface
     */
    private $container;
    public function setContainer(ContainerInterface $container = null)
    {
        $this->container = $container;
    }
    private function getTable($tableName)
    {
        return $this->container->getParameter('database_table_prefix').$tableName;
    }
    /**
     * @param Schema $schema
     */
    public function up(Schema $schema)
    {
        $images = $this->container
            ->get('doctrine.orm.default_entity_manager')
            ->getConnection()
            ->fetchArray('SELECT * FROM '.$this->getTable('craue_config_setting')." WHERE name = 'download_images_enabled'");
        $this->skipIf(false !== $images, 'It seems that you already played this migration.');
        $this->addSql('INSERT INTO '.$this->getTable('craue_config_setting')." (name, value, section) VALUES ('download_images_enabled', 0, 'misc')");
    }
    /**
     * @param Schema $schema
     */
    public function down(Schema $schema)
    {
        $this->addSql('DELETE FROM '.$this->getTable('craue_config_setting')." WHERE name = 'download_images_enabled';");
    }
 }
--- a/app/DoctrineMigrations/Version20161104073720.php
+++ b/app/DoctrineMigrations/Version20161104073720.php
@ -1,53 +0,0 @@
 <?php
 namespace Application\Migrations;
 use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 /**
 * Added created_at index on entry table
 */
 class Version20161104073720 extends AbstractMigration implements ContainerAwareInterface
 {
    /**
     * @var ContainerInterface
     */
    private $container;
    private $indexName = 'IDX_entry_created_at';
    public function setContainer(ContainerInterface $container = null)
    {
        $this->container = $container;
    }
    private function getTable($tableName)
    {
        return $this->container->getParameter('database_table_prefix').$tableName;
    }
    /**
     * @param Schema $schema
     */
    public function up(Schema $schema)
    {
        $entryTable = $schema->getTable($this->getTable('entry'));
        $this->skipIf($entryTable->hasIndex($this->indexName), 'It seems that you already played this migration.');
        $entryTable->addIndex(['created_at'], $this->indexName);
    }
    /**
     * @param Schema $schema
     */
    public function down(Schema $schema)
    {
        $entryTable = $schema->getTable($this->getTable('entry'));
        $this->skipIf(false === $entryTable->hasIndex($this->indexName), 'It seems that you already played this migration.');
        $entryTable->dropIndex($this->indexName);
    }
 }
--- a/app/DoctrineMigrations/Version20161106113822.php
+++ b/app/DoctrineMigrations/Version20161106113822.php
@ -1,56 +0,0 @@
 <?php
 namespace Application\Migrations;
 use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 /**
 * Added action_mark_as_read field on config table
 */
 class Version20161106113822 extends AbstractMigration implements ContainerAwareInterface
 {
    /**
     * @var ContainerInterface
     */
    private $container;
    public function setContainer(ContainerInterface $container = null)
    {
        $this->container = $container;
    }
    private function getTable($tableName)
    {
        return $this->container->getParameter('database_table_prefix').$tableName;
    }
    /**
     * @param Schema $schema
     */
    public function up(Schema $schema)
    {
        $configTable = $schema->getTable($this->getTable('config'));
        $this->skipIf($configTable->hasColumn('action_mark_as_read'), 'It seems that you already played this migration.');
        $configTable->addColumn('action_mark_as_read', 'integer', [
            'default' => 0,
            'notnull' => false,
        ]);
    }
    /**
     * @param Schema $schema
     */
    public function down(Schema $schema)
    {
        $configTable = $schema->getTable($this->getTable('config'));
        $this->skipIf(!$configTable->hasColumn('action_mark_as_read'), 'It seems that you already played this migration.');
        $configTable->dropColumn('action_mark_as_read');
    }
 }
--- a/app/DoctrineMigrations/Version20161117071626.php
+++ b/app/DoctrineMigrations/Version20161117071626.php
@ -1,64 +0,0 @@
 <?php
 namespace Application\Migrations;
 use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 /**
 * Added the internal setting to share articles to unmark.it
 */
 class Version20161117071626 extends AbstractMigration implements ContainerAwareInterface
 {
    /**
     * @var ContainerInterface
     */
    private $container;
    public function setContainer(ContainerInterface $container = null)
    {
        $this->container = $container;
    }
    private function getTable($tableName)
    {
        return $this->container->getParameter('database_table_prefix').$tableName;
    }
    /**
     * @param Schema $schema
     */
    public function up(Schema $schema)
    {
        $share = $this->container
            ->get('doctrine.orm.default_entity_manager')
            ->getConnection()
            ->fetchArray('SELECT * FROM '.$this->getTable('craue_config_setting')." WHERE name = 'share_unmark'");
        if (false === $share) {
            $this->addSql('INSERT INTO '.$this->getTable('craue_config_setting')." (name, value, section) VALUES ('share_unmark', 0, 'entry')");
        }
        $unmark = $this->container
            ->get('doctrine.orm.default_entity_manager')
            ->getConnection()
            ->fetchArray('SELECT * FROM '.$this->getTable('craue_config_setting')." WHERE name = 'unmark_url'");
        if (false === $unmark) {
            $this->addSql('INSERT INTO '.$this->getTable('craue_config_setting')." (name, value, section) VALUES ('unmark_url', 'https://unmark.it', 'entry')");
        }
        $this->skipIf(false !== $share && false !== $unmark, 'It seems that you already played this migration.');
    }
    /**
     * @param Schema $schema
     */
    public function down(Schema $schema)
    {
        $this->addSql('DELETE FROM '.$this->getTable('craue_config_setting')." WHERE name = 'share_unmark';");
        $this->addSql('DELETE FROM '.$this->getTable('craue_config_setting')." WHERE name = 'unmark_url';");
    }
 }
--- a/app/DoctrineMigrations/Version20161118134328.php
+++ b/app/DoctrineMigrations/Version20161118134328.php
@ -1,56 +0,0 @@
 <?php
 namespace Application\Migrations;
 use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 /**
 * Add http_status in `entry_table`.
 */
 class Version20161118134328 extends AbstractMigration implements ContainerAwareInterface
 {
    /**
     * @var ContainerInterface
     */
    private $container;
    public function setContainer(ContainerInterface $container = null)
    {
        $this->container = $container;
    }
    private function getTable($tableName)
    {
        return $this->container->getParameter('database_table_prefix').$tableName;
    }
    /**
     * @param Schema $schema
     */
    public function up(Schema $schema)
    {
        $entryTable = $schema->getTable($this->getTable('entry'));
        $this->skipIf($entryTable->hasColumn('http_status'), 'It seems that you already played this migration.');
        $entryTable->addColumn('http_status', 'string', [
            'length' => 3,
            'notnull' => false,
        ]);
    }
    /**
     * @param Schema $schema
     */
    public function down(Schema $schema)
    {
        $entryTable = $schema->getTable($this->getTable('entry'));
        $this->skipIf(!$entryTable->hasColumn('http_status'), 'It seems that you already played this migration.');
        $entryTable->dropColumn('http_status');
    }
 }
--- a/app/DoctrineMigrations/Version20161122144743.php
+++ b/app/DoctrineMigrations/Version20161122144743.php
@ -1,52 +0,0 @@
 <?php
 namespace Application\Migrations;
 use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 /**
 * Add the restricted_access internal setting for articles with paywall.
 */
 class Version20161122144743 extends AbstractMigration implements ContainerAwareInterface
 {
    /**
     * @var ContainerInterface
     */
    private $container;
    public function setContainer(ContainerInterface $container = null)
    {
        $this->container = $container;
    }
    private function getTable($tableName)
    {
        return $this->container->getParameter('database_table_prefix').$tableName;
    }
    /**
     * @param Schema $schema
     */
    public function up(Schema $schema)
    {
        $access = $this->container
            ->get('doctrine.orm.default_entity_manager')
            ->getConnection()
            ->fetchArray('SELECT * FROM '.$this->getTable('craue_config_setting')." WHERE name = 'restricted_access'");
        $this->skipIf(false !== $access, 'It seems that you already played this migration.');
        $this->addSql('INSERT INTO '.$this->getTable('craue_config_setting')." (name, value, section) VALUES ('restricted_access', 0, 'entry')");
    }
    /**
     * @param Schema $schema
     */
    public function down(Schema $schema)
    {
        $this->addSql('DELETE FROM '.$this->getTable('craue_config_setting')." WHERE name = 'restricted_access';");
    }
 }
--- a/app/DoctrineMigrations/Version20161122203647.php
+++ b/app/DoctrineMigrations/Version20161122203647.php
@ -1,63 +0,0 @@
 <?php
 namespace Application\Migrations;
 use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 /**
 * Methods and properties removed from `FOS\UserBundle\Model\User`.
 *
 * - `$expired`
 * - `$credentialsExpired`
 * - `setExpired()` (use `setExpiresAt(\DateTime::now()` instead)
 * - `setCredentialsExpired()` (use `setCredentialsExpireAt(\DateTime::now()` instead)
 *
 * You need to drop the fields `expired` and `credentials_expired` from your database
 * schema, because they aren't mapped anymore.
 */
 class Version20161122203647 extends AbstractMigration implements ContainerAwareInterface
 {
    /**
     * @var ContainerInterface
     */
    private $container;
    public function setContainer(ContainerInterface $container = null)
    {
        $this->container = $container;
    }
    private function getTable($tableName)
    {
        return $this->container->getParameter('database_table_prefix').$tableName;
    }
    /**
     * @param Schema $schema
     */
    public function up(Schema $schema)
    {
        $userTable = $schema->getTable($this->getTable('user'));
        $this->skipIf(false === $userTable->hasColumn('expired') || false === $userTable->hasColumn('credentials_expired'), 'It seems that you already played this migration.');
        $userTable->dropColumn('expired');
        $userTable->dropColumn('credentials_expired');
    }
    /**
     * @param Schema $schema
     */
    public function down(Schema $schema)
    {
        $userTable = $schema->getTable($this->getTable('user'));
        $this->skipIf(true === $userTable->hasColumn('expired') || true === $userTable->hasColumn('credentials_expired'), 'It seems that you already played this migration.');
        $userTable->addColumn('expired', 'smallint', ['notnull' => false]);
        $userTable->addColumn('credentials_expired', 'smallint', ['notnull' => false]);
    }
 }
--- a/app/DoctrineMigrations/Version20161128084725.php
+++ b/app/DoctrineMigrations/Version20161128084725.php
@ -1,49 +0,0 @@
 <?php
 namespace Application\Migrations;
 use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 /**
 * Added list_mode in user config.
 */
 class Version20161128084725 extends AbstractMigration implements ContainerAwareInterface
 {
    /**
     * @var ContainerInterface
     */
    private $container;
    public function setContainer(ContainerInterface $container = null)
    {
        $this->container = $container;
    }
    private function getTable($tableName)
    {
        return $this->container->getParameter('database_table_prefix').$tableName;
    }
    /**
     * @param Schema $schema
     */
    public function up(Schema $schema)
    {
        $configTable = $schema->getTable($this->getTable('config'));
        $this->skipIf($configTable->hasColumn('list_mode'), 'It seems that you already played this migration.');
        $configTable->addColumn('list_mode', 'integer', ['notnull' => false]);
    }
    /**
     * @param Schema $schema
     */
    public function down(Schema $schema)
    {
        $configTable = $schema->getTable($this->getTable('config'));
        $configTable->dropColumn('list_mode');
    }
 }
--- a/app/DoctrineMigrations/Version20161128131503.php
+++ b/app/DoctrineMigrations/Version20161128131503.php
@ -1,61 +0,0 @@
 <?php
 namespace Application\Migrations;
 use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 /**
 * Removed locked, credentials_expire_at and expires_at.
 */
 class Version20161128131503 extends AbstractMigration implements ContainerAwareInterface
 {
    private $fields = [
        'locked' => 'smallint',
        'credentials_expire_at' => 'datetime',
        'expires_at' => 'datetime',
    ];
    /**
     * @var ContainerInterface
     */
    private $container;
    public function setContainer(ContainerInterface $container = null)
    {
        $this->container = $container;
    }
    private function getTable($tableName)
    {
        return $this->container->getParameter('database_table_prefix').$tableName;
    }
    /**
     * @param Schema $schema
     */
    public function up(Schema $schema)
    {
        $userTable = $schema->getTable($this->getTable('user'));
        foreach ($this->fields as $field => $type) {
            $this->skipIf(!$userTable->hasColumn($field), 'It seems that you already played this migration.');
            $userTable->dropColumn($field);
        }
    }
    /**
     * @param Schema $schema
     */
    public function down(Schema $schema)
    {
        $userTable = $schema->getTable($this->getTable('user'));
        foreach ($this->fields as $field => $type) {
            $this->skipIf($userTable->hasColumn($field), 'It seems that you already played this migration.');
            $userTable->addColumn($field, $type, ['notnull' => false]);
        }
    }
 }
--- a/app/DoctrineMigrations/Version20161214094402.php
+++ b/app/DoctrineMigrations/Version20161214094402.php
@ -1,75 +0,0 @@
 <?php
 namespace Application\Migrations;
 use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 /**
 * Renamed uuid to uid in entry table
 */
 class Version20161214094402 extends AbstractMigration implements ContainerAwareInterface
 {
    /**
     * @var ContainerInterface
     */
    private $container;
    public function setContainer(ContainerInterface $container = null)
    {
        $this->container = $container;
    }
    private function getTable($tableName)
    {
        return $this->container->getParameter('database_table_prefix').$tableName;
    }
    /**
     * @param Schema $schema
     */
    public function up(Schema $schema)
    {
        $entryTable = $schema->getTable($this->getTable('entry'));
        $this->skipIf($entryTable->hasColumn('uid'), 'It seems that you already played this migration.');
        switch ($this->connection->getDatabasePlatform()->getName()) {
            case 'sqlite':
                $this->addSql('CREATE TEMPORARY TABLE __temp__wallabag_entry AS SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM '.$this->getTable('entry'));
                $this->addSql('DROP TABLE '.$this->getTable('entry'));
                $this->addSql('CREATE TABLE '.$this->getTable('entry').' (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, uid CLOB DEFAULT NULL COLLATE BINARY, title CLOB DEFAULT NULL COLLATE BINARY, url CLOB DEFAULT NULL COLLATE BINARY, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype CLOB DEFAULT NULL COLLATE BINARY, language CLOB DEFAULT NULL COLLATE BINARY, reading_time INTEGER DEFAULT NULL, domain_name CLOB DEFAULT NULL COLLATE BINARY, preview_picture CLOB DEFAULT NULL COLLATE BINARY, is_public BOOLEAN DEFAULT "0", PRIMARY KEY(id));');
                $this->addSql('INSERT INTO '.$this->getTable('entry').' (id, user_id, uid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public) SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM __temp__wallabag_entry;');
                $this->addSql('DROP TABLE __temp__wallabag_entry');
                break;
            case 'mysql':
                $this->addSql('ALTER TABLE '.$this->getTable('entry').' CHANGE uuid uid VARCHAR(23)');
                break;
            case 'postgresql':
                $this->addSql('ALTER TABLE '.$this->getTable('entry').' RENAME uuid TO uid');
        }
    }
    /**
     * @param Schema $schema
     */
    public function down(Schema $schema)
    {
        $entryTable = $schema->getTable($this->getTable('entry'));
        $this->skipIf($entryTable->hasColumn('uuid'), 'It seems that you already played this migration.');
        switch ($this->connection->getDatabasePlatform()->getName()) {
            case 'sqlite':
                throw new SkipMigrationException('Too complex ...');
                break;
            case 'mysql':
                $this->addSql('ALTER TABLE '.$this->getTable('entry').' CHANGE uid uuid VARCHAR(23)');
                break;
            case 'postgresql':
                $this->addSql('ALTER TABLE '.$this->getTable('entry').' RENAME uid TO uuid');
        }
    }
 }
--- a/app/DoctrineMigrations/Version20161214094403.php
+++ b/app/DoctrineMigrations/Version20161214094403.php
@ -1,53 +0,0 @@
 <?php
 namespace Application\Migrations;
 use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 /**
 * Added index on wallabag_entry.uid
 */
 class Version20161214094403 extends AbstractMigration implements ContainerAwareInterface
 {
    /**
     * @var ContainerInterface
     */
    private $container;
    private $indexName = 'IDX_entry_uid';
    public function setContainer(ContainerInterface $container = null)
    {
        $this->container = $container;
    }
    private function getTable($tableName)
    {
        return $this->container->getParameter('database_table_prefix').$tableName;
    }
    /**
     * @param Schema $schema
     */
    public function up(Schema $schema)
    {
        $entryTable = $schema->getTable($this->getTable('entry'));
        $this->skipIf($entryTable->hasIndex($this->indexName), 'It seems that you already played this migration.');
        $entryTable->addIndex(['uid'], $this->indexName);
    }
    /**
     * @param Schema $schema
     */
    public function down(Schema $schema)
    {
        $entryTable = $schema->getTable($this->getTable('entry'));
        $this->skipIf(false === $entryTable->hasIndex($this->indexName), 'It seems that you already played this migration.');
        $entryTable->dropIndex($this->indexName);
    }
 }
--- a/app/DoctrineMigrations/Version20170127093841.php
+++ b/app/DoctrineMigrations/Version20170127093841.php
@ -1,56 +0,0 @@
 <?php
 namespace Application\Migrations;
 use Doctrine\DBAL\Migrations\AbstractMigration;
 use Doctrine\DBAL\Schema\Schema;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 /**
 * Added indexes on wallabag_entry.is_starred and wallabag_entry.is_archived
 */
 class Version20170127093841 extends AbstractMigration implements ContainerAwareInterface
 {
    /**
     * @var ContainerInterface
     */
    private $container;
    private $indexStarredName = 'IDX_entry_starred';
    private $indexArchivedName = 'IDX_entry_archived';
    public function setContainer(ContainerInterface $container = null)
    {
        $this->container = $container;
    }
    private function getTable($tableName)
    {
        return $this->container->getParameter('database_table_prefix').$tableName;
    }
    /**
     * @param Schema $schema
     */
    public function up(Schema $schema)
    {
        $entryTable = $schema->getTable($this->getTable('entry'));
        $this->skipIf($entryTable->hasIndex($this->indexStarredName) && $entryTable->hasIndex($this->indexArchivedName), 'It seems that you already played this migration.');
        $entryTable->addIndex(['is_starred'], $this->indexStarredName);
        $entryTable->addIndex(['is_archived'], $this->indexArchivedName);
    }
    /**
     * @param Schema $schema
     */
    public function down(Schema $schema)
    {
        $entryTable = $schema->getTable($this->getTable('entry'));
        $this->skipIf(false === $entryTable->hasIndex($this->indexStarredName) && false === $entryTable->hasIndex($this->indexArchivedName), 'It seems that you already played this migration.');
        $entryTable->dropIndex($this->indexStarredName);
        $entryTable->dropIndex($this->indexArchivedName);
    }
 }
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
@ -1,4 +1,3 @@
 # settings_changed: Configuration updated
 download_pictures: Download billeder på din server
 carrot: Aktiver deling til Carrot
 diaspora_url: Diaspora URL, hvis tjenesten er aktiv
@ -9,14 +8,12 @@ export_csv: Aktiver eksport til CSV
 export_json: Aktiver eksport til JSON
 export_txt: Aktiver eksport til TXT
 export_xml: Aktiver eksport til XML
-# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
+pocket_consumer_key: Brugers nøgle til Pocket for at importere materialer (https://getpocket.com/developer/docs/authentication)
 # import_with_redis: Enable Redis to import data asynchronously
 shaarli_url: Shaarli-URL, hvis tjenesten er aktiv
 share_diaspora: Aktiver deling til Diaspora
 share_mail: Aktiver deling med email
 share_shaarli: Aktiver deling gennem Shaarli
 share_twitter: Aktiver deling gennem Twitter
 share_unmark: Aktiver deling gennem Unmark.it
 show_printlink: Vis et link til print-indhold
 wallabag_support_url: Support-URL for wallabag
 wallabag_url: URL for *sin* wallabag-installation
@ -25,11 +22,8 @@ export: "eksport"
 import: "import"
 misc: "misc"
 modify_settings: "Gem ændring"
-piwik_host: Hosting af din side hos Piwik (uden http:// eller https://)
+piwik_host: Hosting af din side hos Piwik
 piwik_site_id: ID for din side hos Piwik
 piwik_enabled: Aktiver Piwik
 demo_mode_enabled: "Aktiver demo-indstilling? (anvendes kun til wallabags offentlige demo)"
 demo_mode_username: "Demobruger"
 # share_public: Allow public url for entries
 # download_images_enabled: Download images locally
 # restricted_access: Enable authentication for websites with paywall
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
@ -1,22 +1,19 @@
 # settings_changed: Configuration updated
 download_pictures: Bilder auf den Server herunterladen
 carrot: Teilen zu Carrot aktivieren
 diaspora_url: Diaspora-URL, sofern der Service aktiviert ist
 export_epub: ePUB-Export aktivieren
-export_mobi: mobi-Export aktivieren
+export_mobi: .mobi-Export aktivieren
 export_pdf: PDF-Export aktivieren
 export_csv: CSV-Export aktivieren
 export_json: JSON-Export aktivieren
 export_txt: TXT-Export aktivieren
 export_xml: XML-Export aktivieren
-import_with_rabbitmq: Aktiviere RabbitMQ, um Artikel asynchron zu importieren
+pocket_consumer_key: Consumer-Key für Pocket, um Inhalte zu importieren (https://getpocket.com/developer/docs/authentication)
 import_with_redis: Aktiviere Redis, um Artikel asynchron zu importieren
 shaarli_url: Shaarli-URL, sofern der Service aktiviert ist
 share_diaspora: Teilen zu Diaspora aktiveren
 share_mail: Teilen via E-Mail aktiveren
 share_shaarli: Teilen zu Shaarli aktiveren
 share_twitter: Teilen zu Twitter aktiveren
 share_unmark: Teilen zu Unmark.it aktiveren
 show_printlink: Link anzeigen, um den Inhalt auszudrucken
 wallabag_support_url: Support-URL für wallabag
 wallabag_url: URL von *deiner* wallabag-Instanz
@ -25,11 +22,8 @@ export: "Export"
 import: "Import"
 misc: "Verschiedenes"
 modify_settings: "Übernehmen"
-piwik_host: Host deiner Webseite in Piwik (ohne http:// oder https://)
+piwik_host: Host deiner Webseite in Piwik
 piwik_site_id: ID deiner Webseite in Piwik
 piwik_enabled: Piwik aktivieren
 demo_mode_enabled: "Test-Modus aktivieren? (nur für die öffentliche wallabag-Demo genutzt)"
 demo_mode_username: "Test-Benutzer"
 share_public: Erlaube eine öffentliche URL für Einträge
 # download_images_enabled: Download images locally
 # restricted_access: Enable authentication for websites with paywall
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
@ -1,4 +1,3 @@
 settings_changed: Configuration updated
 download_pictures: Download pictures on your server
 carrot: Enable share to Carrot
 diaspora_url: Diaspora URL, if the service is enabled
@ -9,14 +8,12 @@ export_csv: Enable CSV export
 export_json: Enable JSON export
 export_txt: Enable TXT export
 export_xml: Enable XML export
-import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
+pocket_consumer_key: Consumer key for Pocket to import contents (https://getpocket.com/developer/docs/authentication)
 import_with_redis: Enable Redis to import data asynchronously
 shaarli_url: Shaarli URL, if the service is enabled
 share_diaspora: Enable share to Diaspora
 share_mail: Enable share by email
 share_shaarli: Enable share to Shaarli
 share_twitter: Enable share to Twitter
 share_unmark: Enable share to Unmark.it
 show_printlink: Display a link to print content
 wallabag_support_url: Support URL for wallabag
 wallabag_url: URL of *your* wallabag instance
@ -25,11 +22,8 @@ export: "export"
 import: "import"
 misc: "misc"
 modify_settings: "apply"
-piwik_host: Host of your website in Piwik (without http:// ou https://)
+piwik_host: Host of your website in Piwik
 piwik_site_id: ID of your website in Piwik
 piwik_enabled: Enable Piwik
 demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
 demo_mode_username: "Demo user"
 share_public: Allow public url for entries
 download_images_enabled: Download images locally
 restricted_access: Enable authentication for websites with paywall
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
@ -1,4 +1,3 @@
 # settings_changed: Configuration updated
 download_pictures: Descargar imágenes
 carrot: Activar compartir con Carrot
 diaspora_url: Diaspora URL, si el servicio está activado
@ -9,14 +8,12 @@ export_csv: Activar exportación a CSV
 export_json: Activar exportación a JSON
 export_txt: Activar exportación a TXT
 export_xml: Activar exportación a XML
-# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
+pocket_consumer_key: Consumer key for Pocket to import contents (https://getpocket.com/developer/docs/authentication)
 # import_with_redis: Enable Redis to import data asynchronously
 shaarli_url: Shaarli URL, si el servicio está activado
 share_diaspora: Activar compartir con Diaspora
 share_mail: Activar compartir con email
 share_shaarli: Activar compartir con Shaarli
 share_twitter: Activar compartir con Twitter
 share_unmark: Activar compartir con Unmark.it
 show_printlink: Mostrar un enlace para imprimir contenido
 wallabag_support_url: URL de soporte de wallabag
 wallabag_url: URL de *tu* instancia de wallabag
@ -25,11 +22,8 @@ export: "exportar"
 import: "importar"
 misc: "misc"
 modify_settings: "modificar configuración"
-piwik_host: Host de tu website de Piwik (sin http:// o https://)
+piwik_host: Host de tu website de Piwik
 piwik_site_id: ID de tu website de Piwik
 piwik_enabled: Activar Piwik
 demo_mode_enabled: "Activar modo demo (sólo usado para la demo de wallabag)"
 demo_mode_username: "Nombre de usuario demo"
 # share_public: Allow public url for entries
 # download_images_enabled: Download images locally
 # restricted_access: Enable authentication for websites with paywall
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
@ -1,4 +1,3 @@
 # settings_changed: Configuration updated
 download_pictures: تصاویر را در کارگزار خودتان باربگیرید
 carrot: فعال‌سازی هم‌رسانی به Carrot
 diaspora_url: نشانی Diaspora، اگر فعال بود
@ -9,14 +8,12 @@ export_csv:  فعال‌سازی برون‌سپاری به CSV
 export_json:  فعال‌سازی برون‌سپاری به JSON
 export_txt:  فعال‌سازی برون‌سپاری به TXT
 export_xml:  فعال‌سازی برون‌سپاری به XML
-# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
+pocket_consumer_key: کلید کاربری Pocket برای درون‌ریزی مطالب (https://getpocket.com/developer/docs/authentication)
 # import_with_redis: Enable Redis to import data asynchronously
 shaarli_url: نشانی Shaarli، اگر فعال بود
 share_diaspora: فعال‌سازی هم‌رسانی به Diaspora
 share_mail:  فعال‌سازی هم‌رسانی با ایمیل
 share_shaarli:  فعال‌سازی هم‌رسانی به Shaarli
 share_twitter:  فعال‌سازی هم‌رسانی به Twitter
 share_unmark:  فعال‌سازی هم‌رسانی به Unmark.it
 show_printlink: نمایش پیوندی برای چاپ مطلب
 wallabag_support_url: نشانی صفحهٔ پشتیبانی wallabag
 wallabag_url: نشانی صفحهٔ wallabag *شما*
@ -25,11 +22,3 @@ export: "برون‌سپاری"
 import: "درون‌ریزی"
 misc: "غیره"
 modify_settings: "اعمال"
 # piwik_host: Host of your website in Piwik (without http:// or https://)
 # piwik_site_id: ID of your website in Piwik
 # piwik_enabled: Enable Piwik
 # demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
 # demo_mode_username: "Demo user"
 # share_public: Allow public url for entries
 # download_images_enabled: Download images locally
 # restricted_access: Enable authentication for websites with paywall
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
@ -1,4 +1,3 @@
 settings_changed: Configuration mise à jour
 download_pictures: Télécharger les images sur le serveur
 carrot: Activer le partage vers Carrot
 diaspora_url: URL de Diaspora, si le service Diaspora est activé
@ -9,14 +8,12 @@ export_csv: Activer l'export CSV
 export_json: Activer l'export JSON
 export_txt: Activer l'export TXT
 export_xml: Activer l'export XML
-import_with_rabbitmq: Activer RabbitMQ pour gérer les imports de façon asynchrone
+pocket_consumer_key: Clé d'authentification Pocket pour importer les données (https://getpocket.com/developer/docs/authentication)
 import_with_redis: Activer Redis pour gérer les imports de façon asynchrone
 shaarli_url: URL de Shaarli, si le service Shaarli est activé
 share_diaspora: Activer le partage vers Diaspora
 share_mail: Activer le partage par email
 share_shaarli: Activer le partage vers Shaarli
 share_twitter: Activer le partage vers Twitter
 share_unmark: Activer le partage vers Unmark.it
 show_printlink: Afficher un lien pour imprimer
 wallabag_support_url: URL de support de wallabag
 wallabag_url: URL de *votre* instance de wallabag
@ -25,11 +22,8 @@ export: "export"
 import: "import"
 misc: "divers"
 modify_settings: "appliquer"
-piwik_host: URL de votre site dans Piwik (sans http:// ou https://)
+piwik_host: URL de votre site dans Piwik
 piwik_site_id: ID de votre site dans Piwik
 piwik_enabled: Activer Piwik
 demo_mode_enabled: "Activer le mode démo ? (utiliser uniquement pour la démo publique de wallabag)"
 demo_mode_username: "Utilisateur de la démo"
 share_public: Autoriser une URL publique pour les articles
 download_images_enabled: Télécharger les images en local
 restricted_access: Activer l'authentification pour les articles derrière un paywall
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
@ -1,6 +1,5 @@
 # settings_changed: Configuration updated
 download_pictures: Scarica le immagini sul tuo server
-carrot: Abilita la condivisione con Carrot
+carrot: Abilita la condivisione su Carrot
 diaspora_url: Diaspora URL, se il servizio è abilitato
 export_epub: Abilita esportazione ePub
 export_mobi: Abilita esportazione .mobi
@ -9,27 +8,22 @@ export_csv: Abilita esportazione CSV
 export_json: Abilita esportazione JSON
 export_txt: Abilita esportazione TXT
 export_xml: Abilita esportazione XML
-# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
+pocket_consumer_key: Consumer key per Pocket per importare i contenuti (https://getpocket.com/developer/docs/authentication)
-# import_with_redis: Enable Redis to import data asynchronously
+shaarli_url: Shaarli URL, if the service is enabled
-shaarli_url: Shaarli URL, se il servizio è abilitato
+share_diaspora: Abilita la condivisione su Diaspora
 share_diaspora: Abilita la condivisione con Diaspora
 share_mail: Abilita la condivisione per email
-share_shaarli: Abilita la condivisione con Shaarli
+share_shaarli: Abilita la condivisione su Shaarli
-share_twitter: Abilita la condivisione con Twitter
+share_twitter: Abilita la condivisione su Twitter
 share_unmark: Abilita la condivisione con Unmark.it
 show_printlink: Mostra un collegamento per stampare il contenuto
 wallabag_support_url: URL di supporto per wallabag
 wallabag_url: URL della *tua* installazione di wallabag
-entry: "contenuto"
+entry: "articolo"
 export: "esporta"
 import: "importa"
 misc: "misc"
 modify_settings: "applica"
-piwik_host: Host del tuo sito in Piwik (senza http:// o https://)
+piwik_host: Host del tuo sito in Piwik
 piwik_site_id: ID del tuo sito in Piwik
 piwik_enabled: Abilita Piwik
-demo_mode_enabled: "Abilita modalità demo ? (usato solo per la demo pubblica di wallabag)"
+demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
 demo_mode_username: "Utente Demo"
 # share_public: Allow public url for entries
 # download_images_enabled: Download images locally
 # restricted_access: Enable authentication for websites with paywall
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
@ -1,4 +1,3 @@
 # settings_changed: Configuration updated
 download_pictures: Telecargar los imatges sul servidor
 carrot: Activar lo partatge cap a Carrot
 diaspora_url: URL de Diaspora, se lo servici Diaspora es activat
@ -9,14 +8,12 @@ export_csv: Activar l'expòrt CSV
 export_json: Activar l'expòrt JSON
 export_txt: Activar l'expòrt TXT
 export_xml: Activar l'expòrt XML
-# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
+pocket_consumer_key: Clau d'autentificacion Pocket per importar las donadas (https://getpocket.com/developer/docs/authentication)
 # import_with_redis: Enable Redis to import data asynchronously
 shaarli_url: URL de Shaarli, se lo servici Shaarli es activat
 share_diaspora: Activar lo partatge cap a Diaspora
 share_mail: Activar lo partatge per corrièl
 share_shaarli: Activar lo partatge cap a Shaarli
 share_twitter: Activar lo partatge cap a Twitter
 share_unmark: Activar lo partatge cap a Unmark.it
 show_printlink: Afichar un ligam per imprimir
 wallabag_support_url: URL d'assisténcia de wallabag
 wallabag_url: URL de *vòstra* instància de wallabag
@ -25,11 +22,8 @@ export: "expòrt"
 import: "impòrt"
 misc: "divèrs"
 modify_settings: "aplicar"
-piwik_host: URL de vòstre site dins Piwik (sense http:// o https://)
+piwik_host: URL de vòstre site dins Piwik
 piwik_site_id: ID de vòstre site dins Piwik
 piwik_enabled: Activar Piwik
 demo_mode_enabled: "Activar lo mode demostracion ? (utilizar solament per la demostracion publica de wallabag)"
 demo_mode_username: "Utilizaire de la demostracion"
 # share_public: Allow public url for entries
 # download_images_enabled: Download images locally
 # restricted_access: Enable authentication for websites with paywall
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
@ -1,4 +1,3 @@
 # settings_changed: Configuration updated
 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
@ -9,14 +8,12 @@ export_csv: Włącz eksport do CSV
 export_json: Włącz eksport do JSON
 export_txt: Włącz eksport do TXT
 export_xml: Włącz eksport do XML
-import_with_rabbitmq: Włącz RabbitMQ dla asynchronicznego importu danych
+pocket_consumer_key: Klucz klienta Pocket do importu zawartości (https://getpocket.com/developer/docs/authentication)
 import_with_redis: Włącz Redis dla asynchronicznego importu danych
 shaarli_url: Adress URL Shaarli, jeżeli usługa jest włączona
 share_diaspora: Włącz udostępnianie dla Diaspora
 share_mail: Włącz udostępnianie przez email
 share_shaarli: Włącz udostępnianie dla Shaarli
 share_twitter: Włącz udostępnianie dla Twitter
 share_unmark: Włącz udostępnianie dla Unmark.it
 show_printlink: Pokaż link do wydrukowania zawartości
 wallabag_support_url: Adres URL wsparcia dla wallabag
 wallabag_url: Adres *twojej* instacji wallabag
@ -25,11 +22,3 @@ export: "eksport"
 import: "import"
 misc: "różne"
 modify_settings: "zatwierdz"
 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
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml
@ -1,35 +0,0 @@
 # settings_changed: Configuration updated
 download_pictures: Download imagens no seu servidor
 carrot: Habilitar compartilhamento para o Carrot
 diaspora_url: URL Diaspora, se o serviço está habilitado
 export_epub: Habilita exportação para ePub
 export_mobi: Habilita exportação para .mobi
 export_pdf: Habilita exportação para PDF
 export_csv: Habilita exportação para CSV
 export_json: Habilita exportação para JSON
 export_txt: Habilita exportação para TXT
 export_xml: Habilita exportação para XML
 # import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
 # import_with_redis: Enable Redis to import data asynchronously
 shaarli_url: URL Shaarli, se o serviço está habilitado
 share_diaspora: Habilitar compartilhamento para o Diaspora
 share_mail: Habilitar compartilhamento por e-mail
 share_shaarli: Habilitar compartilhamento para o Shaarli
 share_twitter: Habilitar compartilhamento para o Twitter
 share_unmark: Habilitar compartilhamento para o Unmark.it
 show_printlink: Mostrar um link para imprimir o conteúdo
 wallabag_support_url: URL de Suporte do wallabag
 wallabag_url: URL de *sua* instância do wallabag
 entry: "artigo"
 export: "exportar"
 import: "importar"
 misc: "misc"
 modify_settings: "aplicar"
 piwik_host: Host de seu website Piwik
 piwik_site_id: ID de seu website Piwik
 piwik_enabled: Habilitar Piwik
 demo_mode_enabled: "Habilitar modo demo? (somente usado para o demo público do wallabag)"
 demo_mode_username: "Usuário demo"
 # share_public: Allow public url for entries
 # download_images_enabled: Download images locally
 # restricted_access: Enable authentication for websites with paywall
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
@ -1,4 +1,3 @@
 # settings_changed: Configuration updated
 download_pictures: Descarcă poze pe server
 carrot: Permite share către Carrot
 diaspora_url: Diaspora URL, dacă serviciul este permis
@ -9,14 +8,12 @@ export_csv: Permite exportare CSV
 export_json: Permite exportare JSON
 export_txt: Permite exportare TXT
 export_xml: Permite exportare XML
-# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
+pocket_consumer_key: Cheie consumator pentru importarea contentului din Pocket (https://getpocket.com/developer/docs/authentication)
 # import_with_redis: Enable Redis to import data asynchronously
 shaarli_url: Shaarli URL, dacă serviciul este permis
 share_diaspora: Permite share către Diaspora
 share_mail: Permite share prin email
 share_shaarli: Permite share către Shaarli
 share_twitter: Permite share către Twitter
 share_unmark: Permite share către Unmark.it
 show_printlink: Afișează un link pentru a printa content-ul
 wallabag_support_url: URL-ul de suport pentru wallabag
 wallabag_url: URL-ul instanței tale wallabag
@ -25,11 +22,3 @@ export: "exportă"
 import: "importă"
 misc: "diverse"
 modify_settings: "aplică"
 # piwik_host: Host of your website in Piwik (without http:// or https://)
 # piwik_site_id: ID of your website in Piwik
 # piwik_enabled: Enable Piwik
 # demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
 # demo_mode_username: "Demo user"
 # share_public: Allow public url for entries
 # download_images_enabled: Download images locally
 # restricted_access: Enable authentication for websites with paywall
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
@ -1,35 +0,0 @@
 # settings_changed: Configuration updated
 # download_pictures: Download pictures on your server
 # carrot: Enable share to Carrot
 # diaspora_url: Diaspora URL, if the service is enabled
 # export_epub: Enable ePub export
 # export_mobi: Enable .mobi export
 # export_pdf: Enable PDF export
 # export_csv: Enable CSV export
 # export_json: Enable JSON export
 # export_txt: Enable TXT export
 # export_xml: Enable XML export
 # import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
 # import_with_redis: Enable Redis to import data asynchronously
 # shaarli_url: Shaarli URL, if the service is enabled
 # share_diaspora: Enable share to Diaspora
 # share_mail: Enable share by email
 # share_shaarli: Enable share to Shaarli
 # share_twitter: Enable share to Twitter
 # share_unmark: Enable share to Unmark.it
 # show_printlink: Display a link to print content
 # wallabag_support_url: Support URL for wallabag
 # wallabag_url: URL of *your* wallabag instance
 # entry: "article"
 # export: "export"
 # import: "import"
 # misc: "misc"
 # modify_settings: "apply"
 # piwik_host: Host of your website in Piwik (without http:// or https://)
 # piwik_site_id: ID of your website in Piwik
 # piwik_enabled: Enable Piwik
 # demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)"
 # demo_mode_username: "Demo user"
 # share_public: Allow public url for entries
 # download_images_enabled: Download images locally
 # restricted_access: Enable authentication for websites with paywall
--- a/app/Resources/CraueConfigBundle/views/Settings/modify.html.twig
+++ b/app/Resources/CraueConfigBundle/views/Settings/modify.html.twig
@ -1,6 +1,6 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
-{% block title %}{{ 'menu.left.internal_settings'|trans }}{% endblock %}
+{% block title %}{% trans %}internal settings{% endtrans %}{% endblock %}
 {% block content %}
    <div class="row">
@ -13,7 +13,7 @@
                        <div class="div_tabs col s12">
                            <ul class="tabs">
                                {% for section in sections | craue_sortSections %}
-                                    <li class="tab col s12 m6 l3"><a href="#set-{{ section }}">{{ section | trans({}, 'CraueConfigBundle') }}</a></li>
+                                    <li class="tab col s3"><a href="#set-{{ section }}">{{ section | trans({}, 'CraueConfigBundle') }}</a></li>
                                {% endfor %}
                            </ul>
                        </div>
--- a/app/Resources/FOSUserBundle/translations/FOSUserBundle.da.yml
+++ b/app/Resources/FOSUserBundle/translations/FOSUserBundle.da.yml
@ -0,0 +1,2 @@
 Login: "Log ind"
 Enter your email address below and we'll send you password reset instructions.: "Indtast din emailadresse nedenfor, så sender vi dig instrukser til at nulstille din adgangskode."
--- a/app/Resources/FOSUserBundle/translations/FOSUserBundle.de.yml
+++ b/app/Resources/FOSUserBundle/translations/FOSUserBundle.de.yml
@ -0,0 +1,2 @@
 Login: "Anmelden"
 Enter your email address below and we'll send you password reset instructions.: "Tippe deine E-Mail-Adresse unten ein und wir senden dir die Anweisungen, wie du dein Kennwort zurücksetzen kannst."
--- a/app/Resources/FOSUserBundle/translations/FOSUserBundle.es.yml
+++ b/app/Resources/FOSUserBundle/translations/FOSUserBundle.es.yml
@ -0,0 +1,2 @@
 Login: "Logearse"
 Enter your email address below and we'll send you password reset instructions.: "Introduzca su dirección de email y le enviaremos las instrucciones para resetear su contraseña."
--- a/app/Resources/FOSUserBundle/translations/FOSUserBundle.fr.yml
+++ b/app/Resources/FOSUserBundle/translations/FOSUserBundle.fr.yml
@ -0,0 +1,2 @@
 Login: "Se connecter"
 Enter your email address below and we'll send you password reset instructions.: "Renseignez votre adresse email, nous vous enverrons les instructions pour réinitialiser votre mot de passe."
--- a/app/Resources/FOSUserBundle/translations/FOSUserBundle.oc.yml
+++ b/app/Resources/FOSUserBundle/translations/FOSUserBundle.oc.yml
@ -0,0 +1,2 @@
 Login: "Se connectar"
 Enter your email address below and we'll send you password reset instructions.: "Picatz vòstra adreça de corrièl çai-jos, vos mandarem las instruccions per reïnicializar vòstre senhal."
--- a/app/Resources/FOSUserBundle/translations/FOSUserBundle.pl.yml
+++ b/app/Resources/FOSUserBundle/translations/FOSUserBundle.pl.yml
@ -0,0 +1,2 @@
 Login: "Logowanie"
 Enter your email address below and we'll send you password reset instructions.: "Wpisz poniżej swój adres email, abyśmy mogli wysłać ci instrukcję resetowania hasła."
--- a/app/Resources/static/themes/_global/img/icons/shaarli.png
+++ b/app/Resources/static/themes/_global/img/icons/shaarli.png
--- a/app/Resources/static/themes/_global/img/icons/unmark-icon--black.png
+++ b/app/Resources/static/themes/_global/img/icons/unmark-icon--black.png
--- a/app/Resources/static/themes/_global/js/bookmarklet.js
+++ b/app/Resources/static/themes/_global/js/bookmarklet.js
@ -1,5 +0,0 @@
 top['bookmarklet-url@wallabag.org'] =
    '<!DOCTYPE html><html><head><title>bag it!</title>' +
    '<link rel="icon" href="tpl/img/favicon.ico" />' +
    '</head><body><script>window.onload=function(){window.setTimeout' +
    '(function(){history.back();},250);};</script></body></html>';
--- a/app/Resources/static/themes/_global/js/shortcuts/main.js
+++ b/app/Resources/static/themes/_global/js/shortcuts/main.js
@ -1,15 +0,0 @@
 import Mousetrap from 'mousetrap';
 /** Shortcuts **/
 /* Go to */
 Mousetrap.bind('g u', () => { window.location.href = Routing.generate('homepage'); });
 Mousetrap.bind('g s', () => { window.location.href = Routing.generate('starred'); });
 Mousetrap.bind('g r', () => { window.location.href = Routing.generate('archive'); });
 Mousetrap.bind('g a', () => { window.location.href = Routing.generate('all'); });
 Mousetrap.bind('g t', () => { window.location.href = Routing.generate('tag'); });
 Mousetrap.bind('g c', () => { window.location.href = Routing.generate('config'); });
 Mousetrap.bind('g i', () => { window.location.href = Routing.generate('import'); });
 Mousetrap.bind('g d', () => { window.location.href = Routing.generate('developer'); });
 Mousetrap.bind('?', () => { window.location.href = Routing.generate('howto'); });
 Mousetrap.bind('g l', () => { window.location.href = Routing.generate('fos_user_security_logout'); });
--- a/app/Resources/static/themes/_global/js/tools.js
+++ b/app/Resources/static/themes/_global/js/tools.js
@ -1,55 +0,0 @@
 import $ from 'jquery';
 import './shortcuts/main';
 import './shortcuts/entry';
 /* Allows inline call qr-code call */
 import jrQrcode from 'jr-qrcode'; // eslint-disable-line
 function supportsLocalStorage() {
  try {
    return 'localStorage' in window && window.localStorage !== null;
  } catch (e) {
    return false;
  }
 }
 function savePercent(id, percent) {
  if (!supportsLocalStorage()) { return false; }
  localStorage[`wallabag.article.${id}.percent`] = percent;
  return true;
 }
 function retrievePercent(id) {
  if (!supportsLocalStorage()) { return false; }
  const bheight = $(document).height();
  const percent = localStorage[`wallabag.article.${id}.percent`];
  const scroll = bheight * percent;
  $('html,body').animate({ scrollTop: scroll }, 'fast');
  return true;
 }
 function initFilters() {
  // no display if filters not available
  if ($('div').is('#filters')) {
    $('#button_filters').show();
    $('.js-filters-action').sideNav({ edge: 'right' });
    $('#clear_form_filters').on('click', () => {
      $('#filters input').val('');
      $('#filters :checked').removeAttr('checked');
      return false;
    });
  }
 }
 function initExport() {
  // no display if export not available
  if ($('div').is('#export')) {
    $('#button_export').show();
    $('.js-export-action').sideNav({ edge: 'right' });
  }
 }
 export { savePercent, retrievePercent, initFilters, initExport };
--- a/app/Resources/static/themes/baggy/css/font.css
+++ b/app/Resources/static/themes/baggy/css/font.css
@ -1,6 +0,0 @@
@font-face {
  font-family: "PT Sans";
  font-style: normal;
  font-weight: 700;
  src: local("PT Sans Bold"), local("PTSans-Bold"), url("../fonts/ptsansbold.woff") format("woff");
 }
--- a/app/Resources/static/themes/baggy/css/messages.css
+++ b/app/Resources/static/themes/baggy/css/messages.css
@ -1,19 +0,0 @@
 .messages.error.install {
  border: 1px solid #c42608;
  color: #c00 !important;
  background: #fff0ef;
  text-align: left;
 }
 .messages.notice.install {
  border: 1px solid #ebcd41;
  color: #000;
  background: #fffcd3;
  text-align: left;
 }
 .messages.success.install {
  border: 1px solid #6dc70c;
  background: #e0fbcc !important;
  text-align: left;
 }
--- a/app/Resources/static/themes/baggy/css/print.css
+++ b/app/Resources/static/themes/baggy/css/print.css
@ -1,66 +0,0 @@
@media print {
  /* ### Layout ### */
  body {
    font-family: Serif;
    background-color: #fff;
  }
  @page {
    margin: 1cm;
  }
  img {
    max-width: 100% !important;
  }
  /* ### Content ### */
  /* Hide useless blocks */
  body > header,
  #article_toolbar,
  #links,
  #sort,
  body > footer,
  .top_link,
  div.tools,
  header div,
  .messages,
  .entrie + .results,
  #article .mbm a,
  #article-informations {
    display: none !important;
  }
  article {
    border: none !important;
  }
  /* Add URL after links */
  .vieworiginal a::after {
    content: " (" attr(href) ")";
  }
  /* Add explanation after abbr */
  abbr[title]::after {
    content: " (" attr(title) ")";
  }
  /* Change border on current pager item */
  .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%;
  }
 }
--- a/app/Resources/static/themes/baggy/font/icomoon.eot
+++ b/app/Resources/static/themes/baggy/font/icomoon.eot
--- a/app/Resources/static/themes/baggy/font/icomoon.svg
+++ b/app/Resources/static/themes/baggy/font/icomoon.svg
--- a/app/Resources/static/themes/baggy/font/icomoon.ttf
+++ b/app/Resources/static/themes/baggy/font/icomoon.ttf
--- a/app/Resources/static/themes/baggy/font/icomoon.woff
+++ b/app/Resources/static/themes/baggy/font/icomoon.woff
--- a/app/Resources/static/themes/baggy/img/list.png
+++ b/app/Resources/static/themes/baggy/img/list.png
--- a/app/Resources/static/themes/baggy/img/table.png
+++ b/app/Resources/static/themes/baggy/img/table.png
--- a/app/Resources/static/themes/baggy/js/autoCompleteTags.js
+++ b/app/Resources/static/themes/baggy/js/autoCompleteTags.js
@ -1,8 +0,0 @@
 function split(val) {
  return val.split(/,\s*/);
 }
 function extractLast(term) {
  return split(term).pop();
 }
 export default { split, extractLast };
--- a/app/Resources/static/themes/baggy/js/init.js
+++ b/app/Resources/static/themes/baggy/js/init.js
@ -1,329 +0,0 @@
 /* jQuery */
 import $ from 'jquery';
 /* eslint-disable no-unused-vars */
 /* jquery has default scope */
 import cookie from 'jquery.cookie';
 import ui from 'jquery-ui-browserify';
 /* eslint-enable no-unused-vars */
 /* Annotations */
 import annotator from 'annotator';
 /* Shortcuts */
 import './shortcuts/main';
 import './shortcuts/entry';
 import '../../_global/js/shortcuts/main';
 import '../../_global/js/shortcuts/entry';
 /* Tools */
 import { savePercent, retrievePercent } from '../../_global/js/tools';
 import toggleSaveLinkForm from './uiTools';
 global.jquery = $;
 $.fn.ready(() => {
  const $listmode = $('#listmode');
  const $listentries = $('#list-entries');
  /* ==========================================================================
     Menu
     ========================================================================== */
  $('#menu').click(() => {
    $('#links').toggleClass('menu--open');
    const content = $('#content');
    if (content.hasClass('opacity03')) {
      content.removeClass('opacity03');
    }
  });
  /* ==========================================================================
     List mode or Table Mode
     ========================================================================== */
  $listmode.click(() => {
    if ($.cookie('listmode') === 1) {
      // Cookie
      $.removeCookie('listmode');
      $listentries.removeClass('listmode');
      $listmode.removeClass('tablemode');
      $listmode.addClass('listmode');
    } else {
      // Cookie
      $.cookie('listmode', 1, { expires: 365 });
      $listentries.addClass('listmode');
      $listmode.removeClass('listmode');
      $listmode.addClass('tablemode');
    }
  });
  /* ==========================================================================
     Cookie listmode
     ========================================================================== */
  if ($.cookie('listmode') === 1) {
    $listentries.addClass('listmode');
    $listmode.removeClass('listmode');
    $listmode.addClass('tablemode');
  }
  /* ==========================================================================
     Add tag panel
     ========================================================================== */
  $('#nav-btn-add-tag').on('click', () => {
    $('.nav-panel-add-tag').toggle(100);
    $('.nav-panel-menu').addClass('hidden');
    $('#tag_label').focus();
    return false;
  });
  /**
   * Filters & Export
   */
  // no display if filters not available
  if ($('div').is('#filters')) {
    $('#button_filters').show();
    $('#clear_form_filters').on('click', () => {
      $('#filters input').val('');
      $('#filters :checked').removeAttr('checked');
      return false;
    });
  }
  /* ==========================================================================
     Annotations & Remember position
     ========================================================================== */
  if ($('article').length) {
    const app = new annotator.App();
    app.include(annotator.ui.main, {
      element: document.querySelector('article'),
    });
    const x = JSON.parse($('#annotationroutes').html());
    app.include(annotator.storage.http, x);
    app.start().then(() => {
      app.annotations.load({ entry: x.entryId });
    });
    $(window).scroll(() => {
      const scrollTop = $(window).scrollTop();
      const docHeight = $(document).height();
      const scrollPercent = (scrollTop) / (docHeight);
      const scrollPercentRounded = Math.round(scrollPercent * 100) / 100;
      savePercent(x.entryId, scrollPercentRounded);
    });
    retrievePercent(x.entryId);
    $(window).resize(() => {
      retrievePercent(x.entryId);
    });
  }
  /**
   * Close window after adding entry if popup
   */
  const currentUrl = window.location.href;
  if (currentUrl.match('&closewin=true')) {
    window.close();
  }
  /**
   * Tags autocomplete
   */
  /**
   * Not working on v2
   *
  $('#value').bind('keydown', (event) => {
    if (event.keyCode === $.ui.keyCode.TAB && $(this).data('ui-autocomplete').menu.active) {
      event.preventDefault();
    }
  }).autocomplete({
    source: function source(request, response) {
      $.getJSON('./?view=tags', {
        term: extractLast(request.term),
        //id: $(':hidden#entry_id').val()
      }, response);
    },
    search: function search() {
      // custom minLength
      const term = extractLast(this.value);
      return term.length >= 1;
    },
    focus: function focus() {
      // prevent value inserted on focus
      return false;
    },
    select: function select(event, ui) {
      const terms = split(this.value);
      // remove the current input
      terms.pop();
      // add the selected item
      terms.push(ui.item.value);
      // add placeholder to get the comma-and-space at the end
      terms.push('');
      this.value = terms.join(', ');
      return false;
    },
  });
  */
  //---------------------------------------------------------------------------
  // Close the message box when the user clicks the close icon
  //---------------------------------------------------------------------------
  $('a.closeMessage').on('click', () => {
    $(this).parents('div.messages').slideUp(300, () => { $(this).remove(); });
    return false;
  });
  $('#search-form').hide();
  $('#bagit-form').hide();
  $('#filters').hide();
  $('#download-form').hide();
  //---------------------------------------------------------------------------
  // Toggle the 'Search' popup in the sidebar
  //---------------------------------------------------------------------------
  function toggleSearch() {
    $('#search-form').toggle();
    $('#search').toggleClass('current');
    $('#search').toggleClass('active-current');
    $('#search-arrow').toggleClass('arrow-down');
    if ($('#search').hasClass('current')) {
      $('#content').addClass('opacity03');
    } else {
      $('#content').removeClass('opacity03');
    }
  }
  //---------------------------------------------------------------------------
  // Toggle the 'Filter' popup on entries list
  //---------------------------------------------------------------------------
  function toggleFilter() {
    $('#filters').toggle();
  }
  //---------------------------------------------------------------------------
  // Toggle the 'Download' popup on entries list
  //---------------------------------------------------------------------------
  function toggleDownload() {
    $('#download-form').toggle();
  }
  //---------------------------------------------------------------------------
  // Toggle the 'Save a Link' popup in the sidebar
  //---------------------------------------------------------------------------
  function toggleBagit() {
    $('#bagit-form').toggle();
    $('#bagit').toggleClass('current');
    $('#bagit').toggleClass('active-current');
    $('#bagit-arrow').toggleClass('arrow-down');
    if ($('#bagit').hasClass('current')) {
      $('#content').addClass('opacity03');
    } else {
      $('#content').removeClass('opacity03');
    }
  }
  //---------------------------------------------------------------------------
  // Close all #links popups in the sidebar
  //---------------------------------------------------------------------------
  function closePopups() {
    $('#links .messages').hide();
    $('#links > li > a').removeClass('active-current');
    $('#links > li > a').removeClass('current');
    $('[id$=-arrow]').removeClass('arrow-down');
    $('#content').removeClass('opacity03');
  }
  $('#search').click(() => {
    closePopups();
    toggleSearch();
    $('#searchfield').focus();
  });
  $('.filter-btn').click(() => {
    closePopups();
    toggleFilter();
  });
  $('.download-btn').click(() => {
    closePopups();
    toggleDownload();
  });
  $('#bagit').click(() => {
    closePopups();
    toggleBagit();
    $('#plainurl').focus();
  });
  $('#search-form-close').click(() => {
    toggleSearch();
  });
  $('#filter-form-close').click(() => {
    toggleFilter();
  });
  $('#download-form-close').click(() => {
    toggleDownload();
  });
  $('#bagit-form-close').click(() => {
    toggleBagit();
  });
  const $bagitFormForm = $('#bagit-form-form');
  /* ==========================================================================
   bag it link and close button
   ========================================================================== */
  // send 'bag it link' form request via ajax
  $bagitFormForm.submit((event) => {
    $('body').css('cursor', 'wait');
    $('#add-link-result').empty();
    $.ajax({
      type: $bagitFormForm.attr('method'),
      url: $bagitFormForm.attr('action'),
      data: $bagitFormForm.serialize(),
      success: function success() {
        $('#add-link-result').html('Done!');
        $('#plainurl').val('');
        $('#plainurl').blur('');
        $('body').css('cursor', 'auto');
      },
      error: function error() {
        $('#add-link-result').html('Failed!');
        $('body').css('cursor', 'auto');
      },
    });
    event.preventDefault();
  });
  /* ==========================================================================
   Process all links inside an article
   ========================================================================== */
  $('article a[href^="http"]').after(
      () => `<a href="${$(this).attr('href')}" class="add-to-wallabag-link-after" ` +
      'alt="add to wallabag" title="add to wallabag"></a>'
  );
  $('.add-to-wallabag-link-after').click((event) => {
    toggleSaveLinkForm($(this).attr('href'), event);
    event.preventDefault();
  });
 });
--- a/app/Resources/static/themes/baggy/js/shortcuts/entry.js
+++ b/app/Resources/static/themes/baggy/js/shortcuts/entry.js
@ -1,26 +0,0 @@
 import Mousetrap from 'mousetrap';
 import $ from 'jquery';
 $(document).ready(() => {
  if ($('#article').length > 0) {
    /* Article view */
    Mousetrap.bind('o', () => {
      $('div#article_toolbar ul.links a.original')[0].click();
    });
    /* mark as favorite */
    Mousetrap.bind('f', () => {
      $('div#article_toolbar ul.links a.favorite')[0].click();
    });
    /* mark as read */
    Mousetrap.bind('a', () => {
      $('div#article_toolbar ul.links a.markasread')[0].click();
    });
    /* delete */
    Mousetrap.bind('del', () => {
      $('div#article_toolbar ul.links a.delete')[0].click();
    });
  }
 });
--- a/app/Resources/static/themes/baggy/js/shortcuts/main.js
+++ b/app/Resources/static/themes/baggy/js/shortcuts/main.js
@ -1,7 +0,0 @@
 $(document).ready(() => {
  Mousetrap.bind('s', () => {
    $('#search').trigger('click');
    $('#search_entry_term').focus();
    return false;
  });
 });
--- a/app/Resources/static/themes/baggy/js/uiTools.js
+++ b/app/Resources/static/themes/baggy/js/uiTools.js
@ -1,35 +0,0 @@
 import $ from 'jquery';
 function toggleSaveLinkForm(url, event) {
  $('#add-link-result').empty();
  const $bagit = $('#bagit');
  const $bagitForm = $('#bagit-form');
  $bagit.toggleClass('active-current');
  // only if bag-it link is not presented on page
  if ($bagit.length === 0) {
    if (event !== 'undefined' && event) {
      $bagitForm.css({ position: 'absolute', top: event.pageY, left: event.pageX - 200 });
    } else {
      $bagitForm.css({ position: 'relative', top: 'auto', left: 'auto' });
    }
  }
  const searchForm = $('#search-form');
  const plainUrl = $('#plainurl');
  if (searchForm.length !== 0) {
    $('#search').removeClass('current');
    $('#search-arrow').removeClass('arrow-down');
    searchForm.hide();
  }
  $bagitForm.toggle();
  $('#content').toggleClass('opacity03');
  if (url !== 'undefined' && url) {
    plainUrl.val(url);
  }
  plainUrl.focus();
 }
 export default toggleSaveLinkForm;
--- a/app/Resources/static/themes/material/css/main.css
+++ b/app/Resources/static/themes/material/css/main.css
--- a/app/Resources/static/themes/material/css/print.css
+++ b/app/Resources/static/themes/material/css/print.css
@ -1,77 +0,0 @@
@media print {
  /* ### Layout ### */
  body {
    font-family: Serif;
    background-color: #fff;
  }
  @page {
    margin: 1cm;
  }
  img {
    max-width: 100% !important;
  }
  /* ### Content ### */
  /* Hide useless blocks */
  body > header,
  #article_toolbar,
  #links,
  #sort,
  body > footer,
  .top_link,
  div.tools,
  header div,
  .messages,
  .entry + .results,
  #slide-out,
  .progress,
  .hide-on-large-only,
  #article > aside,
  #article .mbm a {
    display: none !important;
  }
  main {
    padding-left: 0 !important;
  }
  #article {
    margin: inherit !important;
  }
  article {
    border: none !important;
  }
  /* Add URL after links */
  .vieworiginal a::after {
    content: " (" attr(href) ")";
  }
  /* Add explanation after abbr */
  abbr[title]::after {
    content: " (" attr(title) ")";
  }
  /* Change border on current pager item */
  .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%;
  }
 }
--- a/app/Resources/static/themes/material/js/init.js
+++ b/app/Resources/static/themes/material/js/init.js
@ -1,110 +0,0 @@
 /* jQuery */
 import $ from 'jquery';
 /* Annotations */
 import annotator from 'annotator';
 /* Tools */
 import { savePercent, retrievePercent, initFilters, initExport } from '../../_global/js/tools';
 /* Import shortcuts */
 import './shortcuts/main';
 import './shortcuts/entry';
 import '../../_global/js/shortcuts/main';
 import '../../_global/js/shortcuts/entry';
 require('materialize'); // eslint-disable-line
 global.jQuery = $;
 $(document).ready(() => {
  // sideNav
  $('.button-collapse').sideNav();
  $('select').material_select();
  $('.collapsible').collapsible({
    accordion: false,
  });
  $('.datepicker').pickadate({
    selectMonths: true,
    selectYears: 15,
    formatSubmit: 'dd/mm/yyyy',
    hiddenName: true,
    format: 'dd/mm/yyyy',
  });
  initFilters();
  initExport();
  $('#nav-btn-add-tag').on('click', () => {
    $('.nav-panel-add-tag').toggle(100);
    $('.nav-panel-menu').addClass('hidden');
    $('#tag_label').focus();
    return false;
  });
  $('#nav-btn-add').on('click', () => {
    $('.nav-panel-buttom').hide(100);
    $('.nav-panel-add').show(100);
    $('.nav-panels .action').hide(100);
    $('.nav-panel-menu').addClass('hidden');
    $('.nav-panels').css('background', 'white');
    $('#entry_url').focus();
    return false;
  });
  $('#nav-btn-search').on('click', () => {
    $('.nav-panel-buttom').hide(100);
    $('.nav-panel-search').show(100);
    $('.nav-panels .action').hide(100);
    $('.nav-panel-menu').addClass('hidden');
    $('.nav-panels').css('background', 'white');
    $('#search_entry_term').focus();
    return false;
  });
  $('.close').on('click', () => {
    $('.nav-panel-add').hide(100);
    $('.nav-panel-search').hide(100);
    $('.nav-panel-buttom').show(100);
    $('.nav-panels .action').show(100);
    $('.nav-panel-menu').removeClass('hidden');
    $('.nav-panels').css('background', 'transparent');
    return false;
  });
  $(window).scroll(() => {
    const s = $(window).scrollTop();
    const d = $(document).height();
    const c = $(window).height();
    const scrollPercent = (s / (d - c)) * 100;
    $('.progress .determinate').css('width', `${scrollPercent}%`);
  });
 /* ==========================================================================
   Annotations & Remember position
   ========================================================================== */
  if ($('article').length) {
    const app = new annotator.App();
    const x = JSON.parse($('#annotationroutes').html());
    app.include(annotator.ui.main, {
      element: document.querySelector('article'),
    });
    app.include(annotator.storage.http, x);
    app.start().then(() => {
      app.annotations.load({ entry: x.entryId });
    });
    $(window).scroll(() => {
      const scrollTop = $(window).scrollTop();
      const docHeight = $(document).height();
      const scrollPercent = (scrollTop) / (docHeight);
      const scrollPercentRounded = Math.round(scrollPercent * 100) / 100;
      savePercent(x.entryId, scrollPercentRounded);
    });
    retrievePercent(x.entryId);
    $(window).resize(() => {
      retrievePercent(x.entryId);
    });
  }
 });
--- a/app/Resources/static/themes/material/js/shortcuts/entry.js
+++ b/app/Resources/static/themes/material/js/shortcuts/entry.js
@ -1,26 +0,0 @@
 import Mousetrap from 'mousetrap';
 import $ from 'jquery';
 $(document).ready(() => {
  if ($('#article').length > 0) {
    /* open original article */
    Mousetrap.bind('o', () => {
      $('ul.side-nav a.original i')[0].click();
    });
    /* mark as favorite */
    Mousetrap.bind('f', () => {
      $('ul.side-nav a.favorite i')[0].click();
    });
    /* mark as read */
    Mousetrap.bind('a', () => {
      $('ul.side-nav a.markasread i')[0].click();
    });
    /* delete */
    Mousetrap.bind('del', () => {
      $('ul.side-nav a.delete i')[0].click();
    });
  }
 });
--- a/app/Resources/static/themes/material/js/shortcuts/main.js
+++ b/app/Resources/static/themes/material/js/shortcuts/main.js
@ -1,75 +0,0 @@
 import Mousetrap from 'mousetrap';
 import $ from 'jquery';
 function toggleFocus(cardToToogleFocus) {
  if (cardToToogleFocus) {
    $(cardToToogleFocus).toggleClass('z-depth-4');
  }
 }
 $(document).ready(() => {
  const cards = $('#content').find('.card');
  const cardNumber = cards.length;
  let cardIndex = 0;
  /* If we come from next page */
  if (window.location.hash === '#prev') {
    cardIndex = cardNumber - 1;
  }
  let card = cards[cardIndex];
  const pagination = $('.pagination');
  /* Show nothing on quickstart */
  if ($('#content > div.quickstart').length > 0) {
    return;
  }
  /* Focus current card */
  toggleFocus(card);
  /* Actions */
  Mousetrap.bind('g n', () => {
    $('#nav-btn-add').trigger('click');
    return false;
  });
  Mousetrap.bind('s', () => {
    $('#nav-btn-search').trigger('click');
    return false;
  });
  Mousetrap.bind('esc', () => {
    $('.close').trigger('click');
  });
  /* Select right card. If there's a next page, go to next page */
  Mousetrap.bind('right', () => {
    if (cardIndex >= 0 && cardIndex < cardNumber - 1) {
      toggleFocus(card);
      cardIndex += 1;
      card = cards[cardIndex];
      toggleFocus(card);
      return;
    }
    if (pagination.length > 0 && pagination.find('li.next:not(.disabled)').length > 0 && cardIndex === cardNumber - 1) {
      window.location.href = window.location.origin + $(pagination).find('li.next a').attr('href');
    }
  });
  /* Select previous card. If there's a previous page, go to next page */
  Mousetrap.bind('left', () => {
    if (cardIndex > 0 && cardIndex < cardNumber) {
      toggleFocus(card);
      cardIndex -= 1;
      card = cards[cardIndex];
      toggleFocus(card);
      return;
    }
    if (pagination.length > 0 && $(pagination).find('li.prev:not(.disabled)').length > 0 && cardIndex === 0) {
      window.location.href = `${window.location.origin + $(pagination).find('li.prev a').attr('href')}#prev`;
    }
  });
  Mousetrap.bind('enter', () => {
    window.location.href = window.location.origin + $(card).find('span.card-title a').attr('href');
  });
 });
--- a/app/Resources/views/.gitkeep
+++ b/app/Resources/views/.gitkeep
--- a/app/config/capistrano/deploy.rb
+++ b/app/config/capistrano/deploy.rb
@ -1,4 +1,9 @@
 # config valid only for current version of Capistrano
 lock '3.4.0'
 set :log_path, "var/logs"
 set :cache_path, "var/cache"
 set :symfony_console_path, 'bin/console'
 set :application, 'wallabag'
 set :repo_url, 'git@github.com:wallabag/wallabag.git'
@ -6,6 +11,8 @@ set :repo_url, 'git@github.com:wallabag/wallabag.git'
 set :ssh_user, 'framasoft_bag'
 server '78.46.248.87', user: fetch(:ssh_user), roles: %w{web app db}
 set :scm, :git
 set :format, :pretty
 set :log_level, :info
 # set :log_level, :debug
@ -16,4 +23,4 @@ set :linked_files, %w{app/config/parameters.yml}
 set :linked_dirs, [fetch(:log_path), "var/sessions", "web/uploads", "data"]
 set :keep_releases, 3
-after 'deploy:updated', 'symfony:cache:clear'
+after 'deploy:finishing', 'deploy:cleanup'
--- a/app/config/config.yml
+++ b/app/config/config.yml
@ -5,19 +5,17 @@ imports:
 framework:
    #esi:             ~
-    translator:
+    translator:      { fallback: "%locale%" }
        enabled: true
        fallback: "%locale%"
    secret:          "%secret%"
    router:
        resource: "%kernel.root_dir%/config/routing.yml"
        strict_requirements: ~
    form:            ~
    csrf_protection: ~
-    validation:
+    validation:      { enable_annotations: true }
        enable_annotations: true
    templating:
        engines: ['twig']
        #assets_version: SomeVersionScheme
    default_locale:  "%locale%"
    trusted_hosts:   ~
    trusted_proxies: ~
@ -30,7 +28,7 @@ framework:
    assets: ~
 wallabag_core:
-    version: 2.2.1
+    version: 2.0.4
    paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
    languages:
        en: 'English'
@ -44,23 +42,14 @@ wallabag_core:
        es: 'Español'
        oc: 'Occitan'
        it: 'Italiano'
        pt: 'Português'
    items_on_page: 12
    theme: material
-    language: '%locale%'
+    language: en
    rss_limit: 50
    reading_speed: 1
    cache_lifetime: 10
    action_mark_as_read: 1
    list_mode: 1
    fetching_error_message: |
        wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/master/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
 wallabag_user:
    registration_enabled: "%fosuser_registration%"
 wallabag_import:
-    allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv']
+    allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain']
    resource_dir: "%kernel.root_dir%/../web/uploads/import"
 # Twig Configuration
@ -69,7 +58,19 @@ twig:
    strict_variables: "%kernel.debug%"
    form_themes:
        - "LexikFormFilterBundle:Form:form_div_layout.html.twig"
-    exception_controller: wallabag_core.exception_controller:showAction
+
 # Assetic Configuration
 assetic:
    debug:          "%kernel.debug%"
    use_controller: false
    bundles:        [ ]
    #java: /usr/bin/java
    filters:
        cssrewrite: ~
        #closure:
        #    jar: "%kernel.root_dir%/Resources/java/compiler.jar"
        #yui_css:
        #    jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar"
 # Doctrine Configuration
 doctrine:
@ -80,9 +81,8 @@ doctrine:
        dbname: "%database_name%"
        user: "%database_user%"
        password: "%database_password%"
-        charset: "%database_charset%"
+        charset:  UTF8
        path:     "%database_path%"
        unix_socket: "%database_socket%"
        server_version: 5.6
    orm:
@ -111,32 +111,17 @@ swiftmailer:
    host:      "%mailer_host%"
    username:  "%mailer_user%"
    password:  "%mailer_password%"
-    spool:
+    spool:     { type: memory }
        type: memory
 fos_rest:
    param_fetcher_listener: true
    body_listener: true
    format_listener: true
    view:
        mime_types:
            csv:
                - 'text/csv'
                - 'text/plain'
            pdf:
                - 'application/pdf'
            epub:
                - 'application/epub+zip'
            mobi:
                - 'application/x-mobipocket-ebook'
        view_response_listener: 'force'
        formats:
            xml: true
-            json: true
+            json : true
            txt: true
            csv: true
            pdf: true
            epub: true
            mobi: true
        templating_formats:
            html: true
        force_redirects:
@ -145,21 +130,10 @@ fos_rest:
        default_engine: twig
    routing_loader:
        default_format: json
    format_listener:
        enabled: true
        rules:
            - { path: "^/api/entries/([0-9]+)/export.(.*)", priorities: ['epub', 'mobi', 'pdf', 'txt', 'csv'], fallback_format: json, prefer_extension: false }
            - { path: "^/api", priorities: ['json', 'xml'], fallback_format: json, prefer_extension: false }
            - { path: "^/annotations", priorities: ['json', 'xml'], fallback_format: json, prefer_extension: false }
            # for an unknown reason, EACH REQUEST goes to FOS\RestBundle\EventListener\FormatListener
            # so we need to add custom rule for custom api export but also for all other routes of the application...
            - { path: '^/', priorities: ['text/html', '*/*'], fallback_format: html, prefer_extension: false }
 nelmio_api_doc:
    sandbox:
        enabled: false
    cache:
        enabled: true
    name: wallabag API documentation
 nelmio_cors:
@ -174,11 +148,6 @@ nelmio_cors:
        #origin_regex: false
    paths:
        '^/api/':
            allow_origin: ['*']
            allow_headers: ['X-Custom-Auth']
            allow_methods: ['POST', 'PUT', 'PATCH','GET', 'DELETE']
            max_age: 3600
        '^/oauth/':
            allow_origin: ['*']
            allow_headers: ['X-Custom-Auth']
            allow_methods: ['POST', 'PUT', 'GET', 'DELETE']
@ -200,19 +169,18 @@ liip_theme:
    path_patterns:
        bundle_resource:
-            - "%%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%"
+            - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%
 fos_user:
    db_driver: orm
-    firewall_name: secured_area
+    firewall_name: main
    user_class: Wallabag\UserBundle\Entity\User
    registration:
        confirmation:
-            enabled: "%fosuser_confirmation%"
+            enabled: %fosuser_confirmation%
    from_email:
-        address:        "%from_email%"
+        address:        %from_email%
        sender_name:    wallabag
 fos_oauth_server:
    db_driver:           orm
    client_class:        Wallabag\ApiBundle\Entity\Client
@ -220,9 +188,7 @@ fos_oauth_server:
    refresh_token_class: Wallabag\ApiBundle\Entity\RefreshToken
    auth_code_class:     Wallabag\ApiBundle\Entity\AuthCode
    service:
-        user_provider: fos_user.user_provider.username_email
+        user_provider: fos_user.user_manager
        options:
            refresh_token_lifetime: 1209600
 scheb_two_factor:
    trusted_computer:
@ -231,8 +197,8 @@ scheb_two_factor:
        cookie_lifetime: 2592000
    email:
-        enabled: "%twofactor_auth%"
+        enabled: %twofactor_auth%
-        sender_email: "%twofactor_sender%"
+        sender_email: %twofactor_sender%
        digits: 6
        template: WallabagUserBundle:Authentication:form.html.twig
        mailer: wallabag_user.auth_code_mailer
@ -241,140 +207,12 @@ kphoen_rulerz:
    executors:
        doctrine: true
-old_sound_rabbit_mq:
+lexik_maintenance:
-    connections:
+    authorized:
-        default:
+        ips: ['127.0.0.1']
-            host:     "%rabbitmq_host%"
+    driver:
-            port:     "%rabbitmq_port%"
+        ttl: 3600
-            user:     "%rabbitmq_user%"
+        class: 'Lexik\Bundle\MaintenanceBundle\Drivers\DatabaseDriver'
-            password: "%rabbitmq_password%"
+    response:
-            vhost:    /
+        code: 503
-            lazy:     true
+        status: "wallabag Service Temporarily Unavailable"
    producers:
        import_pocket:
            connection: default
            exchange_options:
                name: 'wallabag.import.pocket'
                type: topic
        import_readability:
            connection: default
            exchange_options:
                name: 'wallabag.import.readability'
                type: topic
        import_pinboard:
            connection: default
            exchange_options:
                name: 'wallabag.import.pinboard'
                type: topic
        import_instapaper:
            connection: default
            exchange_options:
                name: 'wallabag.import.instapaper'
                type: topic
        import_wallabag_v1:
            connection: default
            exchange_options:
                name: 'wallabag.import.wallabag_v1'
                type: topic
        import_wallabag_v2:
            connection: default
            exchange_options:
                name: 'wallabag.import.wallabag_v2'
                type: topic
        import_firefox:
            connection: default
            exchange_options:
                name: 'wallabag.import.firefox'
                type: topic
        import_chrome:
            connection: default
            exchange_options:
                name: 'wallabag.import.chrome'
                type: topic
    consumers:
        import_pocket:
            connection: default
            exchange_options:
                name: 'wallabag.import.pocket'
                type: topic
            queue_options:
                name: 'wallabag.import.pocket'
            callback: wallabag_import.consumer.amqp.pocket
            qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
        import_readability:
            connection: default
            exchange_options:
                name: 'wallabag.import.readability'
                type: topic
            queue_options:
                name: 'wallabag.import.readability'
            callback: wallabag_import.consumer.amqp.readability
            qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
        import_instapaper:
            connection: default
            exchange_options:
                name: 'wallabag.import.instapaper'
                type: topic
            queue_options:
                name: 'wallabag.import.instapaper'
            callback: wallabag_import.consumer.amqp.instapaper
            qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
        import_pinboard:
            connection: default
            exchange_options:
                name: 'wallabag.import.pinboard'
                type: topic
            queue_options:
                name: 'wallabag.import.pinboard'
            callback: wallabag_import.consumer.amqp.pinboard
            qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
        import_wallabag_v1:
            connection: default
            exchange_options:
                name: 'wallabag.import.wallabag_v1'
                type: topic
            queue_options:
                name: 'wallabag.import.wallabag_v1'
            callback: wallabag_import.consumer.amqp.wallabag_v1
            qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
        import_wallabag_v2:
            connection: default
            exchange_options:
                name: 'wallabag.import.wallabag_v2'
                type: topic
            queue_options:
                name: 'wallabag.import.wallabag_v2'
            callback: wallabag_import.consumer.amqp.wallabag_v2
            qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
        import_firefox:
            connection: default
            exchange_options:
                name: 'wallabag.import.firefox'
                type: topic
            queue_options:
                name: 'wallabag.import.firefox'
            callback: wallabag_import.consumer.amqp.firefox
            qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
        import_chrome:
            connection: default
            exchange_options:
                name: 'wallabag.import.chrome'
                type: topic
            queue_options:
                name: 'wallabag.import.chrome'
            callback: wallabag_import.consumer.amqp.chrome
            qos_options: {prefetch_count: "%rabbitmq_prefetch_count%"}
 fos_js_routing:
    routes_to_expose:
        - homepage
        - starred
        - archive
        - all
        - tag
        - config
        - import
        - developer
        - howto
        - fos_user_security_logout
        - new
--- a/app/config/config_dev.yml
+++ b/app/config/config_dev.yml
@ -5,8 +5,7 @@ framework:
    router:
        resource: "%kernel.root_dir%/config/routing_dev.yml"
        strict_requirements: true
-    profiler:
+    profiler: { only_exceptions: false }
        only_exceptions: false
 web_profiler:
    toolbar: true
@ -18,14 +17,14 @@ monolog:
            type:   stream
            path:   "%kernel.logs_dir%/%kernel.environment%.log"
            level:  debug
-            channels: ['!event']
+            channels: [!event]
        console:
            type:   console
            bubble: false
            verbosity_levels:
                VERBOSITY_VERBOSE: INFO
                VERBOSITY_VERY_VERBOSE: DEBUG
-            channels: ['!event', '!doctrine']
+            channels: [!event, !doctrine]
        console_very_verbose:
            type:   console
            bubble: false
@ -35,16 +34,11 @@ monolog:
                VERBOSITY_DEBUG: DEBUG
            channels: [doctrine]
 assetic:
    use_controller: true
 swiftmailer:
    # see http://mailcatcher.me/
    transport: smtp
    host: 'localhost'
    port: 1025
 # If you want to use cache for queries used in WallabagExtension
 # Uncomment the following lines
 #doctrine:
 #    orm:
 #        metadata_cache_driver: apcu
 #        result_cache_driver: apcu
 #        query_cache_driver: apcu
--- a/app/config/config_prod.yml
+++ b/app/config/config_prod.yml
@ -2,8 +2,8 @@ imports:
    - { resource: config.yml }
 #framework:
-#    cache:
+#    validation:
-#        system: cache.adapter.apcu
+#        cache: apc
 #doctrine:
 #    orm:
--- a/app/config/config_test.yml
+++ b/app/config/config_test.yml
@ -28,7 +28,7 @@ doctrine:
        dbname: "%test_database_name%"
        user: "%test_database_user%"
        password: "%test_database_password%"
-        charset: "%test_database_charset%"
+        charset: UTF8
        path: "%test_database_path%"
    orm:
        metadata_cache_driver:
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@ -18,9 +18,6 @@ parameters:
    database_password: ~
    database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
    database_table_prefix: wallabag_
    database_socket: null
    # with MySQL, use "utf8mb4" if you got problem with content with emojis
    database_charset: utf8
    mailer_transport:  smtp
    mailer_host:       127.0.0.1
@ -37,26 +34,6 @@ parameters:
    twofactor_sender: no-reply@wallabag.org
    # fosuser stuff
    fosuser_registration: true
    fosuser_confirmation: true
    from_email: no-reply@wallabag.org
    rss_limit: 50
    # RabbitMQ processing
    rabbitmq_host: localhost
    rabbitmq_port: 5672
    rabbitmq_user: guest
    rabbitmq_password: guest
    rabbitmq_prefetch_count: 10
    # Redis processing
    redis_scheme: tcp
    redis_host: localhost
    redis_port: 6379
    redis_path: null
    redis_password: null
    # sites credentials
    sites_credentials: {}
--- a/app/config/parameters_test.yml
+++ b/app/config/parameters_test.yml
@ -5,5 +5,4 @@ parameters:
    test_database_name: null
    test_database_user: null
    test_database_password: null
-    test_database_path: '%kernel.root_dir%/../data/db/wallabag_test.sqlite'
+    test_database_path: '%kernel.root_dir%/../data/db/wallabag_testYO.sqlite'
    test_database_charset: utf8
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@ -7,14 +7,8 @@ wallabag_import:
    type:     annotation
    prefix:   /import
 wallabag_user:
    resource: "@WallabagUserBundle/Controller/"
    type: annotation
    prefix: /users
 wallabag_api:
-    resource: "@WallabagApiBundle/Controller/"
+    resource: "@WallabagApiBundle/Resources/config/routing.yml"
    type: annotation
    prefix: /
 app:
@ -48,6 +42,3 @@ craue_config_settings_modify:
    path: /settings
    defaults:
        _controller: CraueConfigBundle:Settings:modify
 fos_js_routing:
    resource: "@FOSJsRoutingBundle/Resources/config/routing/routing.xml"
--- a/app/config/routing_rest.yml
+++ b/app/config/routing_rest.yml
@ -1,3 +1,4 @@
 Rest_Wallabag:
  type : rest
  resource: "@WallabagApiBundle/Resources/config/routing_rest.yml"
--- a/app/config/security.yml
+++ b/app/config/security.yml
@ -8,9 +8,7 @@ security:
    providers:
        administrators:
-            entity:
+            entity: { class: WallabagUserBundle:User, property: username }
                class: WallabagUserBundle:User
                property: username
        fos_userbundle:
            id: fos_user.user_provider.username
@ -60,8 +58,6 @@ security:
        - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY }
        - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY }
        - { path: /(unread|starred|archive).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY }
        - { path: ^/share, roles: IS_AUTHENTICATED_ANONYMOUSLY }
        - { path: ^/settings, roles: ROLE_SUPER_ADMIN }
        - { path: ^/annotations, roles: ROLE_USER }
        - { path: ^/users, roles: ROLE_SUPER_ADMIN }
        - { path: ^/, roles: ROLE_USER }
--- a/app/config/services.yml
+++ b/app/config/services.yml
@ -16,12 +16,6 @@ services:
    wallabag.twig_extension:
        class: Wallabag\CoreBundle\Twig\WallabagExtension
        public: false
        arguments:
            - "@wallabag_core.entry_repository"
            - "@wallabag_core.tag_repository"
            - "@security.token_storage"
            - "%wallabag_core.cache_lifetime%"
            - "@translator"
        tags:
            - { name: twig.extension }
@ -32,13 +26,13 @@ services:
            - { name: twig.extension }
    wallabag.locale_listener:
-        class: Wallabag\CoreBundle\Event\Listener\LocaleListener
+        class: Wallabag\CoreBundle\EventListener\LocaleListener
        arguments: ["%kernel.default_locale%"]
        tags:
            - { name: kernel.event_subscriber }
    wallabag.user_locale_listener:
-        class: Wallabag\CoreBundle\Event\Listener\UserLocaleListener
+        class: Wallabag\CoreBundle\EventListener\UserLocaleListener
        arguments: ["@session"]
        tags:
            - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin }
--- a/app/config/tests/parameters_test.mysql.yml
+++ b/app/config/tests/parameters_test.mysql.yml
@ -6,4 +6,3 @@ parameters:
    test_database_user: root
    test_database_password: ~
    test_database_path: ~
    test_database_charset: utf8mb4
--- a/app/config/tests/parameters_test.pgsql.yml
+++ b/app/config/tests/parameters_test.pgsql.yml
@ -6,4 +6,3 @@ parameters:
    test_database_user: travis
    test_database_password: ~
    test_database_path: ~
    test_database_charset: utf8
--- a/app/config/tests/parameters_test.sqlite.yml
+++ b/app/config/tests/parameters_test.sqlite.yml
@ -5,5 +5,4 @@ parameters:
    test_database_name: ~
    test_database_user: ~
    test_database_password: ~
-    test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite"
+    test_database_path: "%kernel.root_dir%/../data/db/wallabag_testHU.sqlite"
    test_database_charset: utf8
--- a/bin/doctrine
+++ b/bin/doctrine
@ -0,0 +1 @@
 ../vendor/doctrine/orm/bin/doctrine
--- a/bin/doctrine-dbal
+++ b/bin/doctrine-dbal
@ -0,0 +1 @@
 ../vendor/doctrine/dbal/bin/doctrine-dbal
--- a/bin/doctrine-migrations
+++ b/bin/doctrine-migrations
@ -0,0 +1 @@
 ../vendor/doctrine/migrations/bin/doctrine-migrations
--- a/bin/doctrine.php
+++ b/bin/doctrine.php
@ -0,0 +1 @@
 ../vendor/doctrine/orm/bin/doctrine.php
--- a/Show More
+++ b/Show More
		`@ -0,0 +1,2 @@`
							`Login: "Log ind"`
							`Enter your email address below and we'll send you password reset instructions.: "Indtast din emailadresse nedenfor, så sender vi dig instrukser til at nulstille din adgangskode."`
		`@ -0,0 +1,2 @@`
							`Login: "Anmelden"`
							`Enter your email address below and we'll send you password reset instructions.: "Tippe deine E-Mail-Adresse unten ein und wir senden dir die Anweisungen, wie du dein Kennwort zurücksetzen kannst."`
		`@ -0,0 +1,2 @@`
							`Login: "Logearse"`
							`Enter your email address below and we'll send you password reset instructions.: "Introduzca su dirección de email y le enviaremos las instrucciones para resetear su contraseña."`
		`@ -0,0 +1,2 @@`
							`Login: "Se connecter"`
							`Enter your email address below and we'll send you password reset instructions.: "Renseignez votre adresse email, nous vous enverrons les instructions pour réinitialiser votre mot de passe."`
		`@ -0,0 +1,2 @@`
							`Login: "Se connectar"`
							`Enter your email address below and we'll send you password reset instructions.: "Picatz vòstra adreça de corrièl çai-jos, vos mandarem las instruccions per reïnicializar vòstre senhal."`
		`@ -0,0 +1,2 @@`
							`Login: "Logowanie"`
							`Enter your email address below and we'll send you password reset instructions.: "Wpisz poniżej swój adres email, abyśmy mogli wysłać ci instrukcję resetowania hasła."`
		`@ -0,0 +1 @@`
							`../vendor/doctrine/migrations/bin/doctrine-migrations`