Release wallabag 2.2.1

Prepare wallabag 2.2.1 🚀

.editorconfig

@@ -8,3 +8,7 @@ indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
 insert_final_newline = true
+
+[*.{js,css}]
+indent_style = space
+indent_size = 2

.eslintrc.json

@@ -2,7 +2,11 @@
     "extends": "airbnb-base",
     "parser": "babel-eslint",
     "env": {
-        "browser": true
+        "browser": true,
+        "es6": true
+    },
+    "globals": {
+        "Routing": true
     },
     "rules": {
         "import/no-extraneous-dependencies": ["error", {"devDependencies": true, "optionalDependencies": true, "peerDependencies": true}]

.github/ISSUE_TEMPLATE.md

@@ -1,3 +1,5 @@
+: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.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,11 +1,16 @@
 | Q             | A
 | ------------- | ---
-| Bug fix?      | yes|no
-| New feature?  | yes|no
-| BC breaks?    | yes|no
-| Deprecations? | yes|no
-| Tests pass?   | yes|no
-| Documentation | yes|no
-| Translation   | yes|no
-| Fixed tickets | comma-separated list of tickets fixed by the PR, if any
+| Bug fix?      | yes/no
+| New feature?  | yes/no
+| BC breaks?    | yes/no
+| Deprecations? | yes/no
+| Tests pass?   | yes/no
+| Documentation | yes/no
+| Translation   | yes/no
+| Fixed tickets | #...
 | 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.
+-->

.gitignore

@@ -25,6 +25,8 @@ web/uploads/
 !web/bundles
 web/bundles/*
 !web/bundles/wallabagcore
+/web/assets/images/*
+!web/assets/images/.gitkeep
 
 # Build
 /app/build
@@ -34,7 +36,6 @@ web/bundles/*
 /composer.phar
 
 # Data for wallabag
-data/assets/*
 data/db/wallabag*.sqlite
 
 # Docker container logs and data

.travis.yml

@@ -57,12 +57,11 @@ before_script:
     - if [[ ! $PHP = hhvm* ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
     # xdebug isn't enable for PHP 7.1
     - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi
-    - if [[ $PHP = 5.5 ]]; then composer require "phpunit/phpunit:4.*" --no-update; fi;
     - composer self-update --no-progress
     - if [[ $DB = pgsql ]]; then psql -c 'create database wallabag_test;' -U postgres; fi;
 
 install:
-    - if [[ $ASSETS = build ]]; then source ~/.nvm/nvm.sh && nvm install 5.0; fi;
+    - 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;
 
@@ -70,9 +69,11 @@ before_install:
     - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
 
 script:
-    - travis_wait bash composer install -o  --no-interaction --no-progress --prefer-dist
+    - travis_wait composer update --no-interaction --no-progress
     - ant prepare-$DB
-    - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then phpunit -v ; fi;
+    - if [[ $VALIDATE_TRANSLATION_FILE = '' ]]; then ./bin/simple-phpunit -v ; 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 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;

CHANGELOG.md

@@ -1,261 +1,579 @@
-# Changelog
-
-All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
-
-## [2.1.1] - 2016-10-04
-
-### Changed
-
-- [#2340](https://github.com/wallabag/wallabag/pull/2340) Updated german translation (Strubbl)
-- [#2341](https://github.com/wallabag/wallabag/pull/2341) Updated polish translation (Mateusz Rumiński)
-- [#2354](https://github.com/wallabag/wallabag/pull/2354) Add php-bcmath extension to requirements (Godinez Pablo)
-
-### Fixed
-
-- [#2338](https://github.com/wallabag/wallabag/pull/2338) Fixed 2.1 installation (Jeremy Benoist)
-- [#2345](https://github.com/wallabag/wallabag/issues/2345) Fixed 2.0.x update (Jeremy Benoist)
-- [#2353](https://github.com/wallabag/wallabag/pull/2353) Fixed assets problem (Thomas Citharel)
-- [#2359](https://github.com/wallabag/wallabag/pull/2359) Create config even if user is disabled (Jeremy Benoist)
-
-## [2.1.0] - 2016-10-03
-
-### Added
-
-- [#1990](https://github.com/wallabag/wallabag/pull/1990) Added command line import for wallabag files (Nicolas Lœuillet)
-- [#2142](https://github.com/wallabag/wallabag/pull/2142) Manage assets through npm (Thomas Citharel)
-- [#2174](https://github.com/wallabag/wallabag/pull/2174) Added filter for tags on API (Thomas Citharel)
-- [#2176](https://github.com/wallabag/wallabag/pull/2176) Added `since` parameter in API (Thomas Citharel)
-- [#2170](https://github.com/wallabag/wallabag/pull/2170), [#2183](https://github.com/wallabag/wallabag/pull/2183) Added tags on entries view (Thomas Citharel)
-- [#2186](https://github.com/wallabag/wallabag/pull/2186) Added option to disable registration (Thomas Citharel)
-- [#1904](https://github.com/wallabag/wallabag/pull/1904) Share entry with a public URL (Nicolas Lœuillet)
-- [#2243](https://github.com/wallabag/wallabag/pull/2243) Added list of untagged articles (Nicolas Lœuillet)
-- [#2255](https://github.com/wallabag/wallabag/pull/2255) Added Readability import (Jeremy Benoist)
-- [#2002](https://github.com/wallabag/wallabag/pull/2002) Added articles counter in sidebar (Nicolas Lœuillet)
-- [#2275](https://github.com/wallabag/wallabag/pull/2275) Added date from entries in export (Jeremy Benoist)
-- [#2266](https://github.com/wallabag/wallabag/pull/2266) Added tags counter in sidebar (Nicolas Lœuillet)
-- [#1941](https://github.com/wallabag/wallabag/pull/1941) Added asynchronous import (Jeremy Benoist, Nicolas Lœuillet)
-- [#2192](https://github.com/wallabag/wallabag/pull/2192) Added Firefox / Chrome bookmarks import (Thomas Citharel)
-- [#2310](https://github.com/wallabag/wallabag/pull/2310) Added Instapaper import (Jeremy Benoist)
-- [#2322](https://github.com/wallabag/wallabag/pull/2322) Added customized errors templates (Jeremy Benoist)
-- [#2323](https://github.com/wallabag/wallabag/pull/2323) Added simple stats in footer (Jeremy Benoist)
-- [#2324](https://github.com/wallabag/wallabag/pull/2324) Added ability to edit a tagging rule (Jeremy Benoist)
-- [#2325](https://github.com/wallabag/wallabag/pull/2325) Added an `exists` endpoint in API (Jeremy Benoist)
-
-### Changed
-
-- [#2170](https://github.com/wallabag/wallabag/pull/2170) Entry titles are now smaller on entry view (Thomas Citharel)
-- [#2245](https://github.com/wallabag/wallabag/pull/2245) Changed where page title is displayed (Nicolas Lœuillet)
-- [#2274](https://github.com/wallabag/wallabag/pull/2274) Re use JsonResponse in API (Jeremy Benoist)
-- [#2257](https://github.com/wallabag/wallabag/pull/2257) Use created date for imported content (Jeremy Benoist)
-- [#2326](https://github.com/wallabag/wallabag/pull/2326) Quickstart layout (Nicolas Lœuillet)
-
-### Fixed
-
-- [#2328](https://github.com/wallabag/wallabag/pull/2328) Fixed duplicate URL with accents (Jeremy Benoist)
-- [#2319](https://github.com/wallabag/wallabag/pull/2319) Fixed `gd` extension missing in Dockerfile (Pascal Martin)
-- [#2313](https://github.com/wallabag/wallabag/pull/2313) Fixed long loading on Firefox (Nicolas Lœuillet)
-- [#2320](https://github.com/wallabag/wallabag/pull/2320) Fixed user config which wasn't created in some cases (Jeremy Benoist)
-- [#2301](https://github.com/wallabag/wallabag/pull/2301) Fixed feeds not syncing on android application (Thomas Citharel)
-- [#2308](https://github.com/wallabag/wallabag/pull/2308) Fixed duplicate tags on import (Jeremy Benoist)
-- [#2297](https://github.com/wallabag/wallabag/pull/2297) Fixed epub export with special characters in title (morhelluin)
-- [#2292](https://github.com/wallabag/wallabag/pull/2292) Fixed label for mark as read link in entry view (Nicolas Lœuillet)
-- [#2260](https://github.com/wallabag/wallabag/pull/2260) Fixed different font-size for labels in config screen (Nicolas Lœuillet)
-- [#2242](https://github.com/wallabag/wallabag/pull/2242) Fixed print / article views (Nicolas Lœuillet)
-- [#2328](https://github.com/wallabag/wallabag/pull/2328) Avoid duplicate url with accents (Jeremy Benoist)
-- [#2330](https://github.com/wallabag/wallabag/pull/2330) Remove error message when creating ePub versions (Paulino Michelazzo)
-- [#2331](https://github.com/wallabag/wallabag/pull/2331) Fix parameters in API links (Jeremy Benoist)
-
-### Removed
-
-- [#2318](https://github.com/wallabag/wallabag/pull/2318) Removed duplicated templates files (Nicolas Lœuillet)
-- [#2287](https://github.com/wallabag/wallabag/pull/2287) Useless area in footer for material theme (Nicolas Lœuillet)
-
-## [2.0.8] - 2016-09-07
-
-### Added
-
-- [#2262](https://github.com/wallabag/wallabag/pull/2262) Added a check for the database connection during installation (Jeremy Benoist)
-- [#2235](https://github.com/wallabag/wallabag/pull/2235) Added configuration for german documentation website, [available here](http://doc.wallabag.org/de/latest/) (Nicolas Lœuillet)
-
-### Changed
-
-- [graby](https://github.com/j0k3r/graby/releases/tag/1.4.3) Update Graby version, which now handles ZIP files (Jeremy Benoist)
-- [#2230](https://github.com/wallabag/wallabag/pull/2230) Changed title display in card view (Danilow Alexandr)
-
-### Fixed
-
-- [#2234](https://github.com/wallabag/wallabag/pull/2234) Fixed mailto link in documentation (Christian Studer)
-- [#2241](https://github.com/wallabag/wallabag/pull/2241) Fixed the height of the "Add new article" field in Chrome (Danilow Alexandr)
-- [#2238](https://github.com/wallabag/wallabag/pull/2238) Fixed login page in Qupzilla (Danilow Alexandr)
-
-## [2.0.7] - 2016-08-22
-
-### Added
-
-- [#2222](https://github.com/wallabag/wallabag/pull/2222) Added creation date and reading time on article view (Nicolas Lœuillet)
-- [#2134](https://github.com/wallabag/wallabag/pull/2134) Run tests on an uptodate HHVM (Jeremy Benoist)
-
-### Changed
-
-- [#2221](https://github.com/wallabag/wallabag/pull/2221) Replaced favorite word/icon with star one (Nicolas Lœuillet)
-
-### Fixed
-
-- [#2224](https://github.com/wallabag/wallabag/pull/2224) Avoid breaking import when fetching fail (Jeremy Benoist)
-- [#2216](https://github.com/wallabag/wallabag/pull/2216), [#2220](https://github.com/wallabag/wallabag/pull/2220) Enable CORS headers for OAUTH part (Rurik19)
-- [#2095](https://github.com/wallabag/wallabag/pull/2095) Fix form user display when 2FA is disabled (Nicolas Lœuillet)
-
-## [2.0.6] - 2016-08-10
-
-### Changed
-
-- [#2199](https://github.com/wallabag/wallabag/pull/2199) Handling socials links into a config file (Simon Alberny)
-- [#2172](https://github.com/wallabag/wallabag/pull/2172) Change the way to login user in tests (Jeremy Benoist)
-- [#2155](https://github.com/wallabag/wallabag/pull/2155) Use friendsofphp instead of fabpot for PHP CS Fixer (Jeremy Benoist)
-
-### Fixed
-
-- [#2200](https://github.com/wallabag/wallabag/pull/2200) Fixed typo in entry:notice:entry_saved (charno6)
-- [#2185](https://github.com/wallabag/wallabag/pull/2185) Fix 3rd-Party Apps links (Chrome & Firefox) (Thomas Citharel)
-- [#2165](https://github.com/wallabag/wallabag/pull/2165) Fix a few french translations typos (Thomas Citharel)
-- [#2157](https://github.com/wallabag/wallabag/pull/2157) Handle only upper or only lower reading filter (Jeremy Benoist)
-- [#2156](https://github.com/wallabag/wallabag/pull/2156) Try to find bad redirection after delete (Jeremy Benoist)
-
-## [2.0.5] - 2016-05-31
-
-### Added
-
-- [#2052](https://github.com/wallabag/wallabag/pull/2052) Add unread filter to entries pages (Dan Bartram)
-
-### Changed
-
-- [#2093](https://github.com/wallabag/wallabag/pull/2093) Replace vertical dots in material theme with horizontal dots (Nicolas Lœuillet)
-- [#2054](https://github.com/wallabag/wallabag/pull/2054) Update italian translation (Daniele Conca)
-- [#2068](https://github.com/wallabag/wallabag/pull/2068), [#2049](https://github.com/wallabag/wallabag/pull/2049) Update documentation (Josh Panter, Mario Vormstein)
-
-### Fixed
-
-- [#2122](https://github.com/wallabag/wallabag/pull/2122) Fix the deletion of Tags/Entries relation when delete an entry (Jeremy Benoist, Nicolas Lœuillet)
-- [#2095](https://github.com/wallabag/wallabag/pull/2095) Fix form user display when 2FA is disabled (Nicolas Lœuillet)
-- [#2092](https://github.com/wallabag/wallabag/pull/2092) API: Starred and archived clears if article is already exists (Rurik19)
-- [#2097](https://github.com/wallabag/wallabag/issues/2097) Fix image path in 2-factor authentification email (Baptiste Mille-Mathias)
-- [#2069](https://github.com/wallabag/wallabag/pull/2069) Do not specify language in Firefox addon link (Merouane Atig)
-
-## [2.0.4] - 2016-05-07
-
-### Added
-
-- [#2016](https://github.com/wallabag/wallabag/pull/2016) Big updates in [our documentation](http://doc.wallabag.org/en/master/) (Nicolas Lœuillet)
-- [#2028](https://github.com/wallabag/wallabag/pull/2028) Documentation about android application (Strubbl)
-- [#2019](https://github.com/wallabag/wallabag/pull/2019) Italian translation (Daniele Conca)
-- [#2011](https://github.com/wallabag/wallabag/pull/2011) Documentation about wallabag upgrade (biva)
-- [#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)
-
-### Changed
-
-- [#1977](https://github.com/wallabag/wallabag/pull/1977) Spanish documentation (jami7)
-
-### Fixed
-
-- [#2023](https://github.com/wallabag/wallabag/pull/2023) Fix translation for validators (Nicolas Lœuillet)
-- [#2020](https://github.com/wallabag/wallabag/pull/2020) Fix number of entries in tag/list (Nicolas Lœuillet)
-- [#2022](https://github.com/wallabag/wallabag/pull/2022) Fix pagination bar on small devices (Nicolas Lœuillet)
-- [#2013](https://github.com/wallabag/wallabag/pull/2013) Fix tag listing (Nicolas Lœuillet)
-- [#1976](https://github.com/wallabag/wallabag/pull/1976) Fix filter reading time (Nicolas Lœuillet)
-- [#2005](https://github.com/wallabag/wallabag/pull/2005) Fix reading speed not defined when user was created via config page (Nicolas Lœuillet)
-- [#2010](https://github.com/wallabag/wallabag/pull/2010) Set the title via POST /api/entries (Nicolas Lœuillet)
-
-## [2.0.3] - 2016-04-22
-
-### Added
-
-- [#1962](https://github.com/wallabag/wallabag/pull/1962) cURL examples in documentation about API (Dirk Deimeke)
-
-### Fixed
-
-- Forgot `composer.lock` file in 2.0.2 release so some users may encounter `Fatal error: Out of memory` error during installation
-
-## [2.0.2] - 2016-04-21
-
-### Added
-
-- [#1945](https://github.com/wallabag/wallabag/pull/1945) cURL examples in documentation about API (Dirk Deimeke)
-- [#1911](https://github.com/wallabag/wallabag/pull/1911) Add title hover on entry titles (Thomas Citharel)
-
-### Changed
-
-- [#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)
-- [#1942](https://github.com/wallabag/wallabag/pull/1942) Optimize import (Nicolas Lœuillet)
-- [#1935](https://github.com/wallabag/wallabag/pull/1935) Update spanish translation (jami7)
-- [#1929](https://github.com/wallabag/wallabag/pull/1929) Change guid and link in RSS feeds to give original entry URL (Nicolas Lœuillet)
-- [#1918](https://github.com/wallabag/wallabag/pull/1918) Improve pagination when user has lot of entries (Nicolas Lœuillet)
-- [#1916](https://github.com/wallabag/wallabag/pull/1916) Change PHP arrays and move test parameters in a separated file (Jeremy Benoist)
-
-### Fixed
-
-- [#1957](https://github.com/wallabag/wallabag/pull/1957) Fix translation for `Go to your account` button (Nicolas Lœuillet)
-- [#1925](https://github.com/wallabag/wallabag/pull/1925) Redirect to homepage if refered is null (Nicolas Lœuillet)
-- [#1912](https://github.com/wallabag/wallabag/pull/1912) Fix 500 Internal Server Error -> "Setting piwik_enabled couldn't be found" (Jeremy Benoist)
-
-## [2.0.1] - 2016-04-11
-### Added
-
-- [Documentation about importing large file](http://doc.wallabag.org/en/v2/user/installation.html#installing-on-nginx) into nginx. (Nicolas Lœuillet)
-- [Documentation about wallabag API](http://doc.wallabag.org/en/v2/developer/api.html) (Nicolas Lœuillet)
-- [#1861](https://github.com/wallabag/wallabag/pull/1861) Round estimated time and add reading speed for Baggy (Nicolas Lœuillet)
-- [Documentation about wallabag v1 CLI import](http://doc.wallabag.org/en/v2/user/migration.html#import-via-command-line-interface-cli) (Nicolas Lœuillet)
-- [Add migrate link](http://doc.wallabag.org/en/v2/user/migration.html) in documentation (Nicolas Lœuillet)
-
-### Changed
-
-- [#1823](https://github.com/wallabag/wallabag/pull/1823) Persian translation (Masoud Abkenar)
-- [#1901](https://github.com/wallabag/wallabag/pull/1901) Spanish translation (Jeremy Benoist)
-- [#1879](https://github.com/wallabag/wallabag/pull/1879) Move tag form in Material theme (Nicolas Lœuillet)
-
-### Fixed
-
-- [#1903](https://github.com/wallabag/wallabag/pull/1903) Force server version to avoid connection error (Jeremy Benoist)
-- [#1887](https://github.com/wallabag/wallabag/pull/1887) Fix duplicate article when added via the bookmarklet (Nicolas Lœuillet)
-- [#1895](https://github.com/wallabag/wallabag/pull/1895) API: All the entries are fetched via GET /api/entries (Nicolas Lœuillet)
-- [#1898](https://github.com/wallabag/wallabag/pull/1898) Fix estimated reading time in material view #1893 (Nicolas Lœuillet)
-- [#1896](https://github.com/wallabag/wallabag/pull/1896) remove download_picture setting and manage show_printlink in material theme #1867 (Nicolas Lœuillet)
-- [#1894](https://github.com/wallabag/wallabag/pull/1894) Fix documentation link in developer page (Nicolas Lœuillet)
-- [#1891](https://github.com/wallabag/wallabag/pull/1891) Fix typo on configuration page (Nicolas Lœuillet)
-- [#1884](https://github.com/wallabag/wallabag/pull/1884) Change the installation method in issue template (Nicolas Lœuillet)
-- [#1844](https://github.com/wallabag/wallabag/pull/1844) Lock ocramius/proxy-manager (Jeremy Benoist)
-- [#1840](https://github.com/wallabag/wallabag/pull/1840) Fix Archive page title translation (Nicolas Lœuillet)
-- [#1801](https://github.com/wallabag/wallabag/pull/1804) Force user-agent for iansommerville.com (Jeremy Benoist)
-
-### Removed
-
-- [#1900](https://github.com/wallabag/wallabag/pull/1900) Remove empty portugese documentation (Nicolas Lœuillet)
-- [#1868](https://github.com/wallabag/wallabag/pull/1868) Remove keyboard shortcut and add tagging rule panel in baggy (Nicolas Lœuillet)
-- [#1824](https://github.com/wallabag/wallabag/pull/1824) Remove SMTP configuration environment overrides (Mathieu Bruyen)
-
-## [2.0.0] - 2016-04-03
-### Added
-
-* save an article, read it, favorite it, archive it. (Hopefully)
-* annotations: In each article you read, you can write annotations. ([read the doc](http://doc.wallabag.org/en/v2/user/annotations.html))
-* filter entries by reading time, domain name, creation date, status, etc.
-* assign tags to entries
-* edit article titles
-* a REST API ([you can have a look to the documentation](http://v2.wallabag.org/api/doc))
-* authorization via oAuth2
-* a new default theme, called `material`
-* RSS feeds (with ability to limit number of articles)
-* create a new account from the config page (for super admin only)
-* recover passwords from login page (you have to fill your email on config page)
-* picture preview, if available, is displayed for each entry
-* 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
+## Changelog
+
+### 2.2.1 2017/01/31
+
+- [#2809](https://github.com/wallabag/wallabag/pull/2809) Fixed duplicate entry for share_public in craue_setting_table and added documentation about migration (@nicosomb)
+
+### 2.2.0 2017/01/27
+- [#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
+- [#2759](https://github.com/wallabag/wallabag/pull/2759) Prepare wallabag 2.1.6 :rocket: (@nicosomb)
+- [#2758](https://github.com/wallabag/wallabag/pull/2758) Fixed possible JS injection via the title edition (@nicosomb)
+- [#2736](https://github.com/wallabag/wallabag/pull/2736) Update copyright year (@lex111)
+- [#2624](https://github.com/wallabag/wallabag/pull/2624) Fix #2056 update config.yml (@Rurik19)
+
+### 2.1.5 2016/11/21
+- [#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
+- [#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
+- [#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
+- [#2452](https://github.com/wallabag/wallabag/pull/2452) Prepare wallabag 2.1.2 :rocket: (@nicosomb)
+- [#2464](https://github.com/wallabag/wallabag/pull/2464) Fixed hardcoded title for internal settings (@nicosomb)
+- [#2455](https://github.com/wallabag/wallabag/pull/2455) Fix tabs on material (@tcitworld)
+- [#2454](https://github.com/wallabag/wallabag/pull/2454) Fix baggy display on small screens (@tcitworld)
+- [#2459](https://github.com/wallabag/wallabag/pull/2459) German: improve existing and add missing translation (@Strubbl)
+- [#2457](https://github.com/wallabag/wallabag/pull/2457) add link to German documentation in about page (@Strubbl)
+- [#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
+- [#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
+- [#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
+- [#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
+- [#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
+- [#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
+- [#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
+- [#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
+- [#1965](https://github.com/wallabag/wallabag/pull/1965) Prepare release 2.0.3 (@nicosomb)
+- [#1962](https://github.com/wallabag/wallabag/pull/1962) Update API documentation with cURL examples (@nicosomb)
+
+### 2.0.2 2016/04/21
+- [#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
+- [#1938](https://github.com/wallabag/wallabag/pull/1938) Display pagination only if we have more than one page (@nicosomb)
+- [#1935](https://github.com/wallabag/wallabag/pull/1935) Update messages.es.yml (@jami7)
+- [#1933](https://github.com/wallabag/wallabag/pull/1933) Hide pagination if we only have one entry to display (@nicosomb)
+- [#1925](https://github.com/wallabag/wallabag/pull/1925) Redirect to homepage if referer is null (@nicosomb)
+- [#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) 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
+- [#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
+- [#1835](https://github.com/wallabag/wallabag/pull/1835) :rocket: Prepare v2.0.0 :birthday: (@nicosomb)
+- [#1838](https://github.com/wallabag/wallabag/pull/1838) Hide search buttons (@nicosomb)
+- [#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
+- [#1775](https://github.com/wallabag/wallabag/pull/1775) Some fixes (@j0k3r)
+- [#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
+- [#1738](https://github.com/wallabag/wallabag/pull/1738) Prepare wallabag for first beta :rocket: (@nicosomb)
+- [#1739](https://github.com/wallabag/wallabag/pull/1739) minor typofix + missing quotes (@goofy-bz)
+- [#1736](https://github.com/wallabag/wallabag/pull/1736) Update Capistrano libraries with last versions (@nicosomb)
+- [#1734](https://github.com/wallabag/wallabag/pull/1734) Remove extra definition (@j0k3r)
+- [#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
+- [#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
+- [#1493](https://github.com/wallabag/wallabag/pull/1493) v2 – 1st draft for Pocket import via API & Wallabag v1 import (@nicosomb, @j0k3r)
+- [#1553](https://github.com/wallabag/wallabag/pull/1553) Hide export button if we are not on entries list (@nicosomb)
+- [#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)
+- [#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)
+- [#1540](https://github.com/wallabag/wallabag/pull/1540) v2 –  Don't redirect to the content page after deletion (@j0k3r)
+- [#1542](https://github.com/wallabag/wallabag/pull/1542) v2 –  Avoid multiple tag creation (@j0k3r)
+- [#1488](https://github.com/wallabag/wallabag/pull/1488) Slug for tags (@wallabag)
+- [#1537](https://github.com/wallabag/wallabag/pull/1537) Updated composer.lock (@bdunogier)
+- [#1529](https://github.com/wallabag/wallabag/pull/1529) changed table name for tagging rule (@nicosomb)
+- [#1478](https://github.com/wallabag/wallabag/pull/1478) Rule based tags (@K-Phoen)
+- [#1523](https://github.com/wallabag/wallabag/pull/1523) Typo (@tcitworld)
+- [#1518](https://github.com/wallabag/wallabag/pull/1518) Set SMTP from environment variables (@mathbruyen)
+- [#1422](https://github.com/wallabag/wallabag/pull/1422) V2 – Export entries (@j0k3r, @tcitworld)
+- [#1500](https://github.com/wallabag/wallabag/pull/1500) Fix quote strategy for reserved keyword in Postgres (@j0k3r)
+- [#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)
+- [#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)
+- [#1491](https://github.com/wallabag/wallabag/pull/1491) Add german translation. (@jlnostr)
+- [#1446](https://github.com/wallabag/wallabag/pull/1446) [WIP] language selection on config screen (@j0k3r, @nicosomb)
+- [#1484](https://github.com/wallabag/wallabag/pull/1484) 2factor authentication via email (@wallabag)
+- [#1475](https://github.com/wallabag/wallabag/pull/1475) V2 material (@modos189)
+- [#1472](https://github.com/wallabag/wallabag/pull/1472) fix #1470: clean material theme (@wallabag)
+- [#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)
+- [#1464](https://github.com/wallabag/wallabag/pull/1464) fix type hint for User (@wallabag)
+- [#1436](https://github.com/wallabag/wallabag/pull/1436) Public registration & oAuth2 \o/ (@j0k3r, @nicosomb)
+- [#1461](https://github.com/wallabag/wallabag/pull/1461) fix #1433: add test for removeWww Twig Extension (@wallabag)
+- [#1459](https://github.com/wallabag/wallabag/pull/1459) fix #1457 & update materialize (@tcitworld)
+- [#1447](https://github.com/wallabag/wallabag/pull/1447) typo (@tcitworld)
+- [#1441](https://github.com/wallabag/wallabag/pull/1441) Add french translation (@nicosomb)
+- [#1437](https://github.com/wallabag/wallabag/pull/1437) some cleanup on material theme (@nicosomb)
+- [#1439](https://github.com/wallabag/wallabag/pull/1439) fix Capistrano configuration (@nicosomb)
+- [#1440](https://github.com/wallabag/wallabag/pull/1440) fix #1433: remove www. on entries view (@nicosomb)
+- [#1434](https://github.com/wallabag/wallabag/pull/1434) Add multiple database tests on Travis (@j0k3r)
+- [#1435](https://github.com/wallabag/wallabag/pull/1435) Enabled created user from Config (@j0k3r)
+- [#1429](https://github.com/wallabag/wallabag/pull/1429) V2 – Handle language in entry (@j0k3r)

COPYING.md

@@ -1,4 +1,4 @@
-Copyright (c) 2013-2016 Nicolas Lœuillet
+Copyright (c) 2013-2017 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

Capfile

@@ -7,6 +7,8 @@ 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

Gemfile

@@ -1,5 +1,6 @@
 source "https://rubygems.org"
 
 gem 'capistrano',  '~> 3.4'
+gem 'capistrano-composer'
 gem 'capistrano-symfony', '~> 1.0.0.rc1'
-gem 'capistrano-composer', '~> 0.0.3'
+gem 'capistrano-file-permissions'

Gemfile.lock

@@ -29,8 +29,9 @@ PLATFORMS
 
 DEPENDENCIES
   capistrano (~> 3.4)
-  capistrano-composer (~> 0.0.3)
+  capistrano-composer
+  capistrano-file-permissions
   capistrano-symfony (~> 1.0.0.rc1)
 
 BUNDLED WITH
-   1.11.2
+   1.13.5

Gruntfile.js

@@ -10,10 +10,6 @@ module.exports = function (grunt) {
     postcss: {
       material: {
         options: {
-          map: {
-            inline: false,
-          },
-
           processors: [
             require('pixrem')(),
             require('autoprefixer')({ browsers: 'last 2 versions' }),
@@ -25,10 +21,6 @@ module.exports = function (grunt) {
       },
       baggy: {
         options: {
-          map: {
-            inline: false,
-          },
-
           processors: [
             require('pixrem')(),
             require('autoprefixer')({ browsers: 'last 2 versions' }),
@@ -95,19 +87,13 @@ module.exports = function (grunt) {
         files: {
           '<%= releaseDir %>/themes/material/js/material.min.js':
             ['<%= buildDir %>/material.browser.js'],
-        },
-        options: {
-          sourceMap: true,
-        },
+        }
       },
       baggy: {
         files: {
           '<%= releaseDir %>/themes/baggy/js/baggy.min.js':
             ['<%= buildDir %>/baggy.browser.js'],
-        },
-        options: {
-          sourceMap: true,
-        },
+        }
       },
     },
     copy: {
@@ -203,8 +189,11 @@ module.exports = function (grunt) {
     },
     stylelint: {
       target: ['<%= appDir %>/themes/material/css/*.css', '<%= appDir %>/themes/baggy/css/*.css']
+    },
+    watch: {
+      files: ['<%= appDir %>/**/*.css', '<%= appDir %>/**/*.js'],
+      tasks: ['css', 'js']
     }
-
   });
 
   grunt.registerTask(
@@ -235,5 +224,7 @@ module.exports = function (grunt) {
       'tests',
       'Test css and js style conformity',
       ['eslint', 'stylelint', 'default']
-  )
+  ),
+
+  grunt.loadNpmTasks('grunt-contrib-watch');
 };

Makefile

@@ -0,0 +1,45 @@
+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

README.md

@@ -6,23 +6,22 @@
 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 informations on our website: [wallabag.org](https://wallabag.org)
+More information 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/) or be sure to use Composer 1.2 (`composer selfupdate` can help you about that). Read [our documentation](http://doc.wallabag.org) to have more information about installation.
 Then you can install wallabag by executing the following commands:
 
 ```
-    git clone https://github.com/wallabag/wallabag.git
-    cd wallabag
-    git checkout 2.1.1
-    SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
-    php bin/console wallabag:install --env=prod
-    php bin/console server:run --env=prod
+git clone https://github.com/wallabag/wallabag.git
+cd wallabag && make install
+make run
 ```
 
-## License
-Copyright © 2013-2016 Nicolas Lœuillet <nicolas@loeuillet.org>
+# License
+Copyright © 2013-2017 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.

RELEASE_PROCESS.md

@@ -1,47 +1,58 @@
 ## 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 `release-2.0.0-beta.1`.
+During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE`.
 
 #### Files to edit
 
 - `app/config/config.yml` (`wallabag_core.version`)
-- `README.md` (`composer create-project` command)
-- `docs/en/user/installation.rst` and its translations (`composer create-project` command)
+- `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))
 
 #### Create release on GitHub
 
 - Run these commands to create the tag:
 
 ```
-    git checkout v2
-    git pull origin v2
-    git checkout -b release-2.0.0-beta.1
-    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
+git checkout master
+git pull origin master
+git checkout -b release-$LAST_WALLABAG_RELEASE
+SYMFONY_ENV=prod composer up --no-dev
 ```
 
-- 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:
+- Update `.travis.yml` file and replace the composer line with this one:
+
+```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 clone git@github.com:wallabag/wallabag.git -b release-2.0.0-beta.1 release-2.0.0-beta.1
-    SYMFONY_ENV=prod composer up -d=release-2.0.0-beta.1 --no-dev
-    tar czf wallabag-release-2.0.0-beta.1.tar.gz --exclude="var/*" --exclude=".git" release-2.0.0-beta.1
+git add --force composer.lock .travis.yml
+git commit -m "Release wallabag $LAST_WALLABAG_RELEASE"
+git push origin release-$LAST_WALLABAG_RELEASE
+```
+
+- 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-2.0.0-beta.1` branch and close the pull request (**DO NOT MERGE IT**).
+- Delete the `release-$LAST_WALLABAG_RELEASE` 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)
-- Drink a beer!
+- Update Dockerfile https://github.com/wallabag/docker (and create a new tag)
+- 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,

app/AppKernel.php

@@ -29,8 +29,9 @@ 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(),

app/DoctrineMigrations/Version20160410190541.php

@@ -7,6 +7,9 @@ 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
 {
     /**
@@ -21,7 +24,7 @@ class Version20160410190541 extends AbstractMigration implements ContainerAwareI
 
     private function getTable($tableName)
     {
-        return $this->container->getParameter('database_table_prefix') . $tableName;
+        return $this->container->getParameter('database_table_prefix').$tableName;
     }
 
     /**
@@ -29,8 +32,23 @@ class Version20160410190541 extends AbstractMigration implements ContainerAwareI
      */
     public function up(Schema $schema)
     {
-        $this->addSql('ALTER TABLE `'.$this->getTable('entry').'` ADD `uuid` LONGTEXT DEFAULT NULL');
-        $this->addSql("INSERT INTO `".$this->getTable('craue_config_setting')."` (`name`, `value`, `section`) VALUES ('share_public', '1', 'entry')");
+        $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')");
+        }
     }
 
     /**
@@ -38,9 +56,9 @@ class Version20160410190541 extends AbstractMigration implements ContainerAwareI
      */
     public function down(Schema $schema)
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'sqlite', 'This down migration can\'t be executed on SQLite databases, because SQLite don\'t support DROP COLUMN.');
+        $entryTable = $schema->getTable($this->getTable('entry'));
+        $entryTable->dropColumn('uid');
 
-        $this->addSql('ALTER TABLE `'.$this->getTable('entry').'` DROP `uuid`');
-        $this->addSql("DELETE FROM `".$this->getTable('craue_config_setting')."` WHERE `name` = 'share_public'");
+        $this->addSql('DELETE FROM '.$this->getTable('craue_config_setting')." WHERE name = 'share_public'");
     }
 }

app/DoctrineMigrations/Version20160812120952.php

@@ -7,6 +7,9 @@ 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
 {
     /**
@@ -21,7 +24,7 @@ class Version20160812120952 extends AbstractMigration implements ContainerAwareI
 
     private function getTable($tableName)
     {
-        return $this->container->getParameter('database_table_prefix') . $tableName;
+        return $this->container->getParameter('database_table_prefix').$tableName;
     }
 
     /**
@@ -29,11 +32,10 @@ class Version20160812120952 extends AbstractMigration implements ContainerAwareI
      */
     public function up(Schema $schema)
     {
-        if ($this->connection->getDatabasePlatform()->getName() == 'sqlite') {
-            $this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' ADD name longtext DEFAULT NULL');
-        } else {
-            $this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' ADD name longtext COLLATE \'utf8_unicode_ci\' DEFAULT NULL');
-        }
+        $clientsTable = $schema->getTable($this->getTable('oauth2_clients'));
+        $this->skipIf($clientsTable->hasColumn('name'), 'It seems that you already played this migration.');
+
+        $clientsTable->addColumn('name', 'blob');
     }
 
     /**
@@ -41,8 +43,7 @@ class Version20160812120952 extends AbstractMigration implements ContainerAwareI
      */
     public function down(Schema $schema)
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() == 'sqlite', 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
-
-        $this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' DROP COLUMN name');
+        $clientsTable = $schema->getTable($this->getTable('oauth2_clients'));
+        $clientsTable->dropColumn('name');
     }
 }

app/DoctrineMigrations/Version20160911214952.php

@@ -7,6 +7,9 @@ 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
 {
     /**
@@ -21,7 +24,7 @@ class Version20160911214952 extends AbstractMigration implements ContainerAwareI
 
     private function getTable($tableName)
     {
-        return $this->container->getParameter('database_table_prefix') . $tableName;
+        return $this->container->getParameter('database_table_prefix').$tableName;
     }
 
     /**
@@ -29,8 +32,25 @@ class Version20160911214952 extends AbstractMigration implements ContainerAwareI
      */
     public function up(Schema $schema)
     {
-        $this->addSql('INSERT INTO `'.$this->getTable('craue_config_setting').'` (`name`, `value`, `section`) VALUES (\'import_with_redis\', \'0\', \'import\')');
-        $this->addSql('INSERT INTO `'.$this->getTable('craue_config_setting').'` (`name`, `value`, `section`) VALUES (\'import_with_rabbitmq\', \'0\', \'import\')');
+        $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.');
     }
 
     /**
@@ -38,5 +58,7 @@ class Version20160911214952 extends AbstractMigration implements ContainerAwareI
      */
     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';");
     }
 }

app/DoctrineMigrations/Version20160916201049.php

@@ -7,6 +7,9 @@ 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
 {
     /**
@@ -21,7 +24,7 @@ class Version20160916201049 extends AbstractMigration implements ContainerAwareI
 
     private function getTable($tableName)
     {
-        return $this->container->getParameter('database_table_prefix') . $tableName;
+        return $this->container->getParameter('database_table_prefix').$tableName;
     }
 
     /**
@@ -29,8 +32,12 @@ class Version20160916201049 extends AbstractMigration implements ContainerAwareI
      */
     public function up(Schema $schema)
     {
-        $this->addSql('ALTER TABLE '.$this->getTable('config').' ADD pocket_consumer_key VARCHAR(255) DEFAULT NULL');
-        $this->addSql("DELETE FROM `".$this->getTable('craue_config_setting')."` WHERE `name` = 'pocket_consumer_key';");
+        $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';");
     }
 
     /**
@@ -38,9 +45,8 @@ class Version20160916201049 extends AbstractMigration implements ContainerAwareI
      */
     public function down(Schema $schema)
     {
-        $this->abortIf($this->connection->getDatabasePlatform()->getName() == 'sqlite', 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.');
-
-        $this->addSql('ALTER TABLE `'.$this->getTable('config').'` DROP pocket_consumer_key');
-        $this->addSql("INSERT INTO `".$this->getTable('craue_config_setting')."` (`name`, `value`, `section`) VALUES ('pocket_consumer_key', NULL, 'import')");
+        $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')");
     }
 }

app/DoctrineMigrations/Version20161001072726.php

@@ -0,0 +1,127 @@
+<?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 ...');
+    }
+}

app/DoctrineMigrations/Version20161022134138.php

@@ -0,0 +1,85 @@
+<?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;');
+    }
+}

app/DoctrineMigrations/Version20161024212538.php

@@ -0,0 +1,67 @@
+<?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);
+        }
+    }
+}

app/DoctrineMigrations/Version20161031132655.php

@@ -0,0 +1,52 @@
+<?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';");
+    }
+}

app/DoctrineMigrations/Version20161104073720.php

@@ -0,0 +1,53 @@
+<?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);
+    }
+}

app/DoctrineMigrations/Version20161106113822.php

@@ -0,0 +1,56 @@
+<?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');
+    }
+}

app/DoctrineMigrations/Version20161117071626.php

@@ -0,0 +1,64 @@
+<?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';");
+    }
+}

app/DoctrineMigrations/Version20161118134328.php

@@ -0,0 +1,56 @@
+<?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');
+    }
+}

app/DoctrineMigrations/Version20161122144743.php

@@ -0,0 +1,52 @@
+<?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';");
+    }
+}

app/DoctrineMigrations/Version20161122203647.php

@@ -0,0 +1,63 @@
+<?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]);
+    }
+}

app/DoctrineMigrations/Version20161128084725.php

@@ -0,0 +1,49 @@
+<?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');
+    }
+}

app/DoctrineMigrations/Version20161128131503.php

@@ -0,0 +1,61 @@
+<?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]);
+        }
+    }
+}

app/DoctrineMigrations/Version20161214094402.php

@@ -0,0 +1,75 @@
+<?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');
+        }
+    }
+}

app/DoctrineMigrations/Version20161214094403.php

@@ -0,0 +1,53 @@
+<?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);
+    }
+}

app/DoctrineMigrations/Version20170127093841.php

@@ -0,0 +1,56 @@
+<?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);
+    }
+}

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml

@@ -1,3 +1,4 @@
+# settings_changed: Configuration updated
 download_pictures: Download billeder på din server
 carrot: Aktiver deling til Carrot
 diaspora_url: Diaspora URL, hvis tjenesten er aktiv
@@ -15,6 +16,7 @@ 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
@@ -23,9 +25,11 @@ export: "eksport"
 import: "import"
 misc: "misc"
 modify_settings: "Gem ændring"
-piwik_host: Hosting af din side hos Piwik
+piwik_host: Hosting af din side hos Piwik (uden http:// eller https://)
 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

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml

@@ -1,20 +1,22 @@
+# 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: Enable RabbitMQ to import data asynchronously
-# import_with_redis: Enable Redis to import data asynchronously
+import_with_rabbitmq: Aktiviere RabbitMQ, um Artikel asynchron zu importieren
+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
@@ -23,9 +25,11 @@ export: "Export"
 import: "Import"
 misc: "Verschiedenes"
 modify_settings: "Übernehmen"
-piwik_host: Host deiner Webseite in Piwik
+piwik_host: Host deiner Webseite in Piwik (ohne http:// oder https://)
 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: Allow public url for entries
+share_public: Erlaube eine öffentliche URL für Einträge
+# download_images_enabled: Download images locally
+# restricted_access: Enable authentication for websites with paywall

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml

@@ -1,3 +1,4 @@
+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
@@ -15,6 +16,7 @@ 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
@@ -23,9 +25,11 @@ export: "export"
 import: "import"
 misc: "misc"
 modify_settings: "apply"
-piwik_host: Host of your website in Piwik
+piwik_host: Host of your website in Piwik (without http:// ou 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

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml

@@ -1,3 +1,4 @@
+# settings_changed: Configuration updated
 download_pictures: Descargar imágenes
 carrot: Activar compartir con Carrot
 diaspora_url: Diaspora URL, si el servicio está activado
@@ -15,6 +16,7 @@ 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
@@ -23,9 +25,11 @@ export: "exportar"
 import: "importar"
 misc: "misc"
 modify_settings: "modificar configuración"
-piwik_host: Host de tu website de Piwik
+piwik_host: Host de tu website de Piwik (sin http:// o https://)
 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

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml

@@ -1,3 +1,4 @@
+# settings_changed: Configuration updated
 download_pictures: تصاویر را در کارگزار خودتان باربگیرید
 carrot: فعال‌سازی هم‌رسانی به Carrot
 diaspora_url: نشانی Diaspora، اگر فعال بود
@@ -15,6 +16,7 @@ share_diaspora: فعال‌سازی هم‌رسانی به Diaspora
 share_mail:  فعال‌سازی هم‌رسانی با ایمیل
 share_shaarli:  فعال‌سازی هم‌رسانی به Shaarli
 share_twitter:  فعال‌سازی هم‌رسانی به Twitter
+share_unmark:  فعال‌سازی هم‌رسانی به Unmark.it
 show_printlink: نمایش پیوندی برای چاپ مطلب
 wallabag_support_url: نشانی صفحهٔ پشتیبانی wallabag
 wallabag_url: نشانی صفحهٔ wallabag *شما*
@@ -23,9 +25,11 @@ export: "برون‌سپاری"
 import: "درون‌ریزی"
 misc: "غیره"
 modify_settings: "اعمال"
-# piwik_host: Host of your website in Piwik
+# 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

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml

@@ -1,3 +1,4 @@
+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é
@@ -15,6 +16,7 @@ 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
@@ -23,9 +25,11 @@ export: "export"
 import: "import"
 misc: "divers"
 modify_settings: "appliquer"
-piwik_host: URL de votre site dans Piwik
+piwik_host: URL de votre site dans Piwik (sans http:// ou https://)
 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

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml

@@ -1,3 +1,4 @@
+# settings_changed: Configuration updated
 download_pictures: Scarica le immagini sul tuo server
 carrot: Abilita la condivisione con Carrot
 diaspora_url: Diaspora URL, se il servizio è abilitato
@@ -15,6 +16,7 @@ share_diaspora: Abilita la condivisione con Diaspora
 share_mail: Abilita la condivisione per email
 share_shaarli: Abilita la condivisione con Shaarli
 share_twitter: Abilita la condivisione con 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
@@ -23,9 +25,11 @@ export: "esporta"
 import: "importa"
 misc: "misc"
 modify_settings: "applica"
-piwik_host: Host del tuo sito in Piwik
+piwik_host: Host del tuo sito in Piwik (senza http:// o https://)
 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_username: "Utente Demo"
 # share_public: Allow public url for entries
+# download_images_enabled: Download images locally
+# restricted_access: Enable authentication for websites with paywall

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml

@@ -1,3 +1,4 @@
+# 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
@@ -15,6 +16,7 @@ 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
@@ -23,9 +25,11 @@ export: "expòrt"
 import: "impòrt"
 misc: "divèrs"
 modify_settings: "aplicar"
-piwik_host: URL de vòstre site dins Piwik
+piwik_host: URL de vòstre site dins Piwik (sense http:// o https://)
 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

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml

@@ -1,3 +1,4 @@
+# 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
@@ -15,6 +16,7 @@ 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
@@ -23,9 +25,11 @@ export: "eksport"
 import: "import"
 misc: "różne"
 modify_settings: "zatwierdz"
-piwik_host: Host twojej strony Piwik
+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

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml

@@ -0,0 +1,35 @@
+# 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

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml

@@ -1,3 +1,4 @@
+# settings_changed: Configuration updated
 download_pictures: Descarcă poze pe server
 carrot: Permite share către Carrot
 diaspora_url: Diaspora URL, dacă serviciul este permis
@@ -15,6 +16,7 @@ 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
@@ -23,9 +25,11 @@ export: "exportă"
 import: "importă"
 misc: "diverse"
 modify_settings: "aplică"
-# piwik_host: Host of your website in Piwik
+# 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

app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml

@@ -1,3 +1,4 @@
+# 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
@@ -15,6 +16,7 @@
 # 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
@@ -23,9 +25,11 @@
 # import: "import"
 # misc: "misc"
 # modify_settings: "apply"
-# piwik_host: Host of your website in Piwik
+# 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

app/Resources/CraueConfigBundle/views/Settings/modify.html.twig

@@ -1,6 +1,6 @@
 {% extends "WallabagCoreBundle::layout.html.twig" %}
 
-{% block title %}{% trans %}internal settings{% endtrans %}{% endblock %}
+{% block title %}{{ 'menu.left.internal_settings'|trans }}{% 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 s3"><a href="#set-{{ section }}">{{ section | trans({}, 'CraueConfigBundle') }}</a></li>
+                                    <li class="tab col s12 m6 l3"><a href="#set-{{ section }}">{{ section | trans({}, 'CraueConfigBundle') }}</a></li>
                                 {% endfor %}
                             </ul>
                         </div>

app/Resources/FOSUserBundle/translations/FOSUserBundle.da.yml

@@ -1,2 +0,0 @@
-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."

app/Resources/FOSUserBundle/translations/FOSUserBundle.de.yml

@@ -1,2 +0,0 @@
-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."

app/Resources/FOSUserBundle/translations/FOSUserBundle.es.yml

@@ -1,2 +0,0 @@
-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."

app/Resources/FOSUserBundle/translations/FOSUserBundle.fr.yml

@@ -1,2 +0,0 @@
-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."

app/Resources/FOSUserBundle/translations/FOSUserBundle.oc.yml

@@ -1,2 +0,0 @@
-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."

app/Resources/FOSUserBundle/translations/FOSUserBundle.pl.yml

@@ -1,2 +0,0 @@
-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."

app/Resources/static/themes/_global/js/bookmarklet.js

@@ -1,4 +1,3 @@
-
 top['bookmarklet-url@wallabag.org'] =
     '<!DOCTYPE html><html><head><title>bag it!</title>' +
     '<link rel="icon" href="tpl/img/favicon.ico" />' +

app/Resources/static/themes/_global/js/shortcuts/main.js

@@ -0,0 +1,15 @@
+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'); });

app/Resources/static/themes/_global/js/tools.js

@@ -1,4 +1,9 @@
-const $ = require('jquery');
+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 {
@@ -30,7 +35,7 @@ function initFilters() {
   // no display if filters not available
   if ($('div').is('#filters')) {
     $('#button_filters').show();
-    $('.button-collapse-right').sideNav({ edge: 'right' });
+    $('.js-filters-action').sideNav({ edge: 'right' });
     $('#clear_form_filters').on('click', () => {
       $('#filters input').val('');
       $('#filters :checked').removeAttr('checked');
@@ -43,7 +48,7 @@ function initExport() {
   // no display if export not available
   if ($('div').is('#export')) {
     $('#button_export').show();
-    $('.button-collapse-right').sideNav({ edge: 'right' });
+    $('.js-export-action').sideNav({ edge: 'right' });
   }
 }
 

app/Resources/static/themes/baggy/css/main.css

@@ -297,18 +297,14 @@ h2::after {
   text-decoration: none;
 }
 
-#listmode a:hover {
-  opacity: 1;
-}
-
 #listmode.tablemode {
-  background-image: url("../img/baggy/table.png");
+  background-image: url("../../_global/img/table.png");
   background-repeat: no-repeat;
   background-position: bottom;
 }
 
 #listmode.listmode {
-  background-image: url("../img/baggy/list.png");
+  background-image: url("../../_global/img/list.png");
   background-repeat: no-repeat;
   background-position: bottom;
 }
@@ -352,9 +348,9 @@ footer a {
   letter-spacing: -5px;
 }
 
-.listmode .entry {
-  width: 100% !important;
-  margin-left: 0 !important;
+.listmode.entry {
+  width: 100%;
+  height: inherit;
 }
 
 .card-entry-labels {
@@ -383,9 +379,11 @@ footer a {
   max-height: 2em;
   overflow-y: hidden;
   padding: 0;
+  margin: 0;
 }
 
-.card-entry-tags li {
+.card-entry-tags li,
+.card-entry-tags span {
   display: inline-block;
   margin: 0 5px;
   padding: 5px 12px;
@@ -394,14 +392,25 @@ footer a {
   max-height: 2em;
   overflow: hidden;
   text-overflow: ellipsis;
+}
+
+.card-entry-tags a,
+.card-entry-labels a {
+  text-decoration: none;
+  font-weight: normal;
   color: #fff;
 }
 
+.nav-panel-add-tag {
+  margin-top: 10px;
+}
+
 .list-entries + .results {
   margin-bottom: 2em;
 }
 
-.estimatedTime .reading-time {
+.reading-time,
+.created-at {
   color: #999;
   font-style: italic;
   font-weight: normal;
@@ -509,6 +518,7 @@ img.preview {
   color: #666;
   font-size: 0.9em;
   line-height: 1.7;
+  margin-top: 5px;
 }
 
 .entry h2 a::first-letter {
@@ -568,13 +578,13 @@ img.preview {
 
 div.pagination ul {
   text-align: right;
-  margin-bottom: 50px;
 }
 
 .nb-results {
   text-align: left;
   font-style: italic;
   color: #999;
+  display: inline-flex;
 }
 
 div.pagination ul > * {
@@ -607,6 +617,10 @@ div.pagination ul .current {
   background-color: #ccc;
 }
 
+.hide {
+  display: none;
+}
+
 /* ==========================================================================
   2.1 = "save a link" related styles
   ========================================================================== */
@@ -923,6 +937,11 @@ a.add-to-wallabag-link-after::after {
   background-image: url("../../_global/img/icons/diaspora-icon--black.png");
 }
 
+/* Unmark.it */
+.icon-image--unmark {
+  background-image: url("../../_global/img/icons/unmark-icon--black.png");
+}
+
 /* shaarli */
 .icon-image--shaarli {
   background-image: url("../../_global/img/icons/shaarli.png");
@@ -1021,6 +1040,7 @@ blockquote {
 
 #article_toolbar li {
   display: inline-block;
+  margin: 3px auto;
 }
 
 #article_toolbar a {
@@ -1178,6 +1198,14 @@ pre code {
   }
 }
 
+@media screen and (max-height: 770px) {
+  .menu.users,
+  .menu.internal,
+  .menu.developer {
+    display: none;
+  }
+}
+
 @media screen and (max-width: 500px) {
   .entry {
     width: 100%;

app/Resources/static/themes/baggy/js/autoCompleteTags.js

@@ -5,4 +5,4 @@ function extractLast(term) {
   return split(term).pop();
 }
 
-export { split, extractLast };
+export default { split, extractLast };

app/Resources/static/themes/baggy/js/init.js

@@ -1,11 +1,26 @@
+/* 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';
-
-const $ = global.jquery = require('jquery');
-require('jquery.cookie');
-require('jquery-ui-browserify');
-const annotator = require('annotator');
+import toggleSaveLinkForm from './uiTools';
 
+global.jquery = $;
 
 $.fn.ready(() => {
   const $listmode = $('#listmode');

app/Resources/static/themes/baggy/js/shortcuts/entry.js

@@ -0,0 +1,26 @@
+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();
+    });
+  }
+});

app/Resources/static/themes/baggy/js/shortcuts/main.js

@@ -0,0 +1,7 @@
+$(document).ready(() => {
+  Mousetrap.bind('s', () => {
+    $('#search').trigger('click');
+    $('#search_entry_term').focus();
+    return false;
+  });
+});

app/Resources/static/themes/baggy/js/uiTools.js

@@ -1,4 +1,4 @@
-const $ = require('jquery');
+import $ from 'jquery';
 
 function toggleSaveLinkForm(url, event) {
   $('#add-link-result').empty();
@@ -32,4 +32,4 @@ function toggleSaveLinkForm(url, event) {
   plainUrl.focus();
 }
 
-export { toggleSaveLinkForm };
+export default toggleSaveLinkForm;

app/Resources/static/themes/material/css/main.css

@@ -17,12 +17,11 @@
    0 = Common
    ========================================================================== */
 
-@font-face {
-  font-family: icomoon;
-  src: url("../fonts/IcoMoon-Free.ttf");
-  font-weight: normal;
-  font-style: normal;
-}
+/**
+ *
+ * Material icons
+ *
+ */
 
 @font-face {
   font-family: 'Material Icons';
@@ -62,6 +61,33 @@
   font-feature-settings: 'liga';
 }
 
+/* Rules for sizing the icon. */
+.material-icons.md-18 { font-size: 18px; }
+.material-icons.md-24 { font-size: 24px; }
+.material-icons.md-36 { font-size: 36px; }
+.material-icons.md-48 { font-size: 48px; }
+
+/* Rules for using icons as black on a light background. */
+.material-icons.md-dark { color: rgba(0, 0, 0, 0.54); }
+.material-icons.md-dark.md-inactive { color: rgba(0, 0, 0, 0.26); }
+
+/* Rules for using icons as white on a dark background. */
+.material-icons.md-light { color: rgba(255, 255, 255, 1); }
+.material-icons.md-light.md-inactive { color: rgba(255, 255, 255, 0.3); }
+
+/**
+ *
+ * Icomoon icons
+ *
+ */
+
+@font-face {
+  font-family: icomoon;
+  src: url("../fonts/IcoMoon-Free.ttf");
+  font-weight: normal;
+  font-style: normal;
+}
+
 [class^="icon-"]::before,
 [class*=" icon-"]::before {
   font-family: icomoon;
@@ -124,6 +150,11 @@
   background-image: url("../../_global/img/icons/diaspora-icon--black.png");
 }
 
+/* Unmark.it */
+.icon-image--unmark {
+  background-image: url("../../_global/img/icons/unmark-icon--black.png");
+}
+
 /* Shaarli */
 .icon-image--shaarli {
   background-image: url("../../_global/img/icons/shaarli.png");
@@ -133,7 +164,7 @@ body {
   display: flex;
   min-height: 100vh;
   flex-direction: column;
-  background: #f0f0f0;
+  background: #fafafa;
 }
 
 body.login main {
@@ -163,7 +194,6 @@ main,
 
 .results {
   height: 1em;
-  line-height: 30px;
 }
 
 .results .nb-results,
@@ -172,6 +202,14 @@ main,
   margin-bottom: 0;
 }
 
+.results .nb-results {
+  display: inline-flex;
+}
+
+.results a {
+  color: #444;
+}
+
 .pagination {
   float: right;
 }
@@ -207,8 +245,17 @@ div.pagination ul .next.disabled {
   color: #fff;
 }
 
+.page-footer .footer-copyright {
+  min-width: 50px;
+  height: auto !important;
+  line-height: 1em !important;
+}
+
 .page-footer .footer-copyright p {
-  display: inline;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  display: block;
 }
 
 .hidden {
@@ -236,6 +283,16 @@ nav input {
   color: #aaa;
 }
 
+nav {
+  height: auto;
+}
+
+.nav-wrapper {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+}
+
 .nav-wrapper .button-collapse {
   padding: 0 15px;
 }
@@ -244,8 +301,10 @@ nav input {
   display: none;
 }
 
-.nav-panels {
-  overflow: hidden;
+.nav-panel-buttom {
+  display: flex;
+  flex-grow: 1;
+  justify-content: flex-end;
 }
 
 .nav-panel-buttom li {
@@ -282,11 +341,13 @@ nav input {
   color: #444;
 }
 
-.input-field.nav-panel-add label {
+.input-field.nav-panel-add label,
+.input-field.nav-panel-search label {
   left: 1rem;
 }
 
-.input-field.nav-panel-add .close {
+.input-field.nav-panel-add .close,
+.input-field.nav-panel-search .close {
   position: absolute;
   top: 0;
   right: 1rem;
@@ -305,8 +366,10 @@ nav input {
 }
 
 .input-field.nav-panel-add,
-.input-field.nav-panel-add form {
-  height: 100%;
+.input-field.nav-panel-add form,
+.input-field.nav-panel-search,
+.input-field.nav-panel-search form {
+  flex-grow: 1;
 }
 
 /* ==========================================================================
@@ -360,6 +423,10 @@ span.numberItems {
   float: right;
 }
 
+nav ul a:hover {
+  background-color: initial;
+}
+
 /* ==========================================================================
  * 3 = Filters slider
  * ========================================================================== */
@@ -372,7 +439,6 @@ span.numberItems {
 .side-nav.fixed.right-aligned {
   right: -250px;
   left: auto !important;
-  overflow-y: visible;
 }
 
 #filters div.with-checkbox {
@@ -393,13 +459,23 @@ main ul.row {
 }
 
 .data .card .card-body {
-  height: 22em;
+  height: 19em;
   overflow: hidden;
 }
 
-.card .card-content .card-title {
-  line-height: 32px;
-  max-height: 64px;
+.card .card-content .card-title,
+.card .card-reveal .card-title {
+  line-height: 22.8px;
+  max-height: 80px;
+  font-size: 19px;
+  font-family: roberto, "Helvetica Neue", Helvetica, Arial, sans-serif;
+  color: #313131;
+}
+
+.card .card-content .activator,
+.card .card-reveal .activator {
+  cursor: pointer;
+  font-family: "Material Icons";
 }
 
 .card .card-content i.right,
@@ -407,6 +483,18 @@ main ul.row {
   margin-left: 0;
 }
 
+.card .card-content .original {
+  line-height: 24px;
+  font-size: 15px;
+}
+
+a.original {
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow: hidden;
+  display: block;
+}
+
 .card .card-entry-labels {
   position: absolute;
   top: 10px;
@@ -414,9 +502,10 @@ main ul.row {
   max-width: 50%;
 }
 
-.card .card-entry-labels li {
+.card .card-entry-labels li,
+.card-tag-labels li {
   margin: 10px 10px 10px auto;
-  padding: 5px 12px 5px 16px;
+  padding: 5px 12px 5px 16px !important;
   background-color: rgba(0, 151, 167, 0.85);
   border-radius: 0 3px 3px 0;
   color: #fff;
@@ -428,7 +517,7 @@ main ul.row {
 }
 
 .card .card-entry-labels-hidden {
-  margin-top: 5px;
+  margin: 2.5px auto;
 }
 
 .card .card-entry-labels-hidden li {
@@ -445,12 +534,26 @@ main ul.row {
   white-space: nowrap;
 }
 
+.card .card-entry-labels-hidden li:first-child {
+  margin-left: 0;
+}
+
+.card-entry-tags a,
+.card-entry-labels a,
+.card-tag-labels a,
+.card-entry-labels-hidden a,
+#list .chip a {
+  text-decoration: none;
+  font-weight: normal;
+  color: #fff;
+}
+
 .card .card-content .estimatedTime {
   margin-bottom: 10px;
 }
 
-.card .card-action .original {
-  line-height: 24px;
+.card .card-action {
+  padding: 10px 5px 10px 15px;
 }
 
 .card .card-action ul.links {
@@ -459,6 +562,18 @@ main ul.row {
   line-height: 24px;
 }
 
+.card .card-action ul.tools li a.tool {
+  margin-right: 5px !important;
+}
+
+.card-stacked:hover ul.tools-list {
+  display: block;
+}
+
+.card-stacked ul.tools-list {
+  display: none;
+}
+
 .card .card-action a {
   color: #fff;
   margin: 0;
@@ -468,6 +583,11 @@ main ul.row {
   color: #fff;
 }
 
+.card .card-action .reading-time {
+  display: inline-flex;
+  vertical-align: middle;
+}
+
 .quickstart .card .card-action a,
 .quickstart .card .card-action a:hover {
   color: #fff !important;
@@ -484,10 +604,15 @@ main ul.row {
 }
 
 .card .card-image {
-  height: 14em;
+  height: 10em;
 }
 
-.card .card-image .preview {
+.card .card-fullimage {
+  height: 13.5em;
+}
+
+.card .card-image .preview,
+.card .card-fullimage .preview {
   height: 14em;
   background-size: cover;
   background-repeat: no-repeat;
@@ -501,7 +626,55 @@ main ul.row {
 #article {
   font-size: 20px;
   margin: 0 auto;
-  max-width: 40em;
+  max-width: 45em;
+}
+
+#article article {
+  color: #424242;
+  font-size: 18px;
+  line-height: 1.7em;
+}
+
+#article article h1,
+#article article h2,
+#article article h3,
+#article article h4,
+#article article h5,
+#article article h6 {
+  color: #212121;
+}
+
+#article article h1 strong,
+#article article h2 strong,
+#article article h3 strong,
+#article article h4 strong,
+#article article h5 strong,
+#article article h6 strong {
+  font-weight: 500;
+}
+
+#article article h6 {
+  font-size: 1.2rem;
+}
+
+#article article h5 {
+  font-size: 1.6rem;
+}
+
+#article article h4 {
+  font-size: 1.9rem;
+}
+
+#article article h3 {
+  font-size: 2.2rem;
+}
+
+#article article h2 {
+  font-size: 2.5rem;
+}
+
+#article article h1 {
+  font-size: 2.7rem;
 }
 
 #article img,
@@ -510,8 +683,49 @@ main ul.row {
   height: auto;
 }
 
+#article article a {
+  border-bottom: 1px dotted #03a9f4;
+  text-decoration: none;
+}
+
+#article article a:hover {
+  border-bottom-style: solid;
+}
+
+#article article ul {
+  padding-left: 30px;
+}
+
+#article article ul,
+#article article ul li {
+  list-style-type: disc;
+}
+
+#article article blockquote {
+  font-style: italic;
+}
+
+#article article strong {
+  font-weight: bold;
+}
+
+#article article pre {
+  box-sizing: border-box;
+  margin: 0 0 1.75em;
+  border: #e3f2fd 1px solid;
+  width: 100%;
+  padding: 10px;
+  font-family: monospace;
+  font-size: 0.8em;
+  white-space: pre;
+  overflow: auto;
+  background: #f5f5f5;
+  border-radius: 3px;
+}
+
 #article > header > h1 {
   font-size: 2em;
+  margin: 2.1rem 0 0.68rem;
 }
 
 .reader-mode {
@@ -550,9 +764,20 @@ main ul.row {
   z-index: 9999;
 }
 
-#article aside .link {
-  color: #000;
+#article aside .tools {
   font-size: 0.8em;
+  display: flex;
+  flex-flow: row wrap;
+  margin: 0 auto;
+}
+
+article aside .tools li {
+  display: inline-flex;
+  vertical-align: middle;
+}
+
+#article aside .tools a {
+  color: #000;
   text-decoration: none;
 }
 
@@ -563,10 +788,11 @@ main ul.row {
 
 #article aside .chip {
   background-color: rgba(0, 151, 167, 0.85);
-  color: #fff;
   padding: 0 15px 0 10px;
+  margin: auto 2px;
 }
 
+#article aside .chip a,
 #article aside .chip i {
   color: #fff;
 }
@@ -592,6 +818,25 @@ main ul.row {
     width: auto;
   }
 
+  .nav-panels .action {
+    padding-right: 0.75rem;
+  }
+
+  .nav-panel-buttom {
+    justify-content: space-around;
+  }
+
+  #article {
+    max-width: 35em;
+    margin-left: auto;
+    margin-right: auto;
+    font-size: 18px;
+  }
+
+  #article > header > h1 {
+    font-size: 1.33em;
+  }
+
   .reader-mode {
     width: 240px !important;
   }
@@ -617,15 +862,24 @@ main ul.row {
   .pagination li.next {
     width: auto;
   }
-}
 
-@media only screen and (min-width: 400px) {
-  .nav-panel-buttom {
-    float: right;
+  .drag-target + .drag-target {
+    height: 50%;
+  }
+
+  .drag-target + .drag-target + .drag-target {
+    top: 50%;
   }
 }
 
-@media only screen and (min-width: 993px) and (max-width: 1180px) {
+@media only screen and (min-width: 1200px) and (max-width: 1650px) {
+  .row .col.l3 {
+    width: 33.33333%;
+    margin-left: 0;
+  }
+}
+
+@media only screen and (min-width: 993px) and (max-width: 1200px) {
   .row .col.l1 {
     width: 25%;
     margin-left: 0;
@@ -681,6 +935,14 @@ main ul.row {
   .nb-results {
     display: none;
   }
+
+  main ul.row {
+    padding: 0;
+  }
+
+  .row .col {
+    padding: 0;
+  }
 }
 
 /* ==========================================================================
@@ -749,3 +1011,7 @@ div.settings div.file-field div {
 .input-field label.active {
   font-size: 1rem;
 }
+
+nav .input-field input {
+  margin: 0;
+}

app/Resources/static/themes/material/js/init.js

@@ -1,10 +1,21 @@
+/* jQuery */
+import $ from 'jquery';
+
+/* Annotations */
+import annotator from 'annotator';
+
+/* Tools */
 import { savePercent, retrievePercent, initFilters, initExport } from '../../_global/js/tools';
 
-const $ = require('jquery');
+/* 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 = $;
-require('materialize'); // eslint-disable-line
-const annotator = require('annotator');
 
 $(document).ready(() => {
   // sideNav
@@ -44,7 +55,7 @@ $(document).ready(() => {
     $('.nav-panels .action').hide(100);
     $('.nav-panel-menu').addClass('hidden');
     $('.nav-panels').css('background', 'white');
-    $('#searchfield').focus();
+    $('#search_entry_term').focus();
     return false;
   });
   $('.close').on('click', () => {

app/Resources/static/themes/material/js/shortcuts/entry.js

@@ -0,0 +1,26 @@
+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();
+    });
+  }
+});

app/Resources/static/themes/material/js/shortcuts/main.js

@@ -0,0 +1,75 @@
+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');
+  });
+});

app/config/capistrano/deploy.rb

@@ -1,9 +1,4 @@
 # 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'
@@ -11,8 +6,6 @@ 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
@@ -23,4 +16,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:finishing', 'deploy:cleanup'
+after 'deploy:updated', 'symfony:cache:clear'

app/config/config.yml

@@ -30,7 +30,7 @@ framework:
     assets: ~
 
 wallabag_core:
-    version: 2.1.1
+    version: 2.2.1
     paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
     languages:
         en: 'English'
@@ -44,12 +44,17 @@ wallabag_core:
         es: 'Español'
         oc: 'Occitan'
         it: 'Italiano'
+        pt: 'Português'
     items_on_page: 12
     theme: material
-    language: en
+    language: '%locale%'
     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%"
@@ -75,8 +80,9 @@ doctrine:
         dbname: "%database_name%"
         user: "%database_user%"
         password: "%database_password%"
-        charset: UTF8
+        charset: "%database_charset%"
         path: "%database_path%"
+        unix_socket: "%database_socket%"
         server_version: 5.6
 
     orm:
@@ -111,12 +117,26 @@ swiftmailer:
 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:
@@ -125,10 +145,21 @@ 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:
@@ -181,6 +212,7 @@ fos_user:
     from_email:
         address:        "%from_email%"
         sender_name:    wallabag
+
 fos_oauth_server:
     db_driver:           orm
     client_class:        Wallabag\ApiBundle\Entity\Client
@@ -188,7 +220,9 @@ fos_oauth_server:
     refresh_token_class: Wallabag\ApiBundle\Entity\RefreshToken
     auth_code_class:     Wallabag\ApiBundle\Entity\AuthCode
     service:
-        user_provider: fos_user.user_manager
+        user_provider: fos_user.user_provider.username_email
+        options:
+            refresh_token_lifetime: 1209600
 
 scheb_two_factor:
     trusted_computer:
@@ -207,16 +241,6 @@ kphoen_rulerz:
     executors:
         doctrine: true
 
-lexik_maintenance:
-    authorized:
-        ips: ['127.0.0.1']
-    driver:
-        ttl: 3600
-        class: 'Lexik\Bundle\MaintenanceBundle\Drivers\DatabaseDriver'
-    response:
-        code: 503
-        status: "wallabag Service Temporarily Unavailable"
-
 old_sound_rabbit_mq:
     connections:
         default:
@@ -237,6 +261,11 @@ old_sound_rabbit_mq:
             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:
@@ -271,6 +300,7 @@ old_sound_rabbit_mq:
             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:
@@ -279,6 +309,7 @@ old_sound_rabbit_mq:
             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:
@@ -287,6 +318,16 @@ old_sound_rabbit_mq:
             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:
@@ -295,6 +336,7 @@ old_sound_rabbit_mq:
             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:
@@ -303,6 +345,7 @@ old_sound_rabbit_mq:
             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:
@@ -311,6 +354,7 @@ old_sound_rabbit_mq:
             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:
@@ -319,3 +363,18 @@ old_sound_rabbit_mq:
             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

app/config/config_test.yml

@@ -28,7 +28,7 @@ doctrine:
         dbname: "%test_database_name%"
         user: "%test_database_user%"
         password: "%test_database_password%"
-        charset: UTF8
+        charset: "%test_database_charset%"
         path: "%test_database_path%"
     orm:
         metadata_cache_driver:

app/config/parameters.yml.dist

@@ -18,16 +18,19 @@ 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
-    mailer_user:       ~
-    mailer_password:   ~
+    mailer_transport: smtp
+    mailer_host: 127.0.0.1
+    mailer_user: ~
+    mailer_password: ~
 
-    locale:            en
+    locale: en
 
     # A secret key that's used to generate certain security-related tokens
-    secret:            ovmpmAWXRCabNlMgzlzFXDYmCFfzGv
+    secret: ovmpmAWXRCabNlMgzlzFXDYmCFfzGv
 
     # two factor stuff
     twofactor_auth: true
@@ -46,7 +49,14 @@ parameters:
     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: {}

app/config/parameters_test.yml

@@ -6,3 +6,4 @@ parameters:
     test_database_user: null
     test_database_password: null
     test_database_path: '%kernel.root_dir%/../data/db/wallabag_test.sqlite'
+    test_database_charset: utf8

app/config/routing.yml

@@ -13,7 +13,8 @@ wallabag_user:
     prefix: /users
 
 wallabag_api:
-    resource: "@WallabagApiBundle/Resources/config/routing.yml"
+    resource: "@WallabagApiBundle/Controller/"
+    type: annotation
     prefix: /
 
 app:
@@ -47,3 +48,6 @@ craue_config_settings_modify:
     path: /settings
     defaults:
         _controller: CraueConfigBundle:Settings:modify
+
+fos_js_routing:
+    resource: "@FOSJsRoutingBundle/Resources/config/routing/routing.xml"

app/config/routing_rest.yml

@@ -1,4 +1,3 @@
 Rest_Wallabag:
-  type : rest
-  resource: "@WallabagApiBundle/Resources/config/routing_rest.yml"
-
+    type : rest
+    resource: "@WallabagApiBundle/Resources/config/routing_rest.yml"

app/config/services.yml

@@ -32,13 +32,13 @@ services:
             - { name: twig.extension }
 
     wallabag.locale_listener:
-        class: Wallabag\CoreBundle\EventListener\LocaleListener
+        class: Wallabag\CoreBundle\Event\Listener\LocaleListener
         arguments: ["%kernel.default_locale%"]
         tags:
             - { name: kernel.event_subscriber }
 
     wallabag.user_locale_listener:
-        class: Wallabag\CoreBundle\EventListener\UserLocaleListener
+        class: Wallabag\CoreBundle\Event\Listener\UserLocaleListener
         arguments: ["@session"]
         tags:
             - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin }

app/config/tests/parameters_test.mysql.yml

@@ -6,3 +6,4 @@ parameters:
     test_database_user: root
     test_database_password: ~
     test_database_path: ~
+    test_database_charset: utf8mb4

app/config/tests/parameters_test.pgsql.yml

@@ -6,3 +6,4 @@ parameters:
     test_database_user: travis
     test_database_password: ~
     test_database_path: ~
+    test_database_charset: utf8

app/config/tests/parameters_test.sqlite.yml

@@ -6,3 +6,4 @@ parameters:
     test_database_user: ~
     test_database_password: ~
     test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite"
+    test_database_charset: utf8

build.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="wallabag" default="build">
     <target name="build" depends="clean,prepare,phpunit"/>
-    <target name="prepare-mysql" depends="clean,db_mysql,prepare"/>
-    <target name="prepare-sqlite" depends="clean,db_sqlite,prepare"/>
-    <target name="prepare-pgsql" depends="clean,db_pgsql,prepare"/>
+    <target name="prepare-mysql" depends="clean,prepare_mysql"/>
+    <target name="prepare-sqlite" depends="clean,prepare_sqlite"/>
+    <target name="prepare-pgsql" depends="clean,prepare_pgsql"/>
 
     <target name="clean" description="Cleanup build artifacts">
         <delete dir="${basedir}/var/cache"/>
@@ -26,11 +26,48 @@
             <arg value="doctrine:schema:create"/>
             <arg value="--env=test"/>
         </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:fixtures:load"/>
+            <arg value="--no-interaction"/>
+            <arg value="--env=test"/>
+        </exec>
+    </target>
+
+    <target name="prepare_mysql" description="Run test for MySQL">
+        <delete dir="${basedir}/app/config/parameters.yml"/>
+        <exec executable="cp">
+            <arg value="${basedir}/app/config/tests/parameters_test.mysql.yml"/>
+            <arg value="${basedir}/app/config/parameters_test.yml"/>
+        </exec>
         <exec executable="php">
             <arg value="${basedir}/bin/console"/>
             <arg value="cache:clear"/>
             <arg value="--env=test"/>
         </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:database:drop"/>
+            <arg value="--force"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:database:create"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:database:import"/>
+            <arg value="data/sql/mysql_base.sql"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:migrations:migrate"/>
+            <arg value="--no-interaction"/>
+            <arg value="--env=test"/>
+        </exec>
         <exec executable="php">
             <arg value="${basedir}/bin/console"/>
             <arg value="doctrine:fixtures:load"/>
@@ -39,46 +76,91 @@
         </exec>
     </target>
 
-    <target name="db_mysql" description="Run test for MySQL">
-        <delete dir="${basedir}/app/config/parameters.yml"/>
-        <exec executable="cp">
-            <arg value="${basedir}/app/config/tests/parameters_test.mysql.yml"/>
-            <arg value="${basedir}/app/config/parameters_test.yml"/>
-        </exec>
-
-        <exec executable="php">
-            <arg value="${basedir}/bin/console"/>
-            <arg value="cache:clear"/>
-            <arg value="--env=test"/>
-        </exec>
-    </target>
-
-    <target name="db_sqlite" description="Run test for SQLite">
+    <target name="prepare_sqlite" description="Run test for SQLite">
         <delete dir="${basedir}/app/config/parameters.yml"/>
         <exec executable="cp">
             <arg value="${basedir}/app/config/tests/parameters_test.sqlite.yml"/>
             <arg value="${basedir}/app/config/parameters_test.yml"/>
         </exec>
-
         <exec executable="php">
             <arg value="${basedir}/bin/console"/>
             <arg value="cache:clear"/>
             <arg value="--env=test"/>
         </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:database:drop"/>
+            <arg value="--force"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:database:create"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:schema:create"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:migrations:migrate"/>
+            <arg value="--no-interaction"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:fixtures:load"/>
+            <arg value="--no-interaction"/>
+            <arg value="--env=test"/>
+        </exec>
     </target>
 
-    <target name="db_pgsql" description="Run test for PostgreSQL">
+    <target name="prepare_pgsql" description="Run test for PostgreSQL">
         <delete dir="${basedir}/app/config/parameters.yml"/>
         <exec executable="cp">
             <arg value="${basedir}/app/config/tests/parameters_test.pgsql.yml"/>
             <arg value="${basedir}/app/config/parameters_test.yml"/>
         </exec>
-
         <exec executable="php">
             <arg value="${basedir}/bin/console"/>
             <arg value="cache:clear"/>
             <arg value="--env=test"/>
         </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:database:drop"/>
+            <arg value="--force"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:database:create"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="psql">
+            <arg value="-h"/>
+            <arg value="localhost"/>
+            <arg value="-d"/>
+            <arg value="wallabag_test"/>
+            <arg value="-U"/>
+            <arg value="travis"/>
+            <arg value="-f"/>
+            <arg value="data/sql/pgsql_base.sql"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:migrations:migrate"/>
+            <arg value="--no-interaction"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:fixtures:load"/>
+            <arg value="--no-interaction"/>
+            <arg value="--env=test"/>
+        </exec>
     </target>
 
     <target name="phpunit" description="Run unit tests with PHPUnit + HTML Coverage">

composer.json

@@ -43,54 +43,54 @@
         "ext-iconv": "*",
         "ext-tokenizer": "*",
         "ext-pdo": "*",
-        "symfony/symfony": "3.1.*",
+        "symfony/symfony": "3.2.*",
         "doctrine/orm": "^2.5",
         "doctrine/doctrine-bundle": "^1.6",
         "doctrine/doctrine-cache-bundle": "^1.2",
         "twig/extensions": "~1.0",
         "symfony/swiftmailer-bundle": "^2.3",
-        "symfony/monolog-bundle": "^2.8",
+        "symfony/monolog-bundle": "^3.0",
         "sensio/distribution-bundle": "^5.0",
         "sensio/framework-extra-bundle": "^3.0.2",
         "incenteev/composer-parameter-handler": "^2.0",
         "nelmio/cors-bundle": "~1.4.0",
-        "friendsofsymfony/rest-bundle": "~1.4",
-        "jms/serializer-bundle": "~1.0",
+        "friendsofsymfony/rest-bundle": "~2.1",
+        "jms/serializer-bundle": "~1.1",
         "nelmio/api-doc-bundle": "~2.7",
         "mgargano/simplehtmldom": "~1.5",
-        "tecnickcom/tcpdf": "~6.2",
+        "tecnickcom/tc-lib-pdf": "dev-master",
         "simplepie/simplepie": "~1.3.1",
         "willdurand/hateoas-bundle": "~1.0",
         "htmlawed/htmlawed": "~1.1.19",
         "liip/theme-bundle": "~1.1",
-        "pagerfanta/pagerfanta": "~1.0.3",
         "lexik/form-filter-bundle": "~5.0",
         "j0k3r/graby": "~1.0",
-        "friendsofsymfony/user-bundle": "~2.0@dev",
+        "friendsofsymfony/user-bundle": "2.0.x-dev",
         "friendsofsymfony/oauth-server-bundle": "^1.5",
-        "stof/doctrine-extensions-bundle": "^1.2@dev",
+        "stof/doctrine-extensions-bundle": "^1.2",
         "scheb/two-factor-bundle": "~2.0",
         "grandt/phpepub": "~4.0",
         "wallabag/php-mobi": "~1.0.0",
         "kphoen/rulerz-bundle": "~0.10",
+        "kphoen/rulerz": "0.19.1",
         "guzzlehttp/guzzle": "^5.3.1",
         "doctrine/doctrine-migrations-bundle": "^1.0",
         "paragonie/random_compat": "~1.0",
         "craue/config-bundle": "~1.4",
         "mnapoli/piwik-twig-extension": "^1.0",
-        "lexik/maintenance-bundle": "~2.1",
         "ocramius/proxy-manager": "1.*",
         "white-october/pagerfanta-bundle": "^1.0",
-        "mouf/nodejs-installer": "~1.0",
         "php-amqplib/rabbitmq-bundle": "^1.8",
         "predis/predis": "^1.0",
-        "javibravo/simpleue": "^1.0"
+        "javibravo/simpleue": "^1.0",
+        "symfony/dom-crawler": "^3.1",
+        "friendsofsymfony/jsrouting-bundle": "^1.6",
+        "bdunogier/guzzle-site-authenticator": "dev-master"
     },
     "require-dev": {
         "doctrine/doctrine-fixtures-bundle": "~2.2",
         "doctrine/data-fixtures": "~1.1.1",
         "sensio/generator-bundle": "^3.0",
-        "phpunit/phpunit": "~5.0",
         "symfony/phpunit-bridge": "^3.0",
         "friendsofphp/php-cs-fixer": "~1.9",
         "m6web/redis-mock": "^2.0"
@@ -100,8 +100,8 @@
             "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget"
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
         ],
         "post-install-cmd": [
             "@post-cmd"
@@ -116,6 +116,7 @@
         "symfony-var-dir": "var",
         "symfony-web-dir": "web",
         "symfony-tests-dir": "tests",
+        "symfony-assets-install": "symlink",
         "incenteev-parameters": {
             "file": "app/config/parameters.yml"
         }
@@ -128,7 +129,10 @@
         "psr-4": { "Tests\\": "tests/" }
     },
     "config": {
-        "bin-dir": "bin"
+        "bin-dir": "bin",
+        "platform": {
+            "php": "5.5.9"
+        }
     },
     "minimum-stability": "dev",
     "prefer-stable": true

data/sql/mysql_base.sql

@@ -0,0 +1,25 @@
+CREATE TABLE wallabag_craue_config_setting (name VARCHAR(255) NOT NULL, value VARCHAR(255) DEFAULT NULL, section VARCHAR(255) DEFAULT NULL, UNIQUE INDEX UNIQ_5D9649505E237E06 (name), PRIMARY KEY(name)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
+CREATE TABLE `wallabag_entry` (id INT AUTO_INCREMENT NOT NULL, user_id INT DEFAULT NULL, title LONGTEXT DEFAULT NULL, url LONGTEXT DEFAULT NULL, is_archived TINYINT(1) NOT NULL, is_starred TINYINT(1) NOT NULL, content LONGTEXT DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype LONGTEXT DEFAULT NULL, language LONGTEXT DEFAULT NULL, reading_time INT DEFAULT NULL, domain_name LONGTEXT DEFAULT NULL, preview_picture LONGTEXT DEFAULT NULL, is_public TINYINT(1) DEFAULT '0', INDEX IDX_F4D18282A76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
+CREATE TABLE wallabag_entry_tag (entry_id INT NOT NULL, tag_id INT NOT NULL, INDEX IDX_C9F0DD7CBA364942 (entry_id), INDEX IDX_C9F0DD7CBAD26311 (tag_id), PRIMARY KEY(entry_id, tag_id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
+CREATE TABLE `wallabag_config` (id INT AUTO_INCREMENT NOT NULL, user_id INT DEFAULT NULL, theme VARCHAR(255) NOT NULL, items_per_page INT NOT NULL, language VARCHAR(255) NOT NULL, rss_token VARCHAR(255) DEFAULT NULL, rss_limit INT DEFAULT NULL, reading_speed DOUBLE PRECISION DEFAULT NULL, UNIQUE INDEX UNIQ_87E64C53A76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
+CREATE TABLE `wallabag_tagging_rule` (id INT AUTO_INCREMENT NOT NULL, config_id INT DEFAULT NULL, rule VARCHAR(255) NOT NULL, tags LONGTEXT NOT NULL COMMENT '(DC2Type:simple_array)', INDEX IDX_2D9B3C5424DB0683 (config_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
+CREATE TABLE `wallabag_tag` (id INT AUTO_INCREMENT NOT NULL, `label` LONGTEXT NOT NULL, slug VARCHAR(128) NOT NULL, UNIQUE INDEX UNIQ_4CA58A8C989D9B62 (slug), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
+CREATE TABLE wallabag_oauth2_clients (id INT AUTO_INCREMENT NOT NULL, random_id VARCHAR(255) NOT NULL, redirect_uris LONGTEXT NOT NULL COMMENT '(DC2Type:array)', secret VARCHAR(255) NOT NULL, allowed_grant_types LONGTEXT NOT NULL COMMENT '(DC2Type:array)', PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
+CREATE TABLE wallabag_oauth2_access_tokens (id INT AUTO_INCREMENT NOT NULL, client_id INT NOT NULL, user_id INT DEFAULT NULL, token VARCHAR(255) NOT NULL, expires_at INT DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, UNIQUE INDEX UNIQ_368A42095F37A13B (token), INDEX IDX_368A420919EB6921 (client_id), INDEX IDX_368A4209A76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
+CREATE TABLE wallabag_oauth2_refresh_tokens (id INT AUTO_INCREMENT NOT NULL, client_id INT NOT NULL, user_id INT DEFAULT NULL, token VARCHAR(255) NOT NULL, expires_at INT DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, UNIQUE INDEX UNIQ_20C9FB245F37A13B (token), INDEX IDX_20C9FB2419EB6921 (client_id), INDEX IDX_20C9FB24A76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
+CREATE TABLE wallabag_oauth2_auth_codes (id INT AUTO_INCREMENT NOT NULL, client_id INT NOT NULL, user_id INT DEFAULT NULL, token VARCHAR(255) NOT NULL, redirect_uri LONGTEXT NOT NULL, expires_at INT DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, UNIQUE INDEX UNIQ_EE52E3FA5F37A13B (token), INDEX IDX_EE52E3FA19EB6921 (client_id), INDEX IDX_EE52E3FAA76ED395 (user_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
+CREATE TABLE `wallabag_user` (id INT AUTO_INCREMENT NOT NULL, username VARCHAR(180) NOT NULL, username_canonical VARCHAR(180) NOT NULL, email VARCHAR(180) NOT NULL, email_canonical VARCHAR(180) NOT NULL, enabled TINYINT(1) NOT NULL, salt VARCHAR(255) NOT NULL, password VARCHAR(255) NOT NULL, last_login DATETIME DEFAULT NULL, locked TINYINT(1) NOT NULL, expired TINYINT(1) NOT NULL, expires_at DATETIME DEFAULT NULL, confirmation_token VARCHAR(255) DEFAULT NULL, password_requested_at DATETIME DEFAULT NULL, roles LONGTEXT NOT NULL COMMENT '(DC2Type:array)', credentials_expired TINYINT(1) NOT NULL, credentials_expire_at DATETIME DEFAULT NULL, name LONGTEXT DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, authCode INT DEFAULT NULL, twoFactorAuthentication TINYINT(1) NOT NULL, trusted LONGTEXT DEFAULT NULL COMMENT '(DC2Type:json_array)', UNIQUE INDEX UNIQ_1D63E7E592FC23A8 (username_canonical), UNIQUE INDEX UNIQ_1D63E7E5A0D96FBF (email_canonical), UNIQUE INDEX UNIQ_1D63E7E5C05FB297 (confirmation_token), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
+CREATE TABLE wallabag_annotation (id INT AUTO_INCREMENT NOT NULL, user_id INT DEFAULT NULL, entry_id INT DEFAULT NULL, text LONGTEXT NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, quote VARCHAR(255) NOT NULL, ranges LONGTEXT NOT NULL COMMENT '(DC2Type:array)', INDEX IDX_A7AED006A76ED395 (user_id), INDEX IDX_A7AED006BA364942 (entry_id), PRIMARY KEY(id)) DEFAULT CHARACTER SET utf8 COLLATE utf8_unicode_ci ENGINE = InnoDB;
+ALTER TABLE `wallabag_entry` ADD CONSTRAINT FK_F4D18282A76ED395 FOREIGN KEY (user_id) REFERENCES `wallabag_user` (id);
+ALTER TABLE wallabag_entry_tag ADD CONSTRAINT FK_C9F0DD7CBA364942 FOREIGN KEY (entry_id) REFERENCES `wallabag_entry` (id);
+ALTER TABLE wallabag_entry_tag ADD CONSTRAINT FK_C9F0DD7CBAD26311 FOREIGN KEY (tag_id) REFERENCES `wallabag_tag` (id);
+ALTER TABLE `wallabag_config` ADD CONSTRAINT FK_87E64C53A76ED395 FOREIGN KEY (user_id) REFERENCES `wallabag_user` (id);
+ALTER TABLE `wallabag_tagging_rule` ADD CONSTRAINT FK_2D9B3C5424DB0683 FOREIGN KEY (config_id) REFERENCES `wallabag_config` (id);
+ALTER TABLE wallabag_oauth2_access_tokens ADD CONSTRAINT FK_368A420919EB6921 FOREIGN KEY (client_id) REFERENCES wallabag_oauth2_clients (id);
+ALTER TABLE wallabag_oauth2_access_tokens ADD CONSTRAINT FK_368A4209A76ED395 FOREIGN KEY (user_id) REFERENCES `wallabag_user` (id);
+ALTER TABLE wallabag_oauth2_refresh_tokens ADD CONSTRAINT FK_20C9FB2419EB6921 FOREIGN KEY (client_id) REFERENCES wallabag_oauth2_clients (id);
+ALTER TABLE wallabag_oauth2_refresh_tokens ADD CONSTRAINT FK_20C9FB24A76ED395 FOREIGN KEY (user_id) REFERENCES `wallabag_user` (id);
+ALTER TABLE wallabag_oauth2_auth_codes ADD CONSTRAINT FK_EE52E3FA19EB6921 FOREIGN KEY (client_id) REFERENCES wallabag_oauth2_clients (id);
+ALTER TABLE wallabag_oauth2_auth_codes ADD CONSTRAINT FK_EE52E3FAA76ED395 FOREIGN KEY (user_id) REFERENCES `wallabag_user` (id);
+ALTER TABLE wallabag_annotation ADD CONSTRAINT FK_A7AED006A76ED395 FOREIGN KEY (user_id) REFERENCES `wallabag_user` (id);
+ALTER TABLE wallabag_annotation ADD CONSTRAINT FK_A7AED006BA364942 FOREIGN KEY (entry_id) REFERENCES `wallabag_entry` (id);

data/sql/pgsql_base.sql

@@ -0,0 +1,62 @@
+CREATE TABLE wallabag_craue_config_setting (name VARCHAR(255) NOT NULL, value VARCHAR(255) DEFAULT NULL, section VARCHAR(255) DEFAULT NULL, PRIMARY KEY(name));
+CREATE UNIQUE INDEX UNIQ_5D9649505E237E06 ON wallabag_craue_config_setting (name);
+CREATE TABLE "wallabag_entry" (id INT NOT NULL, user_id INT DEFAULT NULL, title TEXT DEFAULT NULL, url TEXT DEFAULT NULL, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content TEXT DEFAULT NULL, created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updated_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, mimetype TEXT DEFAULT NULL, language TEXT DEFAULT NULL, reading_time INT DEFAULT NULL, domain_name TEXT DEFAULT NULL, preview_picture TEXT DEFAULT NULL, is_public BOOLEAN DEFAULT 'false', PRIMARY KEY(id));
+CREATE INDEX IDX_F4D18282A76ED395 ON "wallabag_entry" (user_id);
+CREATE TABLE wallabag_entry_tag (entry_id INT NOT NULL, tag_id INT NOT NULL, PRIMARY KEY(entry_id, tag_id));
+CREATE INDEX IDX_C9F0DD7CBA364942 ON wallabag_entry_tag (entry_id);
+CREATE INDEX IDX_C9F0DD7CBAD26311 ON wallabag_entry_tag (tag_id);
+CREATE TABLE "wallabag_config" (id INT NOT NULL, user_id INT DEFAULT NULL, theme VARCHAR(255) NOT NULL, items_per_page INT NOT NULL, language VARCHAR(255) NOT NULL, rss_token VARCHAR(255) DEFAULT NULL, rss_limit INT DEFAULT NULL, reading_speed DOUBLE PRECISION DEFAULT NULL, PRIMARY KEY(id));
+CREATE UNIQUE INDEX UNIQ_87E64C53A76ED395 ON "wallabag_config" (user_id);
+CREATE TABLE "wallabag_tagging_rule" (id INT NOT NULL, config_id INT DEFAULT NULL, rule VARCHAR(255) NOT NULL, tags TEXT NOT NULL, PRIMARY KEY(id));
+CREATE INDEX IDX_2D9B3C5424DB0683 ON "wallabag_tagging_rule" (config_id);
+COMMENT ON COLUMN "wallabag_tagging_rule".tags IS '(DC2Type:simple_array)';
+CREATE TABLE "wallabag_tag" (id INT NOT NULL, label TEXT NOT NULL, slug VARCHAR(128) NOT NULL, PRIMARY KEY(id));
+CREATE UNIQUE INDEX UNIQ_4CA58A8C989D9B62 ON "wallabag_tag" (slug);
+CREATE TABLE wallabag_oauth2_clients (id INT NOT NULL, random_id VARCHAR(255) NOT NULL, redirect_uris TEXT NOT NULL, secret VARCHAR(255) NOT NULL, allowed_grant_types TEXT NOT NULL, PRIMARY KEY(id));
+COMMENT ON COLUMN wallabag_oauth2_clients.redirect_uris IS '(DC2Type:array)';
+COMMENT ON COLUMN wallabag_oauth2_clients.allowed_grant_types IS '(DC2Type:array)';
+CREATE TABLE wallabag_oauth2_access_tokens (id INT NOT NULL, client_id INT NOT NULL, user_id INT DEFAULT NULL, token VARCHAR(255) NOT NULL, expires_at INT DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, PRIMARY KEY(id));
+CREATE UNIQUE INDEX UNIQ_368A42095F37A13B ON wallabag_oauth2_access_tokens (token);
+CREATE INDEX IDX_368A420919EB6921 ON wallabag_oauth2_access_tokens (client_id);
+CREATE INDEX IDX_368A4209A76ED395 ON wallabag_oauth2_access_tokens (user_id);
+CREATE TABLE wallabag_oauth2_refresh_tokens (id INT NOT NULL, client_id INT NOT NULL, user_id INT DEFAULT NULL, token VARCHAR(255) NOT NULL, expires_at INT DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, PRIMARY KEY(id));
+CREATE UNIQUE INDEX UNIQ_20C9FB245F37A13B ON wallabag_oauth2_refresh_tokens (token);
+CREATE INDEX IDX_20C9FB2419EB6921 ON wallabag_oauth2_refresh_tokens (client_id);
+CREATE INDEX IDX_20C9FB24A76ED395 ON wallabag_oauth2_refresh_tokens (user_id);
+CREATE TABLE wallabag_oauth2_auth_codes (id INT NOT NULL, client_id INT NOT NULL, user_id INT DEFAULT NULL, token VARCHAR(255) NOT NULL, redirect_uri TEXT NOT NULL, expires_at INT DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, PRIMARY KEY(id));
+CREATE UNIQUE INDEX UNIQ_EE52E3FA5F37A13B ON wallabag_oauth2_auth_codes (token);
+CREATE INDEX IDX_EE52E3FA19EB6921 ON wallabag_oauth2_auth_codes (client_id);
+CREATE INDEX IDX_EE52E3FAA76ED395 ON wallabag_oauth2_auth_codes (user_id);
+CREATE TABLE "wallabag_user" (id INT NOT NULL, username VARCHAR(180) NOT NULL, username_canonical VARCHAR(180) NOT NULL, email VARCHAR(180) NOT NULL, email_canonical VARCHAR(180) NOT NULL, enabled BOOLEAN NOT NULL, salt VARCHAR(255) NOT NULL, password VARCHAR(255) NOT NULL, last_login TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, locked BOOLEAN NOT NULL, expired BOOLEAN NOT NULL, expires_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, confirmation_token VARCHAR(255) DEFAULT NULL, password_requested_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, roles TEXT NOT NULL, credentials_expired BOOLEAN NOT NULL, credentials_expire_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, name TEXT DEFAULT NULL, created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updated_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, authCode INT DEFAULT NULL, twoFactorAuthentication BOOLEAN NOT NULL, trusted TEXT DEFAULT NULL, PRIMARY KEY(id));
+CREATE UNIQUE INDEX UNIQ_1D63E7E592FC23A8 ON "wallabag_user" (username_canonical);
+CREATE UNIQUE INDEX UNIQ_1D63E7E5A0D96FBF ON "wallabag_user" (email_canonical);
+CREATE UNIQUE INDEX UNIQ_1D63E7E5C05FB297 ON "wallabag_user" (confirmation_token);
+COMMENT ON COLUMN "wallabag_user".roles IS '(DC2Type:array)';
+COMMENT ON COLUMN "wallabag_user".trusted IS '(DC2Type:json_array)';
+CREATE TABLE wallabag_annotation (id INT NOT NULL, user_id INT DEFAULT NULL, entry_id INT DEFAULT NULL, text TEXT NOT NULL, created_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, updated_at TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, quote VARCHAR(255) NOT NULL, ranges TEXT NOT NULL, PRIMARY KEY(id));
+CREATE INDEX IDX_A7AED006A76ED395 ON wallabag_annotation (user_id);
+CREATE INDEX IDX_A7AED006BA364942 ON wallabag_annotation (entry_id);
+COMMENT ON COLUMN wallabag_annotation.ranges IS '(DC2Type:array)';
+CREATE SEQUENCE "entry_id_seq" INCREMENT BY 1 MINVALUE 1 START 1;
+CREATE SEQUENCE "config_id_seq" INCREMENT BY 1 MINVALUE 1 START 1;
+CREATE SEQUENCE "tagging_rule_id_seq" INCREMENT BY 1 MINVALUE 1 START 1;
+CREATE SEQUENCE "tag_id_seq" INCREMENT BY 1 MINVALUE 1 START 1;
+CREATE SEQUENCE oauth2_clients_id_seq INCREMENT BY 1 MINVALUE 1 START 1;
+CREATE SEQUENCE oauth2_access_tokens_id_seq INCREMENT BY 1 MINVALUE 1 START 1;
+CREATE SEQUENCE oauth2_refresh_tokens_id_seq INCREMENT BY 1 MINVALUE 1 START 1;
+CREATE SEQUENCE oauth2_auth_codes_id_seq INCREMENT BY 1 MINVALUE 1 START 1;
+CREATE SEQUENCE "user_id_seq" INCREMENT BY 1 MINVALUE 1 START 1;
+CREATE SEQUENCE annotation_id_seq INCREMENT BY 1 MINVALUE 1 START 1;
+ALTER TABLE "wallabag_entry" ADD CONSTRAINT FK_F4D18282A76ED395 FOREIGN KEY (user_id) REFERENCES "wallabag_user" (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
+ALTER TABLE wallabag_entry_tag ADD CONSTRAINT FK_C9F0DD7CBA364942 FOREIGN KEY (entry_id) REFERENCES "wallabag_entry" (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
+ALTER TABLE wallabag_entry_tag ADD CONSTRAINT FK_C9F0DD7CBAD26311 FOREIGN KEY (tag_id) REFERENCES "wallabag_tag" (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
+ALTER TABLE "wallabag_config" ADD CONSTRAINT FK_87E64C53A76ED395 FOREIGN KEY (user_id) REFERENCES "wallabag_user" (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
+ALTER TABLE "wallabag_tagging_rule" ADD CONSTRAINT FK_2D9B3C5424DB0683 FOREIGN KEY (config_id) REFERENCES "wallabag_config" (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
+ALTER TABLE wallabag_oauth2_access_tokens ADD CONSTRAINT FK_368A420919EB6921 FOREIGN KEY (client_id) REFERENCES wallabag_oauth2_clients (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
+ALTER TABLE wallabag_oauth2_access_tokens ADD CONSTRAINT FK_368A4209A76ED395 FOREIGN KEY (user_id) REFERENCES "wallabag_user" (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
+ALTER TABLE wallabag_oauth2_refresh_tokens ADD CONSTRAINT FK_20C9FB2419EB6921 FOREIGN KEY (client_id) REFERENCES wallabag_oauth2_clients (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
+ALTER TABLE wallabag_oauth2_refresh_tokens ADD CONSTRAINT FK_20C9FB24A76ED395 FOREIGN KEY (user_id) REFERENCES "wallabag_user" (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
+ALTER TABLE wallabag_oauth2_auth_codes ADD CONSTRAINT FK_EE52E3FA19EB6921 FOREIGN KEY (client_id) REFERENCES wallabag_oauth2_clients (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
+ALTER TABLE wallabag_oauth2_auth_codes ADD CONSTRAINT FK_EE52E3FAA76ED395 FOREIGN KEY (user_id) REFERENCES "wallabag_user" (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
+ALTER TABLE wallabag_annotation ADD CONSTRAINT FK_A7AED006A76ED395 FOREIGN KEY (user_id) REFERENCES "wallabag_user" (id) NOT DEFERRABLE INITIALLY IMMEDIATE;
+ALTER TABLE wallabag_annotation ADD CONSTRAINT FK_A7AED006BA364942 FOREIGN KEY (entry_id) REFERENCES "wallabag_entry" (id) NOT DEFERRABLE INITIALLY IMMEDIATE;

data/sql/sqlite_base.sql

@@ -0,0 +1,33 @@
+CREATE TABLE wallabag_craue_config_setting (name VARCHAR(255) NOT NULL, value VARCHAR(255) DEFAULT NULL, section VARCHAR(255) DEFAULT NULL, PRIMARY KEY(name));
+CREATE UNIQUE INDEX UNIQ_5D9649505E237E06 ON wallabag_craue_config_setting (name);
+CREATE TABLE "wallabag_tagging_rule" (id INTEGER NOT NULL, config_id INTEGER DEFAULT NULL, rule VARCHAR(255) NOT NULL, tags CLOB NOT NULL, PRIMARY KEY(id), CONSTRAINT FK_2D9B3C5424DB0683 FOREIGN KEY (config_id) REFERENCES "wallabag_config" (id) NOT DEFERRABLE INITIALLY IMMEDIATE);
+CREATE INDEX IDX_2D9B3C5424DB0683 ON "wallabag_tagging_rule" (config_id);
+CREATE TABLE "wallabag_tag" (id INTEGER NOT NULL, label CLOB NOT NULL, slug VARCHAR(128) NOT NULL, PRIMARY KEY(id));
+CREATE UNIQUE INDEX UNIQ_4CA58A8C989D9B62 ON "wallabag_tag" (slug);
+CREATE TABLE "wallabag_entry" (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, title CLOB DEFAULT NULL, url CLOB DEFAULT NULL, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content CLOB DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype CLOB DEFAULT NULL, language CLOB DEFAULT NULL, reading_time INTEGER DEFAULT NULL, domain_name CLOB DEFAULT NULL, preview_picture CLOB DEFAULT NULL, is_public BOOLEAN DEFAULT '0', PRIMARY KEY(id), CONSTRAINT FK_F4D18282A76ED395 FOREIGN KEY (user_id) REFERENCES "wallabag_user" (id) NOT DEFERRABLE INITIALLY IMMEDIATE);
+CREATE INDEX IDX_F4D18282A76ED395 ON "wallabag_entry" (user_id);
+CREATE TABLE wallabag_entry_tag (entry_id INTEGER NOT NULL, tag_id INTEGER NOT NULL, PRIMARY KEY(entry_id, tag_id), CONSTRAINT FK_C9F0DD7CBA364942 FOREIGN KEY (entry_id) REFERENCES "wallabag_entry" (id) NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_C9F0DD7CBAD26311 FOREIGN KEY (tag_id) REFERENCES "wallabag_tag" (id) NOT DEFERRABLE INITIALLY IMMEDIATE);
+CREATE INDEX IDX_C9F0DD7CBA364942 ON wallabag_entry_tag (entry_id);
+CREATE INDEX IDX_C9F0DD7CBAD26311 ON wallabag_entry_tag (tag_id);
+CREATE TABLE "wallabag_config" (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, theme VARCHAR(255) NOT NULL, items_per_page INTEGER NOT NULL, language VARCHAR(255) NOT NULL, rss_token VARCHAR(255) DEFAULT NULL, rss_limit INTEGER DEFAULT NULL, reading_speed DOUBLE PRECISION DEFAULT NULL, PRIMARY KEY(id), CONSTRAINT FK_87E64C53A76ED395 FOREIGN KEY (user_id) REFERENCES "wallabag_user" (id) NOT DEFERRABLE INITIALLY IMMEDIATE);
+CREATE UNIQUE INDEX UNIQ_87E64C53A76ED395 ON "wallabag_config" (user_id);
+CREATE TABLE wallabag_oauth2_refresh_tokens (id INTEGER NOT NULL, client_id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, token VARCHAR(255) NOT NULL, expires_at INTEGER DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, PRIMARY KEY(id), CONSTRAINT FK_20C9FB2419EB6921 FOREIGN KEY (client_id) REFERENCES wallabag_oauth2_clients (id) NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_20C9FB24A76ED395 FOREIGN KEY (user_id) REFERENCES "wallabag_user" (id) NOT DEFERRABLE INITIALLY IMMEDIATE);
+CREATE UNIQUE INDEX UNIQ_20C9FB245F37A13B ON wallabag_oauth2_refresh_tokens (token);
+CREATE INDEX IDX_20C9FB2419EB6921 ON wallabag_oauth2_refresh_tokens (client_id);
+CREATE INDEX IDX_20C9FB24A76ED395 ON wallabag_oauth2_refresh_tokens (user_id);
+CREATE TABLE wallabag_oauth2_access_tokens (id INTEGER NOT NULL, client_id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, token VARCHAR(255) NOT NULL, expires_at INTEGER DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, PRIMARY KEY(id), CONSTRAINT FK_368A420919EB6921 FOREIGN KEY (client_id) REFERENCES wallabag_oauth2_clients (id) NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_368A4209A76ED395 FOREIGN KEY (user_id) REFERENCES "wallabag_user" (id) NOT DEFERRABLE INITIALLY IMMEDIATE);
+CREATE UNIQUE INDEX UNIQ_368A42095F37A13B ON wallabag_oauth2_access_tokens (token);
+CREATE INDEX IDX_368A420919EB6921 ON wallabag_oauth2_access_tokens (client_id);
+CREATE INDEX IDX_368A4209A76ED395 ON wallabag_oauth2_access_tokens (user_id);
+CREATE TABLE wallabag_oauth2_auth_codes (id INTEGER NOT NULL, client_id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, token VARCHAR(255) NOT NULL, redirect_uri CLOB NOT NULL, expires_at INTEGER DEFAULT NULL, scope VARCHAR(255) DEFAULT NULL, PRIMARY KEY(id), CONSTRAINT FK_EE52E3FA19EB6921 FOREIGN KEY (client_id) REFERENCES wallabag_oauth2_clients (id) NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_EE52E3FAA76ED395 FOREIGN KEY (user_id) REFERENCES "wallabag_user" (id) NOT DEFERRABLE INITIALLY IMMEDIATE);
+CREATE UNIQUE INDEX UNIQ_EE52E3FA5F37A13B ON wallabag_oauth2_auth_codes (token);
+CREATE INDEX IDX_EE52E3FA19EB6921 ON wallabag_oauth2_auth_codes (client_id);
+CREATE INDEX IDX_EE52E3FAA76ED395 ON wallabag_oauth2_auth_codes (user_id);
+CREATE TABLE wallabag_oauth2_clients (id INTEGER NOT NULL, random_id VARCHAR(255) NOT NULL, redirect_uris CLOB NOT NULL, secret VARCHAR(255) NOT NULL, allowed_grant_types CLOB NOT NULL, PRIMARY KEY(id));
+CREATE TABLE "wallabag_user" (id INTEGER NOT NULL, username VARCHAR(180) NOT NULL, username_canonical VARCHAR(180) NOT NULL, email VARCHAR(180) NOT NULL, email_canonical VARCHAR(180) NOT NULL, enabled BOOLEAN NOT NULL, salt VARCHAR(255) NOT NULL, password VARCHAR(255) NOT NULL, last_login DATETIME DEFAULT NULL, locked BOOLEAN NOT NULL, expired BOOLEAN NOT NULL, expires_at DATETIME DEFAULT NULL, confirmation_token VARCHAR(255) DEFAULT NULL, password_requested_at DATETIME DEFAULT NULL, roles CLOB NOT NULL, credentials_expired BOOLEAN NOT NULL, credentials_expire_at DATETIME DEFAULT NULL, name CLOB DEFAULT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, authCode INTEGER DEFAULT NULL, twoFactorAuthentication BOOLEAN NOT NULL, trusted CLOB DEFAULT NULL, PRIMARY KEY(id));
+CREATE UNIQUE INDEX UNIQ_1D63E7E592FC23A8 ON "wallabag_user" (username_canonical);
+CREATE UNIQUE INDEX UNIQ_1D63E7E5A0D96FBF ON "wallabag_user" (email_canonical);
+CREATE UNIQUE INDEX UNIQ_1D63E7E5C05FB297 ON "wallabag_user" (confirmation_token);
+CREATE TABLE wallabag_annotation (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, entry_id INTEGER DEFAULT NULL, text CLOB NOT NULL, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, quote VARCHAR(255) NOT NULL, ranges CLOB NOT NULL, PRIMARY KEY(id), CONSTRAINT FK_A7AED006A76ED395 FOREIGN KEY (user_id) REFERENCES "wallabag_user" (id) NOT DEFERRABLE INITIALLY IMMEDIATE, CONSTRAINT FK_A7AED006BA364942 FOREIGN KEY (entry_id) REFERENCES "wallabag_entry" (id) NOT DEFERRABLE INITIALLY IMMEDIATE);
+CREATE INDEX IDX_A7AED006A76ED395 ON wallabag_annotation (user_id);
+CREATE INDEX IDX_A7AED006BA364942 ON wallabag_annotation (entry_id);

docs/de/developer/api.rst

@@ -1,4 +1,4 @@
-API DoKumentation
+API Dokumentation
 =================
 
 Dank dieser Dokumentation werden wir sehen, wie wir mit der wallabag API interagieren.
@@ -264,7 +264,8 @@ Drittanbieter Ressourcen
 
 Einige Applikationen oder Bibliotheken nutzen unsere API. Hier ist eine nicht abschließende Aufzählung von ihnen:
 
-- `Java wrapper for the wallabag API <https://github.com/Strubbl/wallabag-java>`_ von Strubbl.
+- `Java wrapper for the wallabag API <https://github.com/Strubbl/jWallabag>`_ von Strubbl.
 - `.NET library for the wallabag v2 API <https://github.com/jlnostr/wallabag-api>`_ von Julian Oster.
 - `Python API for wallabag <https://github.com/foxmask/wallabag_api>`_ von FoxMaSk, für sein Projekt `Trigger Happy <https://blog.trigger-happy.eu/>`_.
 - `A plugin <https://github.com/joshp23/ttrss-to-wallabag-v2>`_ entworfen für `Tiny Tiny RSS <https://tt-rss.org/gitlab/fox/tt-rss/wikis/home>`_, das die wallabag v2 API nutzt. Von Josh Panter.
+- `Golang wrapper for the wallabag API <https://github.com/Strubbl/wallabago>`_ von Strubbl, für sein Projekt `wallabag-stats Graph <https://github.com/Strubbl/wallabag-stats>`_.

docs/de/developer/asynchronous.rst

@@ -0,0 +1,159 @@
+Asynchrone Aufgaben
+===================
+
+Um große asynchrone Aufgaben zu starten (etwa für große Importe), können wir RabbitMQ oder Redis nutzen.
+
+Installation von RabbitMQ für asynchrone Aufgaben
+-------------------------------------------------
+
+Voraussetzungen
+^^^^^^^^^^^^^^^
+
+Du musst RabbitMQ auf deinem Server installiert haben.
+
+Installation
+^^^^^^^^^^^^
+
+.. code:: bash
+
+  wget https://www.rabbitmq.com/rabbitmq-signing-key-public.asc
+  apt-key add rabbitmq-signing-key-public.asc
+  apt-get update
+  apt-get install rabbitmq-server
+
+Konfiguration und Start
+^^^^^^^^^^^^^^^^^^^^^^^
+
+.. code:: bash
+
+  rabbitmq-plugins enable rabbitmq_management # (useful to have a web interface, available at http://localhost:15672/ (guest/guest)
+  rabbitmq-server -detached
+
+RabbitMQ stoppen
+^^^^^^^^^^^^^^^^
+
+.. code:: bash
+
+  rabbitmqctl stop
+
+RabbitMQ für wallabag konfigurieren
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Bearbeite deine ``app/config/parameters.yml``-Datei, um die RabbitMQ-Parameter zu ändern. Die Standardwerte sollten in Ordnung sein:
+
+.. code:: yaml
+
+    rabbitmq_host: localhost
+    rabbitmq_port: 5672
+    rabbitmq_user: guest
+    rabbitmq_password: guest
+    rabbitmq_prefetch_count: 10 # lesen http://www.rabbitmq.com/consumer-prefetch.html
+
+RabbitMQ in wallabag aktivieren
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In den internen Einstellungen, aktiviere RabbitMQ im Import-Abschnitt mit dem Wert 1.
+
+Starte den RabbitMQ-Consumer
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Abhängig davon, über welchen Service du importieren möchtest, musst du den entsprechenden (oder mehrere) Cronjob aktivieren:
+
+.. code:: bash
+
+  # für den Pocket-Import
+  bin/console rabbitmq:consumer -e=prod import_pocket -w
+
+  # für den Readability-Import
+  bin/console rabbitmq:consumer -e=prod import_readability -w
+
+  # für den Instapaper-Import
+  bin/console rabbitmq:consumer -e=prod import_instapaper -w
+
+  # für den wallabag v1-Import
+  bin/console rabbitmq:consumer -e=prod import_wallabag_v1 -w
+
+  # für den wallabag v2-Import
+  bin/console rabbitmq:consumer -e=prod import_wallabag_v2 -w
+
+  # für den Firefox-Import
+  bin/console rabbitmq:consumer -e=prod import_firefox -w
+
+  # für den Chrome-Import
+  bin/console rabbitmq:consumer -e=prod import_chrome -w
+
+Redis für asynchrone Aufgaben installieren
+------------------------------------------
+
+Um große asynchrone Aufgaben zu starten (etwa für große Importe), können wir auch Redis nutzen.
+
+Voraussetzungen
+^^^^^^^^^^^^^^^
+
+Du musst Redis auf deinem Server installiert haben.
+
+Installation
+^^^^^^^^^^^^
+
+.. code:: bash
+
+  apt-get install redis-server
+
+Start
+^^^^^
+
+Der Server kann bereits nach der Installation laufen, falls nicht, kannst du ihn wie folgt starten:
+
+.. code:: bash
+
+  redis-server
+
+
+Redis für wallabag konfigurieren
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Bearbeite deine ``app/config/parameters.yml``-Datei, um die Redis-Parameter zu ändern. Die Standardwerte sollten in Ordnung sein:
+
+.. code:: yaml
+
+    redis_host: localhost
+    redis_port: 6379
+
+Redis in wallabag aktivieren
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In den internen Einstellungen, aktiviere Redis im Import-Abschnitt mit dem Wert 1.
+
+Starten des Redis-Consumer
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Abhängig davon, über welchen Service du importieren möchtest, musst du den entsprechenden (oder mehrere) Cronjob aktivieren:
+
+.. code:: bash
+
+  # für den Pocket-Import
+  bin/console wallabag:import:redis-worker -e=prod pocket -vv >> /path/to/wallabag/var/logs/redis-pocket.log
+
+  # für den Readability-Import
+  bin/console wallabag:import:redis-worker -e=prod readability -vv >> /path/to/wallabag/var/logs/redis-readability.log
+
+  # für den Instapaper-Import
+  bin/console wallabag:import:redis-worker -e=prod instapaper -vv >> /path/to/wallabag/var/logs/redis-instapaper.log
+
+  # für den wallabag v1-Import
+  bin/console wallabag:import:redis-worker -e=prod wallabag_v1 -vv >> /path/to/wallabag/var/logs/redis-wallabag_v1.log
+
+  # für den wallabag v2-Import
+  bin/console wallabag:import:redis-worker -e=prod wallabag_v2 -vv >> /path/to/wallabag/var/logs/redis-wallabag_v2.log
+
+  # für den Firefox-Import
+  bin/console wallabag:import:redis-worker -e=prod firefox -vv >> /path/to/wallabag/var/logs/redis-firefox.log
+
+  # für den Chrome-Import
+  bin/console wallabag:import:redis-worker -e=prod chrome -vv >> /path/to/wallabag/var/logs/redis-chrome.log
+
+Wenn du den Import nur für einige Artikel nutzen willst, kannst du die Nummer festlegen (hier: 12) und der Consumer wird nach dem zwölften Artikel aufhören:
+
+.. code:: bash
+
+  bin/console wallabag:import:redis-worker -e=prod pocket -vv --maxIterations=12

docs/de/developer/maintenance.rst

@@ -1,32 +0,0 @@
-Wartungsmodus
-=============
-
-Wenn du längere Aufgaben auf deiner wallabag Instanz ausführen willst, kannst du den Wartungsmodus aktivieren.
-Keiner wird dann Zugang zu deiner Instanz haben.
-
-Aktivieren des Wartungsmodus
-----------------------------
-
-Um den Wartungsmodus zu aktivieren, führe folgendes Kommando aus:
-
-::
-
-    bin/console lexik:maintenance:lock --no-interaction
-
-Du kannst deine IP Adresse in ``app/config/config.yml`` setzen, wenn du Zugriff zu wallabag haben willst, auch wenn der Wartungsmodus aktiv ist. Zum Beispiel:
-
-::
-
-    lexik_maintenance:
-        authorized:
-            ips: ['127.0.0.1']
-
-
-Deaktivieren des Wartungsmodus
-------------------------
-
-Um den Wartungsmodus zu deaktivieren, führe dieses Kommando aus:
-
-::
-
-    bin/console lexik:maintenance:unlock

docs/de/developer/paywall.rst

@@ -0,0 +1,56 @@
+Articles behind a paywall
+=========================
+
+wallabag can fetch articles from websites which use a paywall system.
+
+Enable paywall authentication
+-----------------------------
+
+In internal settings, in the **Article** section, enable authentication for websites with paywall (with the value 1).
+
+Configure credentials in wallabag
+---------------------------------
+
+Edit your ``app/config/parameters.yml`` file to edit credentials for each website with paywall. Here is an example for some french websites:
+
+.. code:: yaml
+
+    sites_credentials:
+        mediapart.fr: {username: "myMediapartLogin", password: "mypassword"}
+        arretsurimages.net: {username: "myASILogin", password: "mypassword"}
+
+.. note::
+
+    These credentials will be shared between each user of your wallabag instance.
+
+Parsing configuration files
+---------------------------
+
+.. note::
+
+    Read `this part of the documentation <http://doc.wallabag.org/en/master/user/errors_during_fetching.html>`_ to understand the configuration files.
+
+Each parsing configuration file needs to be improved by adding ``requires_login``, ``login_uri``,
+``login_username_field``, ``login_password_field`` and ``not_logged_in_xpath``.
+
+Be careful, the login form must be in the page content when wallabag loads it. It's impossible for wallabag to be authenticated
+on a website where the login form is loaded after the page (by ajax for example).
+
+``login_uri`` is the action URL of the form (``action`` attribute in the form).
+``login_username_field`` is the ``name`` attribute of the login field.
+``login_password_field`` is the ``name`` attribute of the password field.
+
+For example:
+
+.. code::
+
+    title://div[@id="titrage-contenu"]/h1[@class="title"]
+    body: //div[@class="contenu-html"]/div[@class="page-pane"]
+
+    requires_login: yes
+
+    login_uri: http://www.arretsurimages.net/forum/login.php
+    login_username_field: username
+    login_password_field: password
+
+    not_logged_in_xpath: //body[@class="not-logged-in"]

docs/de/developer/rabbitmq.rst

@@ -1,77 +0,0 @@
-Installiere RabbitMQ für asynchrone Aufgaben
-============================================
-
-Um asynchrone Aufgaben zu starten (nützlich z.B. für große Imports), können wir RabbitMQ nutzen.
-
-Voraussetzungen
----------------
-
-Du musst RabbitMQ auf deinem Server installiert haben.
-
-Installation
-~~~~~~~~~~~~
-
-.. code:: bash
-
-  wget https://www.rabbitmq.com/rabbitmq-signing-key-public.asc
-  apt-key add rabbitmq-signing-key-public.asc
-  apt-get update
-  apt-get install rabbitmq-server
-
-Konfiguration und Starten
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. code:: bash
-
-  rabbitmq-plugins enable rabbitmq_management # (useful to have a web interface, available at http://localhost:15672/ (guest/guest)
-  rabbitmq-server -detached
-
-RabbitMQ stoppen
-~~~~~~~~~~~~~~~
-
-.. code:: bash
-
-  rabbitmqctl stop
-
-
-Konfigure RabbitMQ in wallabag
-------------------------------
-
-Bearbeite die Datei ``parameters.yml``, um die RabbitMQ Konfiguration einzurichten. Die Standardkonfiguration sollte ok sein:
-
-.. code:: yaml
-
-    rabbitmq_host: localhost
-    rabbitmq_port: 5672
-    rabbitmq_user: guest
-    rabbitmq_password: guest
-
-
-Starte den RabbitMQ Consumer
-----------------------------
-
-Abhängig von welchem Service du importieren möchtest, solltest du einen Cron Job aktivieren (oder mehrere, wenn du viele unterstützen willst):
-
-.. code:: bash
-
-  # for Pocket import
-  bin/console rabbitmq:consumer import_pocket -w
-
-  # for Readability import
-  bin/console rabbitmq:consumer import_readability -w
-
-  # for Instapaper import
-  bin/console rabbitmq:consumer import_instapaper -w
-
-  # for wallabag v1 import
-  bin/console rabbitmq:consumer import_wallabag_v1 -w
-
-  # for wallabag v2 import
-  bin/console rabbitmq:consumer import_wallabag_v2 -w
-
-  # for Firefox import
-  bin/console rabbitmq:consumer import_firefox -w
-
-  # for Chrome import
-  bin/console rabbitmq:consumer import_chrome -w
-

docs/de/developer/redis.rst

@@ -1,71 +0,0 @@
-Installiere Redis für asynchrone Aufgaben
-=========================================
-
-Um asynchrone Aufgaben zu starten (nützlich z.B. für große Imports), können wir Redis nutzen.
-
-Voraussetzungen
----------------
-
-Du musst Redis auf deinem Server installiert haben.
-
-Installation
-~~~~~~~~~~~~
-
-.. code:: bash
-
-  apt-get install redis-server
-
-Starten
-~~~~~~
-
-Der Redis Service läuft eventuell schon direkt nach der Installation. Falls nicht kannst du ihn wie folgt starten:
-
-.. code:: bash
-
-  redis-server
-
-
-Konfigure Redis in wallabag
----------------------------
-
-Bearbeite die Datei ``parameters.yml``, um die RabbitMQ Konfiguration einzurichten. Die Standardkonfiguration sollte ok sein:
-
-.. code:: yaml
-
-    redis_host: localhost
-    redis_port: 6379
-
-
-Starte den Redis Consumer
--------------------------
-
-Abhängig von welchem Service du importieren möchtest, solltest du einen Cron Job aktivieren (oder mehrere, wenn du viele unterstützen willst):
-
-.. code:: bash
-
-  # for Pocket import
-  bin/console wallabag:import:redis-worker pocket -vv >> /path/to/wallabag/var/logs/redis-pocket.log
-
-  # for Readability import
-  bin/console wallabag:import:redis-worker readability -vv >> /path/to/wallabag/var/logs/redis-readability.log
-
-  # for Instapaper import
-  bin/console wallabag:import:redis-worker instapaper -vv >> /path/to/wallabag/var/logs/redis-instapaper.log
-
-  # for wallabag v1 import
-  bin/console wallabag:import:redis-worker wallabag_v1 -vv >> /path/to/wallabag/var/logs/redis-wallabag_v1.log
-
-  # for wallabag v2 import
-  bin/console wallabag:import:redis-worker wallabag_v2 -vv >> /path/to/wallabag/var/logs/redis-wallabag_v2.log
-
-  # for Firefox import
-  bin/console wallabag:import:redis-worker firefox -vv >> /path/to/wallabag/var/logs/redis-firefox.log
-
-  # for Chrome import
-  bin/console wallabag:import:redis-worker instapaper -vv >> /path/to/wallabag/var/logs/redis-chrome.log
-
-Wenn du den Import nur für ein paar Nachrichten und nicht für alle starten willst, kannst du die Nummer (im folgenden Beispiel 12) angeben. Der Redis Worker wird dann nach der 12. Nachricht stoppen:
-
-.. code:: bash
-
-  bin/console wallabag:import:redis-worker pocket -vv --maxIterations=12

docs/de/developer/testsuite.rst

@@ -0,0 +1,10 @@
+Testsuite
+=========
+
+To ensure wallabag development quality, we wrote tests with `PHPUnit <https://phpunit.de>`_.
+
+If you contribute to the project (by translating the application, by fixing bugs or by adding a new feature), please write your own tests.
+
+To launch wallabag testsuite, you need to install `ant <http://ant.apache.org>`_.
+
+Then, execute this command ``make test``.

docs/de/developer/translate.rst

@@ -20,7 +20,7 @@ der ISO 639-1 Code deiner Sprache ist (`siehe Wikipedia <https://en.wikipedia.or
 Andere Dateien zum Übersetzen:
 
 - https://github.com/wallabag/wallabag/tree/master/app/Resources/CraueConfigBundle/translations.
-- https://github.com/wallabag/wallabag/tree/master/app/Resources/FOSUserBundle/translations.
+- https://github.com/wallabag/wallabag/tree/master/src/Wallabag/UserBundle/Resources/translations.
 
 Du musst die ``THE_TRANSLATION_FILE.CODE.yml`` Dateien erstellen.
 

docs/de/index.rst

@@ -8,10 +8,6 @@ wallabag Dokumentation
 **wallabag** ist eine Read-it-later Applikation: es speichert Websites,
 indem es nur den Inhalt behält. Elemente wie Navigation oder Werbung werden gelöscht.
 
-.. tip::
-
-    Diese Dokumentation ist über wallabag v2. Wenn du die Dokumentation für wallabag v1 lesen willst, `siehe dir bitte das hier an <https://github.com/wallabag/documentation>`__.
-
 Die Hauptdokumentation für diese Applikation ist in einigen Abschnitten organisiert:
 
 * :ref:`user-docs`
@@ -28,22 +24,19 @@ Die Dokumentation ist in anderen Sprachen verfügbar :
    :maxdepth: 2
    :caption: Nutzerdokumentation
 
-   user/faq
    user/installation
-   user/upgrade-2.0.x-2.1.y
-   user/upgrade-2.0.x-2.0.y
-   user/migration
+   user/upgrade
+   user/configuration
    user/import
    user/create_account
-   user/login
-   user/configuration
-   user/first_article
+   user/articles
    user/errors_during_fetching
-   user/annotations
-   user/download_articles
    user/filters
    user/tags
    user/android
+   user/parameters
+   user/backup
+   user/faq
 
 .. _dev-docs:
 
@@ -53,8 +46,7 @@ Die Dokumentation ist in anderen Sprachen verfügbar :
 
    developer/api
    developer/docker
+   developer/paywall
    developer/documentation
    developer/translate
-   developer/maintenance
-   developer/redis
-   developer/rabbitmq
+   developer/asynchronous

docs/de/user/android.rst

@@ -23,7 +23,7 @@ Bestätige nur diese Nachricht und du wirst zum Einstellungsbildschirm weitergel
     :alt: Einstellungsbildschirm
     :align: center
 
-Trage deine Wallabagdaten ein. Du musst deine Wallabagadresse eintragen. Es ist wichtig, dass die URL nicht mit einem Schrägstrich endet. Füge auch deine Wallabagzugangsdaten in das Nutzer- und Passwortfeld ein.
+Trage deine Wallabagdaten ein. Du musst deine Wallabagadresse eintragen. **Es ist wichtig, dass die URL nicht mit einem Schrägstrich endet.** Füge auch deine Wallabagzugangsdaten in das Nutzer- und Passwortfeld ein.
 
 .. image:: ../../img/user/android_configuration_filled_in.de.png
     :alt: Eingetragene Einstellungen
@@ -76,8 +76,8 @@ Schließlich nach der ersten erfolgreichen Synchronisation, wird dir die Liste d
 Bekannte Limitierungen
 ---------------------
 
-2FA
-~~~
+Zwei-Faktor-Authentifizierung (2FA)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Zur Zeit unterstützt die App keine Zwei-Faktor Authentifizierung. Du solltest sie deaktivieren damit die App funktioniert.
 
@@ -97,11 +97,6 @@ Wenn du deine Wallabaginstanz per HTTPS erreichen kannst, solltest du das so kon
 Referenzen
 ----------
 
-`Quellcode der Android Applikation <https://github.com/wallabag/android-app>`_
-
-`Android Applikation auf F-Droid <https://f-droid.org/repository/browse/?fdfilter=wallabag&fdid=fr.gaulupeau.apps.InThePoche>`_
-
-`Android Applikation auf Google Play <https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche>`_
-
-`Support Chat auf English <https://gitter.im/wallabag/wallabag>`_
-
+- `Quellcode der Android-App <https://github.com/wallabag/android-app>`_
+- `Android-App auf F-Droid <https://f-droid.org/repository/browse/?fdfilter=wallabag&fdid=fr.gaulupeau.apps.InThePoche>`_
+- `Android-App auf Google Play <https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche>`_

docs/de/user/annotations.rst

@@ -1,24 +0,0 @@
-Anmerkungen
-===========
-
-In jedem Artikel, den du liest, kannst du Anmerkungen hinzufügen. Es ist einfacher mit ein paar Bilder erklärt.
-
-Wähle den Teil des Artikels aus, den du kommentieren willst und klicke auf den Bleistift:
-
-.. image:: ../../img/user/annotations_1.png
-   :alt: Wähle den Text
-   :align: center
-
-Schreibe deinen Kommentar:
-
-.. image:: ../../img/user/annotations_2.png
-   :alt: Schreibe deinen Kommentar
-   :align: center
-
-Der Text ist nun hervorgehoben und du kannst deine Anmerkung lesen, wenn du den Mauspfeil darüber fährst.
-
-.. image:: ../../img/user/annotations_3.png
-   :alt: lese deine Anmerkung
-   :align: center
-
-Du kannst so viele Anmerkungen erstellen wie du möchtest.

docs/de/user/articles.rst

@@ -0,0 +1,112 @@
+Artikel
+=======
+
+Speichere deinen ersten Artikel
+-------------------------------
+
+Die Hauptzweck von wallabag ist es, Artikel aus dem Web zu speichern. Es gibt viele Wege, dieses Ziel zu erreichen.
+Wenn du denkst, dass ein Artikel falsch angezeigt wird, kannst du `diese Dokumentation lesen <http://doc.wallabag.org/de/master/user/errors_during_fetching.html>`_.
+
+Über ein Bookmarklet
+^^^^^^^^^^^^^^^^^^^^
+
+Auf der ``Howto``-Seite hast du einen ``Bookmarklet``-Tab. Ziehe das ``bag it!`` in die Lesezeichenleiste deines Browsers.
+Nun kannst du jedes Mal, wenn du einen Artikel speichern willst, auf den ``bag it!``-Link klicken, dann ist der Artikel gespeichert.
+
+Der klassische Weg
+^^^^^^^^^^^^^^^^^^
+
+In der oberen Leiste deines Fensters hast du auf der rechten Seite drei Symbole. Mit dem ersten Symbole, einem Plus-Zeichen, kannst du auf einfache Weise einen neuen Artikel speichern.
+
+.. image:: ../../img/user/topbar.png
+   :alt: Top bar
+   :align: center
+
+Klicke darauf, um ein neues Feld anzuzeigen, füge die Artikel-URL ein und drücke Enter. Dann wird der Artikel gespeichert.
+
+Über ein Browser-Addon
+^^^^^^^^^^^^^^^^^^^^^^
+
+Firefox
+"""""""
+
+Du kannst das `Firefox-Addon hier <https://addons.mozilla.org/firefox/addon/wallabag-v2/> herunterladen`_.
+
+Chrome
+""""""
+
+Du kannst das `Chrome-Addon hier <https://chrome.google.com/webstore/detail/wallabagger/gbmgphmejlcoihgedabhgjdkcahacjlj?hl=fr> herunterladen`_.
+
+Über das Smartphone
+^^^^^^^^^^^^^^^^^^^
+
+Android
+"""""""
+
+Du kannst die `Android-App hier <https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche> herunterladen`_.
+
+Windows 10 in general
+"""""""""""""""""""""
+
+Du kannst die `Windows-App hier <https://www.microsoft.com/store/apps/9nblggh5x3p6> herunterladen`_.
+
+Artikel herunterladen
+---------------------
+
+Du kannst jeden Artikel in verschiedenen Formaten herunterladen: ePUB, MOBI, PDF, XML, JSON, CSV.
+
+Klicke in der Artikelansicht auf dieses Symbol in der Seitenleiste:
+
+.. image:: ../../img/user/download_article.png
+   :alt: Artikel herunterladen
+   :align: center
+
+Du kannst sogar eine ganze Kategorie (Ungelesen, Favoriten, Archiv) in diesen Formaten herunterladen: 
+Beispielsweise kannst du auf der **Ungelesen**-Ansicht auf dieses Symbol in der oberen Leiste klicken:
+
+.. image:: ../../img/user/download_articles.png
+   :alt: Artikel herunterladen
+   :align: center
+
+Artikel teilen
+--------------
+
+Wenn du einen Artikel liest, kannst du ihn auch teilen. Klicke dazu einfach auf den Teilen-Button:
+
+.. image:: ../../img/user/share.png
+   :alt: Artikel teilen
+   :align: center
+
+Nun kannst du den Artikel teilen:
+
+- über eine öffentliche URL (es wird eine reduzierte Ansicht des Artikels zurückgegeben)
+- über einen Tweet
+- in deine Shaarli
+- mit einem Beitrag auf Diaspora*
+- an Carrot
+- mit einer E-Mail
+
+Artikel-Anmerkungen
+-------------------
+
+In jedem Artikel, den du liest, kannst du Anmerkungen hinzufügen. Es ist einfacher mit ein paar Bilder erklärt.
+
+Wähle den Teil des Artikels aus, den du kommentieren willst und klicke auf den Bleistift:
+
+.. image:: ../../img/user/annotations_1.png
+   :alt: Wähle den Text
+   :align: center
+
+Schreibe deinen Kommentar:
+
+.. image:: ../../img/user/annotations_2.png
+   :alt: Schreibe deinen Kommentar
+   :align: center
+
+Der Text ist nun hervorgehoben und du kannst deine Anmerkung lesen, wenn du den Mauspfeil darüber fährst.
+
+.. image:: ../../img/user/annotations_3.png
+   :alt: lese deine Anmerkung
+   :align: center
+
+Du kannst so viele Anmerkungen erstellen wie du möchtest.