Merge pull request #1948 from wallabag/prepare-202

Prepare release 2.0.2

.composer-auth.json

@@ -0,0 +1,7 @@
+{
+    "github-oauth": {
+        "github.com": "PLEASE DO NOT USE THIS TOKEN IN YOUR OWN PROJECTS/FORKS",
+        "github.com": "This token is reserved for testing the wallabag/wallabag repository",
+        "github.com": "73d9411c719a0a56259dbfa16673793b39973091"
+    }
+}

.github/CONTRIBUTING.md

@@ -4,27 +4,21 @@
 Please [open a new issue](https://github.com/wallabag/wallabag/issues/new).
 
 To fix the bug quickly, we need some infos:
-* your wallabag version (on top of the ./index.php file, and also on config page)
+* your wallabag version (in `app/config/config.yml`, see `wallabag_core.version`)
 * your webserver installation :
   * type of hosting (shared or dedicated)
   * in case of a dedicated server, the server and OS used
   * the php version used, eventually `phpinfo()`
 * which storage system you choose at install (SQLite, MySQL/MariaDB or PostgreSQL)
-* any problem on the `wallabag_compatibility_test.php` page
 * any particular details which could be related
 
-
 If relevant :
 * the link you want to save and which causes problem
 * the file you want to import into wallabag, or just an extract
 
-If you have the skills :
-* enable DEBUG mode and look the output at cache/log.txt
-* look for errors into php and server logs
+If you have the skills, look for errors into php, server and application (see `var/logs`) logs
 
 Note : If you have large portions of text, use [Github's Gist service](https://gist.github.com/) or other pastebin-like.
 
 ## You want to fix a bug or to add a feature
-Please fork wallabag and work with **the dev branch** only. **Do not work on master branch**.
-
-[Don't forget to read our guidelines](https://github.com/wallabag/wallabag/blob/dev/GUIDELINES.md).
+Please fork wallabag and work with **the v2 branch** only. **Do not work on master branch**.

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,19 @@
+### Issue details
+
+Please provide issue details here.
+Remember, this is _not_ a place to ask questions. For that, go to http://gitter.im/wallabag/wallabag.
+
+### Environment
+
+* wallabag version (or git revision) that exhibits the issue:
+* How did you install wallabag? Via `git clone` or by downloading the package?
+* Last wallabag version that did not exhibit the issue (if applicable):
+* php version:
+* OS:
+* type of hosting (shared or dedicated):
+* which storage system you choose at install (SQLite, MySQL/MariaDB or PostgreSQL):
+
+### Steps to reproduce/test case
+
+Please provide necessary steps for reproduction of this issue, or better the
+reduced test case (without any external dependencies, if possible).

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,11 @@
+| 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
+| License       | MIT

.travis.yml

@@ -11,6 +11,7 @@ addons:
 
 # cache vendor dirs
 cache:
+    apt: true
     directories:
         - vendor
         - $HOME/.composer/cache
@@ -22,30 +23,38 @@ php:
     - hhvm
 
 env:
-  - DB=mysql
-  - DB=pgsql
-  - DB=sqlite
+    - DB=mysql
+    - DB=pgsql
+    - DB=sqlite
 
 matrix:
     fast_finish: true
+    include:
+        - php: 7.0
+          env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite
     exclude:
         - php: hhvm
           env: DB=pgsql  # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency
     allow_failures:
         - php: hhvm
 
+# exclude v1 branches
 branches:
-    only:
-        - v2
+    except:
+        - legacy
 
 before_script:
     - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
     - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi;
     - composer self-update --no-progress
-    - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;
-    - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag;' -U postgres; fi;
+    - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag_test;' -U postgres; fi;
+
+before_install:
+    - if [[ $TRAVIS_REPO_SLUG = wallabag/wallabag ]]; then cp .composer-auth.json ~/.composer/auth.json; fi;
 
 script:
-    - travis_wait composer update --no-interaction --no-progress
+    - travis_wait composer install --no-interaction --no-progress --prefer-dist -o
     - ant prepare-$DB
     - bin/phpunit -v
+    - 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;

CHANGELOG.md

@@ -0,0 +1,86 @@
+# Changelog
+
+All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [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

Gemfile

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-gem 'capistrano',  '~> 3.1'
-gem 'capistrano-symfony', '~> 0.1', :github => 'capistrano/symfony'
+gem 'capistrano',  '~> 3.4'
+gem 'capistrano-symfony', '~> 1.0.0.rc1'
 gem 'capistrano-composer', '~> 0.0.3'

Gemfile.lock

@@ -1,12 +1,3 @@
-GIT
-  remote: git://github.com/capistrano/symfony.git
-  revision: ca56a01b817097d2831400ef9b1867fc8e07dcf8
-  specs:
-    capistrano-symfony (0.4.0)
-      capistrano (~> 3.1)
-      capistrano-composer (~> 0.0.3)
-      capistrano-file-permissions (~> 0.1.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -16,8 +7,12 @@ GEM
       sshkit (~> 1.3)
     capistrano-composer (0.0.6)
       capistrano (>= 3.0.0.pre)
-    capistrano-file-permissions (0.1.1)
+    capistrano-file-permissions (1.0.0)
+      capistrano (~> 3.0)
+    capistrano-symfony (1.0.0.rc1)
       capistrano (~> 3.1)
+      capistrano-composer (~> 0.0.3)
+      capistrano-file-permissions (~> 1.0)
     colorize (0.7.7)
     i18n (0.7.0)
     net-scp (1.2.1)
@@ -33,9 +28,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  capistrano (~> 3.1)
+  capistrano (~> 3.4)
   capistrano-composer (~> 0.0.3)
-  capistrano-symfony (~> 0.1)!
+  capistrano-symfony (~> 1.0.0.rc1)
 
 BUNDLED WITH
-   1.10.6
+   1.11.2

README.md

@@ -1,23 +1,25 @@
 [![Build Status](https://travis-ci.org/wallabag/wallabag.svg?branch=v2)](https://travis-ci.org/wallabag/wallabag)
-[![Code Coverage](https://scrutinizer-ci.com/g/wallabag/wallabag/badges/coverage.png?b=v2)](https://scrutinizer-ci.com/g/wallabag/wallabag/?branch=v2)
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/wallabag/wallabag/badges/quality-score.png?b=v2)](https://scrutinizer-ci.com/g/wallabag/wallabag/?branch=v2)
+[![Gitter](https://badges.gitter.im/gitterHQ/gitter.svg)](https://gitter.im/wallabag/wallabag)
 
 # What is wallabag?
 wallabag is a self hostable application allowing you to not miss any content anymore.
 Click, save and read it when you can. It extracts content so that you can read it when you have time.
 
-More informations on our website: [wallabag.org](http://wallabag.org)
+More informations on our website: [wallabag.org](https://wallabag.org)
 
-# Want to test the v2?
+# Install wallabag
 
-Keep in mind it's an **unstable** branch, everything can be broken :)
-
-If you don't have it yet, please [install composer](https://getcomposer.org/download/). Then you can install wallabag by executing the following commands:
+If you don't have it yet, please [install composer](https://getcomposer.org/download/).
+Then you can install wallabag by executing the following commands:
 
 ```
-composer create-project wallabag/wallabag wallabag 2.0.0-alpha.1
-php bin/console wallabag:install
-php bin/console server:run
+    git clone https://github.com/wallabag/wallabag.git
+    cd wallabag
+    git checkout 2.0.2
+    SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
+    php bin/console wallabag:install --env=prod
+    php bin/console server:run --env=prod
 ```
 
 ## License

RELEASE_PROCESS.md

@@ -0,0 +1,67 @@
+## 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`.
+
+#### 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)
+
+#### 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
+```
+
+- 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:
+
+```
+    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
+```
+
+- [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**).
+- 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!
+
+### `composer.lock`
+A release tag must contain a `composer.lock` file. It sets which dependencies were available at the time a release was done,
+making it easier to fix issues after the release. It also speeds up `composer install` on stable versions a LOT, by skipping the
+dependencies resolution part.
+
+Since `composer.lock` is ignored by default, either it must be removed from `.gitignore` _in the release branch_,
+or it must be added using `git add --force composer.lock`.
+
+### Target PHP version
+`composer.lock` is _always_ built for a particular version, by default the one it is generated (with `composer update`).
+
+If the PHP version used to generate the .lock isn't a widely available one (like PHP 7), a more common one should
+be locally specified in `composer.lock`:
+
+```json
+    "config": {
+        "platform": {
+            "php": "5.5.9",
+            "ext-something": "4.0"
+        }
+    }
+```

app/AppKernel.php

@@ -22,17 +22,23 @@ class AppKernel extends Kernel
             new Nelmio\ApiDocBundle\NelmioApiDocBundle(),
             new Nelmio\CorsBundle\NelmioCorsBundle(),
             new Liip\ThemeBundle\LiipThemeBundle(),
-            new Wallabag\CoreBundle\WallabagCoreBundle(),
-            new Wallabag\ApiBundle\WallabagApiBundle(),
             new Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle(),
             new Lexik\Bundle\FormFilterBundle\LexikFormFilterBundle(),
             new FOS\OAuthServerBundle\FOSOAuthServerBundle(),
-            new Wallabag\UserBundle\WallabagUserBundle(),
             new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
             new Scheb\TwoFactorBundle\SchebTwoFactorBundle(),
             new KPhoen\RulerZBundle\KPhoenRulerZBundle(),
-            new Wallabag\ImportBundle\WallabagImportBundle(),
             new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
+            new Craue\ConfigBundle\CraueConfigBundle(),
+            new Lexik\Bundle\MaintenanceBundle\LexikMaintenanceBundle(),
+            new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),
+
+            // wallabag bundles
+            new Wallabag\CoreBundle\WallabagCoreBundle(),
+            new Wallabag\ApiBundle\WallabagApiBundle(),
+            new Wallabag\UserBundle\WallabagUserBundle(),
+            new Wallabag\ImportBundle\WallabagImportBundle(),
+            new Wallabag\AnnotationBundle\WallabagAnnotationBundle(),
         ];
 
         if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {

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

@@ -0,0 +1,29 @@
+download_pictures: Download billeder på din server
+carrot: Aktiver deling til Carrot
+diaspora_url: Diaspora URL, hvis tjenesten er aktiv
+export_epub: Aktiver eksport til ePub
+export_mobi: Aktiver eksport til .mobi
+export_pdf: Aktiver eksport til PDF
+export_csv: Aktiver eksport til CSV
+export_json: Aktiver eksport til JSON
+export_txt: Aktiver eksport til TXT
+export_xml: Aktiver eksport til XML
+pocket_consumer_key: Brugers nøgle til Pocket for at importere materialer (https://getpocket.com/developer/docs/authentication)
+shaarli_url: Shaarli-URL, hvis tjenesten er aktiv
+share_diaspora: Aktiver deling til Diaspora
+share_mail: Aktiver deling med email
+share_shaarli: Aktiver deling gennem Shaarli
+share_twitter: Aktiver deling gennem Twitter
+show_printlink: Vis et link til print-indhold
+wallabag_support_url: Support-URL for wallabag
+wallabag_url: URL for *sin* wallabag-installation
+entry: "artikel"
+export: "eksport"
+import: "import"
+misc: "misc"
+modify_settings: "Gem ændring"
+piwik_host: Hosting af din side hos Piwik
+piwik_site_id: ID for din side hos Piwik
+piwik_enabled: Aktiver Piwik
+demo_mode_enabled: "Aktiver demo-indstilling? (anvendes kun til wallabags offentlige demo)"
+demo_mode_username: "Demobruger"

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

@@ -0,0 +1,29 @@
+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_pdf: PDF-Export aktivieren
+export_csv: CSV-Export aktivieren
+export_json: JSON-Export aktivieren
+export_txt: TXT-Export aktivieren
+export_xml: XML-Export aktivieren
+pocket_consumer_key: Consumer-Key für Pocket, um Inhalte zu importieren (https://getpocket.com/developer/docs/authentication)
+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
+show_printlink: Link anzeigen, um den Inhalt auszudrucken
+wallabag_support_url: Support-URL für wallabag
+wallabag_url: URL von *deiner* wallabag-Instanz
+entry: "Artikel"
+export: "Export"
+import: "Import"
+misc: "Verschiedenes"
+modify_settings: "Übernehmen"
+piwik_host: Host deiner Webseite in Piwik
+piwik_site_id: ID deiner Webseite in Piwik
+piwik_enabled: Piwik aktivieren
+demo_mode_enabled: "Test-Modus aktivieren? (nur für die öffentliche wallabag-Demo genutzt)"
+demo_mode_username: "Test-Benutzer"

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

@@ -0,0 +1,29 @@
+download_pictures: Download pictures on your server
+carrot: Enable share to Carrot
+diaspora_url: Diaspora URL, if the service is enabled
+export_epub: Enable ePub export
+export_mobi: Enable .mobi export
+export_pdf: Enable PDF export
+export_csv: Enable CSV export
+export_json: Enable JSON export
+export_txt: Enable TXT export
+export_xml: Enable XML export
+pocket_consumer_key: Consumer key for Pocket to import contents (https://getpocket.com/developer/docs/authentication)
+shaarli_url: Shaarli URL, if the service is enabled
+share_diaspora: Enable share to Diaspora
+share_mail: Enable share by email
+share_shaarli: Enable share to Shaarli
+share_twitter: Enable share to Twitter
+show_printlink: Display a link to print content
+wallabag_support_url: Support URL for wallabag
+wallabag_url: URL of *your* wallabag instance
+entry: "article"
+export: "export"
+import: "import"
+misc: "misc"
+modify_settings: "apply"
+piwik_host: Host of your website in Piwik
+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"

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

@@ -0,0 +1,29 @@
+download_pictures: Descagar imagenes
+carrot: Activar compartir con Carrot
+diaspora_url: Diaspora URL, si el servicio esta activado
+export_epub: Activar exportación a ePub
+export_mobi: Activar exportación a .mobi
+export_pdf: Activar exportación a PDF
+export_csv: Activar exportación a CSV
+export_json: Activar exportación a JSON
+export_txt: Activar exportación a TXT
+export_xml: Activar exportación a XML
+pocket_consumer_key: Consumer key for Pocket to import contents (https://getpocket.com/developer/docs/authentication)
+shaarli_url: Shaarli URL, si el servicio está activado
+share_diaspora: Activar compartir con Diaspora
+share_mail: Activar compartir con email
+share_shaarli: Activar compartir con Shaarli
+share_twitter: Activar compartir con Twitter
+show_printlink: Mostrar un link para imprimir contenido
+wallabag_support_url: URL de soporte de wallabag
+wallabag_url: URL de *tu* instancia de wallabag
+entry: "artículo"
+export: "exportar"
+import: "importar"
+misc: "misc"
+modify_settings: "modificar configuración"
+piwik_host: Host de tu website de Piwik
+piwik_site_id: ID de tu website de Piwik
+piwik_enabled: Activar Piwik
+demo_mode_enabled: "Activar modo demo (sólo usado para la demo de wallabag)"
+demo_mode_username: "Nombre de usuario demo"

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

@@ -0,0 +1,24 @@
+download_pictures: تصاویر را در کارگزار خودتان باربگیرید
+carrot: فعال‌سازی هم‌رسانی به Carrot
+diaspora_url: نشانی Diaspora، اگر فعال بود
+export_epub: فعال‌سازی برون‌سپاری به ePub
+export_mobi: فعال‌سازی برون‌سپاری به mobi
+export_pdf:  فعال‌سازی برون‌سپاری به PDF
+export_csv:  فعال‌سازی برون‌سپاری به CSV
+export_json:  فعال‌سازی برون‌سپاری به JSON
+export_txt:  فعال‌سازی برون‌سپاری به TXT
+export_xml:  فعال‌سازی برون‌سپاری به XML
+pocket_consumer_key: کلید کاربری Pocket برای درون‌ریزی مطالب (https://getpocket.com/developer/docs/authentication)
+shaarli_url: نشانی Shaarli، اگر فعال بود
+share_diaspora: فعال‌سازی هم‌رسانی به Diaspora
+share_mail:  فعال‌سازی هم‌رسانی با ایمیل
+share_shaarli:  فعال‌سازی هم‌رسانی به Shaarli
+share_twitter:  فعال‌سازی هم‌رسانی به Twitter
+show_printlink: نمایش پیوندی برای چاپ مطلب
+wallabag_support_url: نشانی صفحهٔ پشتیبانی wallabag
+wallabag_url: نشانی صفحهٔ wallabag *شما*
+entry: "مقاله"
+export: "برون‌سپاری"
+import: "درون‌ریزی"
+misc: "غیره"
+modify_settings: "اعمال"

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

@@ -0,0 +1,29 @@
+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é
+export_epub: Activer l'export ePub
+export_mobi: Activer l'export .mobi
+export_pdf: Activer l'export PDF
+export_csv: Activer l'export CSV
+export_json: Activer l'export JSON
+export_txt: Activer l'export TXT
+export_xml: Activer l'export XML
+pocket_consumer_key: Clé d'authentification Pocket pour importer les données (https://getpocket.com/developer/docs/authentication)
+shaarli_url: URL de Shaarli, si le service Shaarli est activé
+share_diaspora: Activer le partage vers Diaspora
+share_mail: Activer le partage par email
+share_shaarli: Activer le partage vers Shaarli
+share_twitter: Activer le partage vers Twitter
+show_printlink: Afficher un lien pour imprimer
+wallabag_support_url: URL de support de wallabag
+wallabag_url: URL de *votre* instance de wallabag
+entry: "article"
+export: "export"
+import: "import"
+misc: "divers"
+modify_settings: "appliquer"
+piwik_host: URL de votre site dans Piwik
+piwik_site_id: ID de votre site dans Piwik
+piwik_enabled: Activer Piwik
+demo_mode_enabled: "Activer le mode démo ? (utiliser uniquement pour la démo publique de wallabag)"
+demo_mode_username: "Utilisateur de la démo"

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

@@ -0,0 +1,29 @@
+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
+export_epub: Activar l'expòrt ePub
+export_mobi: Activar l'expòrt .mobi
+export_pdf: Activar l'expòrt PDF
+export_csv: Activar l'expòrt CSV
+export_json: Activar l'expòrt JSON
+export_txt: Activar l'expòrt TXT
+export_xml: Activar l'expòrt XML
+pocket_consumer_key: Clau d'autentificacion Pocket per importar las donadas (https://getpocket.com/developer/docs/authentication)
+shaarli_url: URL de Shaarli, se lo servici Shaarli es activat
+share_diaspora: Activar lo partatge cap a Diaspora
+share_mail: Activar lo partatge per corrièl
+share_shaarli: Activar lo partatge cap a Shaarli
+share_twitter: Activar lo partatge cap a Twitter
+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
+entry: "article"
+export: "expòrt"
+import: "impòrt"
+misc: "divèrs"
+modify_settings: "aplicar"
+piwik_host: URL de vòstre site dins Piwik
+piwik_site_id: ID de vòstre site dins Piwik
+piwik_enabled: Activar Piwik
+demo_mode_enabled: "Activar lo mode demostracion ? (utilizar solament per la demostracion publica de wallabag)"
+demo_mode_username: "Utilizaire de la demostracion"

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

@@ -0,0 +1,24 @@
+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
+export_epub: Włącz eksport do ePub
+export_mobi: Włącz eksport do .mobi
+export_pdf: Włącz eksport do PDF
+export_csv: Włącz eksport do CSV
+export_json: Włącz eksport do JSON
+export_txt: Włącz eksport do TXT
+export_xml: Włącz eksport do XML
+pocket_consumer_key: Klucz klienta Pocket do importu zawartości (https://getpocket.com/developer/docs/authentication)
+shaarli_url: Adress URL Shaarli, jeżeli usługa jest włączona
+share_diaspora: Włącz udostępnianie dla Diaspora
+share_mail: Włącz udostępnianie przez email
+share_shaarli: Włącz udostępnianie dla Shaarli
+share_twitter: Włącz udostępnianie dla Twitter
+show_printlink: Pokaż link do wydrukowania zawartości
+wallabag_support_url: Adres URL wsparcia dla wallabag
+wallabag_url: Adres *twojej* instacji wallabag
+entry: "artykuł"
+export: "eksport"
+import: "import"
+misc: "różne"
+modify_settings: "zatwierdz"

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

@@ -0,0 +1,24 @@
+download_pictures: Descarcă poze pe server
+carrot: Permite share către Carrot
+diaspora_url: Diaspora URL, dacă serviciul este permis
+export_epub: Permite exportare ePub
+export_mobi: Permite exportare .mobi
+export_pdf: Permite exportare PDF
+export_csv: Permite exportare CSV
+export_json: Permite exportare JSON
+export_txt: Permite exportare TXT
+export_xml: Permite exportare XML
+pocket_consumer_key: Cheie consumator pentru importarea contentului din Pocket (https://getpocket.com/developer/docs/authentication)
+shaarli_url: Shaarli URL, dacă serviciul este permis
+share_diaspora: Permite share către Diaspora
+share_mail: Permite share prin email
+share_shaarli: Permite share către Shaarli
+share_twitter: Permite share către Twitter
+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
+entry: "alticol"
+export: "exportă"
+import: "importă"
+misc: "diverse"
+modify_settings: "aplică"

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

@@ -0,0 +1,43 @@
+{% extends "WallabagCoreBundle::layout.html.twig" %}
+
+{% block title %}{% trans %}internal settings{% endtrans %}{% endblock %}
+
+{% block content %}
+    <div class="row">
+        <div class="col s12">
+            <div class="card-panel settings">
+                {{ form_start(form, {'attr': {'class': 'craue_config_settings_modify'}}) }}
+                    {{ form_errors(form) }}
+
+                    <div class="row">
+                        <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>
+                                {% endfor %}
+                            </ul>
+                        </div>
+
+                        {% for section in sections | craue_sortSections %}
+                            <div id="set-{{ section }}" class="col s12">
+                                {% for setting in form.settings if setting.section.vars.value == section %}
+                                        {{ form_row(setting.name) }}
+                                        {{ form_row(setting.section) }}
+                                        {{ form_row(setting.value, {
+                                            'label': setting.name.vars.value | trans({}, 'CraueConfigBundle'),
+                                        }) }}
+                                {% endfor %}
+                            </div>
+                        {% endfor %}
+                </div>
+
+                <button class="btn waves-effect waves-light" type="submit" name="action">
+                    {{ 'modify_settings' | trans({}, 'CraueConfigBundle') }}
+                </button>
+
+                {{ form_rest(form) }}
+                {{ form_end(form) }}
+            </div>
+        </div>
+    </div>
+{% endblock %}

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

@@ -0,0 +1,2 @@
+Login: "Log ind"
+Enter your email address below and we'll send you password reset instructions.: "Indtast din emailadresse nedenfor, så sender vi dig instrukser til at nulstille din adgangskode."

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

@@ -0,0 +1,2 @@
+Login: "Anmelden"
+Enter your email address below and we'll send you password reset instructions.: "Tippe deine E-Mail-Adresse unten ein und wir senden dir die Anweisungen, wie du dein Kennwort zurücksetzen kannst."

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

@@ -0,0 +1,2 @@
+Login: "Logearse"
+Enter your email address below and we'll send you password reset instructions.: "Introduzca su dirección de email y le enviaremos las instrucciones para resetear su contraseña."

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

@@ -0,0 +1,2 @@
+Login: "Se connecter"
+Enter your email address below and we'll send you password reset instructions.: "Renseignez votre adresse email, nous vous enverrons les instructions pour réinitialiser votre mot de passe."

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

@@ -0,0 +1,2 @@
+Login: "Se connectar"
+Enter your email address below and we'll send you password reset instructions.: "Picatz vòstra adreça de corrièl çai-jos, vos mandarem las instruccions per reïnicializar vòstre senhal."

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

@@ -0,0 +1,2 @@
+Login: "Logowanie"
+Enter your email address below and we'll send you password reset instructions.: "Wpisz poniżej swój adres email, abyśmy mogli wysłać ci instrukcję resetowania hasła."

app/config/capistrano/deploy.rb

@@ -1,6 +1,10 @@
 # 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'
 
@@ -16,8 +20,7 @@ set :log_level, :info
 set :composer_install_flags, '--no-dev --prefer-dist --no-interaction --optimize-autoloader'
 
 set :linked_files, %w{app/config/parameters.yml}
-set :linked_dirs, %w{app/logs web/uploads data}
-
+set :linked_dirs, [fetch(:log_path), "var/sessions", "web/uploads", "data"]
 set :keep_releases, 3
 
 after 'deploy:finishing', 'deploy:cleanup'

app/config/capistrano/deploy/staging.rb

@@ -1,2 +1,2 @@
-set :branch, 'v2'
+set :branch, 'master'
 set :deploy_to, '/var/www/v2.wallabag.org/web/'

app/config/config.yml

@@ -28,10 +28,24 @@ framework:
     assets: ~
 
 wallabag_core:
+    version: 2.0.2
+    paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
     languages:
         en: 'English'
         fr: 'Français'
         de: 'Deutsch'
+        tr: 'Türkçe'
+        fa: 'فارسی'
+        ro: 'Română'
+        pl: 'Polish'
+        da: 'Dansk'
+        es: 'Español'
+        oc: 'Occitan'
+    items_on_page: 12
+    theme: material
+    language: en
+    rss_limit: 50
+    reading_speed: 1
 
 wallabag_import:
     allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain']
@@ -41,25 +55,6 @@ wallabag_import:
 twig:
     debug:            "%kernel.debug%"
     strict_variables: "%kernel.debug%"
-    globals:
-        share_twitter: %share_twitter%
-        share_mail: %share_mail%
-        share_shaarli: %share_shaarli%
-        shaarli_url: %shaarli_url%
-        share_diaspora: %share_diaspora%
-        diaspora_url: %diaspora_url%
-        flattr: %flattr%
-        flattrable: 1
-        flattred: 2
-        carrot: %carrot%
-        show_printlink: %show_printlink%
-        export_epub: %export_epub%
-        export_mobi: %export_mobi%
-        export_pdf: %export_pdf%
-        version: %app.version%
-        twofactor_auth: %twofactor_auth%
-        warning_message: %warning_message%
-        paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
     form_themes:
         - "LexikFormFilterBundle:Form:form_div_layout.html.twig"
 
@@ -87,6 +82,7 @@ doctrine:
         password: "%database_password%"
         charset:  UTF8
         path:     "%database_path%"
+        server_version: 5.6
 
     orm:
         auto_generate_proxy_classes: "%kernel.debug%"
@@ -180,8 +176,10 @@ fos_user:
     user_class: Wallabag\UserBundle\Entity\User
     registration:
         confirmation:
-            enabled: true
-
+            enabled: %fosuser_confirmation%
+    from_email:
+        address:        %from_email%
+        sender_name:    wallabag
 fos_oauth_server:
     db_driver:           orm
     client_class:        Wallabag\ApiBundle\Entity\Client
@@ -207,3 +205,13 @@ scheb_two_factor:
 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"

app/config/config_test.yml

@@ -1,5 +1,6 @@
 imports:
     - { resource: config_dev.yml }
+    - { resource: parameters_test.yml }
 
 framework:
     test: ~
@@ -7,6 +8,8 @@ framework:
         storage_id: session.storage.mock_file
     profiler:
         collect: false
+    translator:
+        enabled: false
 
 web_profiler:
     toolbar: false

app/config/parameters.yml.dist

@@ -19,14 +19,6 @@ parameters:
     database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
     database_table_prefix: wallabag_
 
-    test_database_driver: pdo_sqlite
-    test_database_host: 127.0.0.1
-    test_database_port: ~
-    test_database_name: ~
-    test_database_user: ~
-    test_database_password: ~
-    test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite"
-
     mailer_transport:  smtp
     mailer_host:       127.0.0.1
     mailer_user:       ~
@@ -35,41 +27,13 @@ parameters:
     locale:            en
 
     # A secret key that's used to generate certain security-related tokens
-    secret:            ThisTokenIsNotSoSecretChangeIt
+    secret:            ovmpmAWXRCabNlMgzlzFXDYmCFfzGv
 
-    # wallabag misc
-    app.version: 2.0.0-alpha
+    # two factor stuff
     twofactor_auth: true
     twofactor_sender: no-reply@wallabag.org
 
-    # message to display at the bottom of the page
-    warning_message: >
-        You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new if necessary</a>
+    # fosuser stuff
+    fosuser_confirmation: true
 
-    download_pictures: false # if true, pictures will be stored into data/assets for each article
-
-    # Entry view
-    share_twitter: true
-    share_mail: true
-    share_shaarli: true
-    shaarli_url: http://myshaarli.com
-    share_diaspora: true
-    diaspora_url: http://diasporapod.com
-    flattr: true
-    carrot: true
-    show_printlink: true
-    export_epub: true
-    export_mobi: true
-    export_pdf: true
-    wallabag_url: http://v2.wallabag.org
-    wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
-
-    # default user config
-    items_on_page: 12
-    theme: material
-    language: en
     from_email: no-reply@wallabag.org
-    rss_limit: 50
-
-    # pocket import
-    pocket_consumer_key: xxxxxxxx

app/config/parameters_test.yml

@@ -0,0 +1,8 @@
+parameters:
+    test_database_driver: pdo_sqlite
+    test_database_host: 127.0.0.1
+    test_database_port: null
+    test_database_name: null
+    test_database_user: null
+    test_database_password: null
+    test_database_path: '%kernel.root_dir%/../data/db/wallabag_testYO.sqlite'

app/config/routing.yml

@@ -1,3 +1,7 @@
+wallabag_annotation:
+  type : rest
+  resource: "@WallabagAnnotationBundle/Resources/config/routing_annotations.yml"
+
 wallabag_import:
     resource: "@WallabagImportBundle/Controller/"
     type:     annotation
@@ -22,7 +26,9 @@ rest :
 
 homepage:
     path: "/{page}"
-    defaults: { _controller: WallabagCoreBundle:Entry:showUnread, page : 1 }
+    defaults:
+        _controller: WallabagCoreBundle:Entry:showUnread
+        page : 1
     requirements:
         page: \d+
 
@@ -31,3 +37,8 @@ fos_user:
 
 fos_oauth_server_token:
     resource: "@FOSOAuthServerBundle/Resources/config/routing/token.xml"
+
+craue_config_settings_modify:
+    path: /settings
+    defaults:
+        _controller: CraueConfigBundle:Settings:modify

app/config/routing_rest.yml

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

app/config/security.yml

@@ -53,8 +53,11 @@ security:
 
     access_control:
         - { path: ^/api/doc, roles: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/api/version, roles: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY }
         - { path: /(unread|starred|archive).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/settings, roles: ROLE_SUPER_ADMIN }
+        - { path: ^/annotations, roles: ROLE_USER }
         - { path: ^/, roles: ROLE_USER }

app/config/services.yml

@@ -6,7 +6,7 @@ services:
     filesystem_cache:
         class: Doctrine\Common\Cache\FilesystemCache
         arguments:
-            - %kernel.cache_dir%/doctrine/metadata
+            - "%kernel.cache_dir%/doctrine/metadata"
 
     twig.extension.text:
         class: Twig_Extensions_Extension_Text
@@ -19,6 +19,12 @@ services:
         tags:
             - { name: twig.extension }
 
+    wallabag.twig_piwik_extension:
+        class: PiwikTwigExtension\PiwikTwigExtension
+        public: false
+        tags:
+            - { name: twig.extension }
+
     wallabag.locale_listener:
         class: Wallabag\CoreBundle\EventListener\LocaleListener
         arguments: ["%kernel.default_locale%"]

app/config/tests/parameters.yml.dist.mysql

@@ -1,65 +0,0 @@
-# This file is a "template" of what your parameters.yml file should look like
-parameters:
-    database_driver: pdo_sqlite
-    database_host: 127.0.0.1
-    database_port: ~
-    database_name: symfony
-    database_user: root
-    database_password: ~
-    database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
-    database_table_prefix: wallabag_
-
-    test_database_driver: pdo_mysql
-    test_database_host: localhost
-    test_database_port: 3306
-    test_database_name: wallabag
-    test_database_user: root
-    test_database_password: ~
-    test_database_path: ~
-
-    mailer_transport:  smtp
-    mailer_host:       127.0.0.1
-    mailer_user:       ~
-    mailer_password:   ~
-
-    locale:            en
-
-    # A secret key that's used to generate certain security-related tokens
-    secret:            ThisTokenIsNotSoSecretChangeIt
-
-    # wallabag misc
-    app.version: 2.0.0-alpha
-    twofactor_auth: true
-    twofactor_sender: no-reply@wallabag.org
-
-    # message to display at the bottom of the page
-    warning_message: >
-        You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new if necessary</a>
-
-    download_pictures: false # if true, pictures will be stored into data/assets for each article
-
-    # Entry view
-    share_twitter: true
-    share_mail: true
-    share_shaarli: true
-    shaarli_url: http://myshaarli.com
-    share_diaspora: true
-    diaspora_url: http://diasporapod.com
-    flattr: true
-    carrot: true
-    show_printlink: true
-    export_epub: true
-    export_mobi: true
-    export_pdf: true
-    wallabag_url: http://v2.wallabag.org
-    wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
-
-    # default user config
-    items_on_page: 12
-    theme: material
-    language: en_US
-    from_email: no-reply@wallabag.org
-    rss_limit: 50
-
-    # pocket import
-    pocket_consumer_key: xxxxxxxx

app/config/tests/parameters.yml.dist.pgsql

@@ -1,65 +0,0 @@
-# This file is a "template" of what your parameters.yml file should look like
-parameters:
-    database_driver: pdo_sqlite
-    database_host: 127.0.0.1
-    database_port: ~
-    database_name: symfony
-    database_user: root
-    database_password: ~
-    database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
-    database_table_prefix: wallabag_
-
-    test_database_driver: pdo_pgsql
-    test_database_host: localhost
-    test_database_port:
-    test_database_name: wallabag
-    test_database_user: travis
-    test_database_password: ~
-    test_database_path: ~
-
-    mailer_transport:  smtp
-    mailer_host:       127.0.0.1
-    mailer_user:       ~
-    mailer_password:   ~
-
-    locale:            en
-
-    # A secret key that's used to generate certain security-related tokens
-    secret:            ThisTokenIsNotSoSecretChangeIt
-
-    # wallabag misc
-    app.version: 2.0.0-alpha
-    twofactor_auth: true
-    twofactor_sender: no-reply@wallabag.org
-
-    # message to display at the bottom of the page
-    warning_message: >
-        You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new if necessary</a>
-
-    download_pictures: false # if true, pictures will be stored into data/assets for each article
-
-    # Entry view
-    share_twitter: true
-    share_mail: true
-    share_shaarli: true
-    shaarli_url: http://myshaarli.com
-    share_diaspora: true
-    diaspora_url: http://diasporapod.com
-    flattr: true
-    carrot: true
-    show_printlink: true
-    export_epub: true
-    export_mobi: true
-    export_pdf: true
-    wallabag_url: http://v2.wallabag.org
-    wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
-
-    # default user config
-    items_on_page: 12
-    theme: material
-    language: en_US
-    from_email: no-reply@wallabag.org
-    rss_limit: 50
-
-    # pocket import
-    pocket_consumer_key: xxxxxxxx

app/config/tests/parameters.yml.dist.sqlite

@@ -1,65 +0,0 @@
-# This file is a "template" of what your parameters.yml file should look like
-parameters:
-    database_driver: pdo_sqlite
-    database_host: 127.0.0.1
-    database_port: ~
-    database_name: symfony
-    database_user: root
-    database_password: ~
-    database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
-    database_table_prefix: wallabag_
-
-    test_database_driver: pdo_sqlite
-    test_database_host: localhost
-    test_database_port:
-    test_database_name: ~
-    test_database_user: ~
-    test_database_password: ~
-    test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite"
-
-    mailer_transport:  smtp
-    mailer_host:       127.0.0.1
-    mailer_user:       ~
-    mailer_password:   ~
-
-    locale:            en
-
-    # A secret key that's used to generate certain security-related tokens
-    secret:            ThisTokenIsNotSoSecretChangeIt
-
-    # wallabag misc
-    app.version: 2.0.0-alpha
-    twofactor_auth: true
-    twofactor_sender: no-reply@wallabag.org
-
-    # message to display at the bottom of the page
-    warning_message: >
-        You're trying wallabag v2, which is in alpha version. If you find a bug, please have a look to <a href="https://github.com/wallabag/wallabag/issues">our issues list</a> and <a href="https://github.com/wallabag/wallabag/issues/new">open a new if necessary</a>
-
-    download_pictures: false # if true, pictures will be stored into data/assets for each article
-
-    # Entry view
-    share_twitter: true
-    share_mail: true
-    share_shaarli: true
-    shaarli_url: http://myshaarli.com
-    share_diaspora: true
-    diaspora_url: http://diasporapod.com
-    flattr: true
-    carrot: true
-    show_printlink: true
-    export_epub: true
-    export_mobi: true
-    export_pdf: true
-    wallabag_url: http://v2.wallabag.org
-    wallabag_support_url: 'https://www.wallabag.org/pages/support.html'
-
-    # default user config
-    items_on_page: 12
-    theme: material
-    language: en_US
-    from_email: no-reply@wallabag.org
-    rss_limit: 50
-
-    # pocket import
-    pocket_consumer_key: xxxxxxxx

app/config/tests/parameters_test.mysql.yml

@@ -0,0 +1,8 @@
+parameters:
+    test_database_driver: pdo_mysql
+    test_database_host: localhost
+    test_database_port: 3306
+    test_database_name: wallabag_test
+    test_database_user: root
+    test_database_password: ~
+    test_database_path: ~

app/config/tests/parameters_test.pgsql.yml

@@ -0,0 +1,8 @@
+parameters:
+    test_database_driver: pdo_pgsql
+    test_database_host: localhost
+    test_database_port:
+    test_database_name: wallabag_test
+    test_database_user: travis
+    test_database_password: ~
+    test_database_path: ~

app/config/tests/parameters_test.sqlite.yml

@@ -0,0 +1,8 @@
+parameters:
+    test_database_driver: pdo_sqlite
+    test_database_host: localhost
+    test_database_port:
+    test_database_name: ~
+    test_database_user: ~
+    test_database_password: ~
+    test_database_path: "%kernel.root_dir%/../data/db/wallabag_testHU.sqlite"

bin/php-cs-fixer

@@ -0,0 +1 @@
+../vendor/fabpot/php-cs-fixer/php-cs-fixer

bin/symfony_requirements

@@ -7,7 +7,7 @@ $lineSize = 70;
 $symfonyRequirements = new SymfonyRequirements();
 $iniPath = $symfonyRequirements->getPhpIniConfigPath();
 
-echo_title('Symfony2 Requirements Checker');
+echo_title('Symfony Requirements Checker');
 
 echo '> PHP is using the following php.ini file:'.PHP_EOL;
 if ($iniPath) {
@@ -43,9 +43,9 @@ foreach ($symfonyRequirements->getRecommendations() as $req) {
 }
 
 if ($checkPassed) {
-    echo_block('success', 'OK', 'Your system is ready to run Symfony2 projects');
+    echo_block('success', 'OK', 'Your system is ready to run Symfony projects');
 } else {
-    echo_block('error', 'ERROR', 'Your system is not ready to run Symfony2 projects');
+    echo_block('error', 'ERROR', 'Your system is not ready to run Symfony projects');
 
     echo_title('Fix the following mandatory requirements', 'red');
 

build.xml

@@ -42,8 +42,8 @@
     <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.yml.dist.mysql"/>
-            <arg value="${basedir}/app/config/parameters.yml"/>
+            <arg value="${basedir}/app/config/tests/parameters_test.mysql.yml"/>
+            <arg value="${basedir}/app/config/parameters_test.yml"/>
         </exec>
 
         <exec executable="php">
@@ -56,8 +56,8 @@
     <target name="db_sqlite" description="Run test for SQLite">
         <delete dir="${basedir}/app/config/parameters.yml"/>
         <exec executable="cp">
-            <arg value="${basedir}/app/config/tests/parameters.yml.dist.sqlite"/>
-            <arg value="${basedir}/app/config/parameters.yml"/>
+            <arg value="${basedir}/app/config/tests/parameters_test.sqlite.yml"/>
+            <arg value="${basedir}/app/config/parameters_test.yml"/>
         </exec>
 
         <exec executable="php">
@@ -70,8 +70,8 @@
     <target name="db_pgsql" description="Run test for PostgreSQL">
         <delete dir="${basedir}/app/config/parameters.yml"/>
         <exec executable="cp">
-            <arg value="${basedir}/app/config/tests/parameters.yml.dist.pgsql"/>
-            <arg value="${basedir}/app/config/parameters.yml"/>
+            <arg value="${basedir}/app/config/tests/parameters_test.pgsql.yml"/>
+            <arg value="${basedir}/app/config/parameters_test.yml"/>
         </exec>
 
         <exec executable="php">

composer.json

@@ -29,6 +29,20 @@
     },
     "require": {
         "php": ">=5.5.9",
+        "ext-pcre": "*",
+        "ext-dom": "*",
+        "ext-curl": "*",
+        "ext-gd": "*",
+        "ext-session": "*",
+        "ext-ctype": "*",
+        "ext-hash": "*",
+        "ext-simplexml": "*",
+        "ext-json": "*",
+        "ext-mbstring": "*",
+        "ext-xml": "*",
+        "ext-iconv": "*",
+        "ext-tokenizer": "*",
+        "ext-pdo": "*",
         "symfony/symfony": "3.0.*",
         "doctrine/orm": "^2.5",
         "doctrine/doctrine-bundle": "^1.6",
@@ -44,7 +58,6 @@
         "friendsofsymfony/rest-bundle": "~1.4",
         "jms/serializer-bundle": "~1.0",
         "nelmio/api-doc-bundle": "~2.7",
-        "ezyang/htmlpurifier": "~4.6",
         "mgargano/simplehtmldom": "~1.5",
         "tecnickcom/tcpdf": "~6.2",
         "simplepie/simplepie": "~1.3.1",
@@ -54,8 +67,8 @@
         "pagerfanta/pagerfanta": "~1.0.3",
         "lexik/form-filter-bundle": "~5.0",
         "j0k3r/graby": "~1.0",
-        "friendsofsymfony/user-bundle": "dev-master",
-        "friendsofsymfony/oauth-server-bundle": "^1.5@dev",
+        "friendsofsymfony/user-bundle": "~2.0@dev",
+        "friendsofsymfony/oauth-server-bundle": "^1.5",
         "stof/doctrine-extensions-bundle": "^1.2@dev",
         "scheb/two-factor-bundle": "~2.0",
         "grandt/phpepub": "~4.0",
@@ -63,20 +76,23 @@
         "kphoen/rulerz-bundle": "~0.10",
         "guzzlehttp/guzzle": "^5.2.0",
         "doctrine/doctrine-migrations-bundle": "^1.0",
-        "paragonie/random_compat": "~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"
     },
     "require-dev": {
         "doctrine/doctrine-fixtures-bundle": "~2.2",
         "sensio/generator-bundle": "^3.0",
         "phpunit/phpunit": "~4.4",
-        "symfony/phpunit-bridge": "^2.7"
+        "symfony/phpunit-bridge": "^2.7",
+        "fabpot/php-cs-fixer": "~1.9"
     },
     "scripts": {
-        "build-parameters": [
-            "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters"
-        ],
         "post-cmd": [
-            "@build-parameters",
+            "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
             "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
@@ -98,17 +114,11 @@
         "symfony-tests-dir": "tests",
         "symfony-assets-install": "relative",
         "incenteev-parameters": {
-            "file": "app/config/parameters.yml",
-            "env-map": {
-                "mailer_host": "WALLABAG_MAILER_HOST",
-                "mailer_user": "WALLABAG_MAILER_USER",
-                "mailer_password": "WALLABAG_MAILER_PASSWORD",
-                "secret": "WALLABAG_SECRET"
-            }
+            "file": "app/config/parameters.yml"
         }
     },
     "autoload": {
-        "psr-4": { "": "src/" },
+        "psr-4": { "Wallabag\\": "src/Wallabag/" },
         "classmap": [ "app/AppKernel.php", "app/AppCache.php" ]
     },
     "config": {

docker-compose.yml

@@ -1,42 +1,48 @@
-nginx:
-    image: nginx
-    ports:
-        - "8080:80"
-    volumes:
-        - ./docker/nginx/nginx.conf:/nginx.conf
-        - ./docker/logs/nginx:/var/log/nginx
-        - .:/var/www/html
-    links:
-        - php:php
-    command: nginx -c /nginx.conf
-php:
-    build: docker/php
-    ports:
-        - "9000:9000"
-    volumes:
-        - .:/var/www/html
-    #links:
-        # - "postgres:rdbms"
-        # - "mariadb:rdbms"
-    env_file:
-        - ./docker/php/env
-        # Comment non-used DBMS lines
-        # If all DBMS are commented out, sqlite will be used as default
-        # - ./docker/postgres/env
-        # - ./docker/mariadb/env
-#postgres:
-#    image: postgres:9
-#    ports:
-#        - "5432:5432"
-#    volumes:
-#        - ./docker/data/pgsql:/var/lib/postgresql/data
-#    env_file:
-#        - ./docker/postgres/env
-#mariadb:
-#    image: mariadb:10
-#    ports:
-#        - "3306:3306"
-#    volumes:
-#        - ./docker/data/mariadb:/var/lib/mysql
-#    env_file:
-#        - ./docker/mariadb/env
+version: '2'
+services:
+    nginx:
+        image: nginx
+        ports:
+            - "8080:80"
+        volumes:
+            - ./docker/nginx/nginx.conf:/nginx.conf
+            - ./docker/logs/nginx:/var/log/nginx
+            - .:/var/www/html
+        links:
+            - php:php
+        command: nginx -c /nginx.conf
+    php:
+        build:
+            context: docker/php
+            args:
+                # Set here your timezone using one of this: http://php.net/manual/en/timezones.php
+                timezone: 'Europe/Monaco'
+        ports:
+            - "9000:9000"
+        volumes:
+            - .:/var/www/html
+        #links:
+            # - "postgres:rdbms"
+            # - "mariadb:rdbms"
+        env_file:
+            - ./docker/php/env
+            # Comment non-used DBMS lines
+            # If all DBMS are commented out, sqlite will be used as default
+            # - ./docker/postgres/env
+            # - ./docker/mariadb/env
+    #postgres:
+    #    image: postgres:9
+    #    ports:
+    #        - "5432:5432"
+    #    volumes:
+    #        - ./docker/data/pgsql:/var/lib/postgresql/data
+    #    env_file:
+    #        - ./docker/postgres/env
+    #mariadb:
+    #    image: mariadb:10
+    #    ports:
+    #        - "3306:3306"
+    #    volumes:
+    #        - ./docker/data/mariadb:/var/lib/mysql
+    #    env_file:
+    #        - ./docker/mariadb/env

docker/php/Dockerfile

@@ -1,10 +1,15 @@
 FROM php:fpm
 
+# Default timezone. To change it, use the argument in the docker-compose.yml file
+ARG timezone='Europe/Paris'
+
 RUN apt-get update && apt-get install -y \
         libmcrypt-dev libicu-dev libpq-dev libxml2-dev \
     && docker-php-ext-install \
         iconv mcrypt mbstring intl pdo pdo_mysql pdo_pgsql
 
+RUN echo "date.timezone="$timezone > /usr/local/etc/php/conf.d/date_timezone.ini
+
 RUN usermod -u 1000 www-data
 
 CMD ["php-fpm"]

docs/en/developer/docker.rst

@@ -1,4 +1,4 @@
-Run Wallabag in docker-compose
+Run wallabag in docker-compose
 ==============================
 
 In order to run your own development instance of wallabag, you may
@@ -15,11 +15,11 @@ your system and up to date.
 Switch DBMS
 -----------
 
-By default, Wallabag will start with a sqlite database.
-Since Wallabag provide support for Postgresql and MySQL, docker
+By default, wallabag will start with a SQLite database.
+Since wallabag provides support for Postgresql and MySQL, docker
 containers are also available for these ones.
 
-In ``docker-compose.yml``, for the chosen DBMS uncomment :
+In ``docker-compose.yml``, for the chosen DBMS uncomment:
 
 - the container definition (``postgres`` or ``mariadb`` root level
   block)
@@ -27,13 +27,13 @@ In ``docker-compose.yml``, for the chosen DBMS uncomment :
 - the container env file in the ``php`` container
 
 In order to keep running Symfony commands on your host (such as
-``wallabag:install``), you also should :
+``wallabag:install``), you also should:
 
 - source the proper env files on your command line, so variables
   like ``SYMFONY__ENV__DATABASE_HOST`` will exist.
 - create a ``127.0.0.1 rdbms`` on your system ``hosts`` file
 
-Run Wallabag
+Run wallabag
 ------------
 
 #. Fork and clone the project

docs/en/developer/maintenance.rst

@@ -0,0 +1,32 @@
+Maintenance mode
+================
+
+If you have some long tasks to do on your wallabag instance, you can enable a maintenance mode.
+Nobody will have access to your instance.
+
+Enable maintenance mode
+-----------------------
+
+To enable maintenance mode, execute this command:
+
+::
+
+    bin/console lexik:maintenance:lock --no-interaction
+
+You can set your IP address in ``app/config/config.yml`` if you want to access to wallabag even if maintenance mode is enabled. For example:
+
+::
+
+    lexik_maintenance:
+        authorized:
+            ips: ['127.0.0.1']
+
+
+Disable maintenance mode
+------------------------
+
+To disable maintenance mode, execute this command:
+
+::
+
+    bin/console lexik:maintenance:unlock

docs/en/developer/translate.rst

@@ -0,0 +1,60 @@
+Translate wallabag
+==================
+
+wallabag web application
+------------------------
+
+Translation files
+~~~~~~~~~~~~~~~~~
+
+.. note::
+
+    As wallabag is mainly developed by a French team, please consider that french
+    translation is the most updated one and please copy it to create your own translation.
+
+You can find translation files here: https://github.com/wallabag/wallabag/tree/master/src/Wallabag/CoreBundle/Resources/translations.
+
+You have to create ``messages.CODE.yml``, where CODE
+is the ISO 639-1 code of your language (`see wikipedia <https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes>`__).
+
+Other files to translate:
+
+- https://github.com/wallabag/wallabag/tree/master/app/Resources/CraueConfigBundle/translations.
+- https://github.com/wallabag/wallabag/tree/master/app/Resources/FOSUserBundle/translations.
+
+You have to create ``THE_TRANSLATION_FILE.CODE.yml`` files.
+
+Configuration file
+~~~~~~~~~~~~~~~~~~
+
+You have to edit `app/config/config.yml
+<https://github.com/wallabag/wallabag/blob/master/app/config/config.yml>`__ to display
+your language on Configuration page of wallabag (to allow users to switch to this new translation).
+
+Under the ``wallabag_core.languages`` section, you have to add a new line with
+your translation. For example:
+
+::
+
+    wallabag_core:
+        ...
+        languages:
+            en: 'English'
+            fr: 'Français'
+
+
+For the first column (``en``, ``fr``, etc.), you have to add the ISO 639-1 code
+of your language (see above).
+
+For the second column, it's the name of your language. Just that.
+
+wallabag documentation
+----------------------
+
+.. note::
+
+    Contrary to the web application, the main language for documentation is english.
+
+Documentation files are stored here: https://github.com/wallabag/wallabag/tree/master/docs
+
+You need to respect the ``en`` folder structure when you create your own translation.

docs/en/index.rst

@@ -8,6 +8,10 @@ wallabag documentation
 **wallabag** is a read-it-later application: it saves a web page by
 keeping content only. Elements like navigation or ads are deleted.
 
+.. note::
+
+    This documentation is about wallabag v2. If you want to read documentation for wallabag v1, `please have a look here <https://github.com/wallabag/documentation>`__.
+
 The main documentation for this application is organized into a couple sections:
 
 * :ref:`user-docs`
@@ -19,10 +23,14 @@ The main documentation for this application is organized into a couple sections:
    :maxdepth: 2
    :caption: User documentation
 
+   user/installation
+   user/migration
    user/create_account
    user/login
    user/configuration
    user/first_article
+   user/errors_during_fetching
+   user/annotations
    user/import
    user/download_articles
    user/filters
@@ -34,4 +42,7 @@ The main documentation for this application is organized into a couple sections:
    :maxdepth: 2
    :caption: Developer documentation
 
-   developer/docker
+   developer/api
+   developer/docker
+   developer/translate
+   developer/maintenance

docs/en/user/annotations.rst

@@ -0,0 +1,24 @@
+Annotations
+===========
+
+In each article you read, you can write annotations. It's easier to understand with some pictures.
+
+Select the part of the article that you want to annotate and click on the pencil:
+
+.. image:: ../../img/user/annotations_1.png
+   :alt: Select your text
+   :align: center
+
+Then, write your annotation:
+
+.. image:: ../../img/user/annotations_2.png
+   :alt: Write your annotation
+   :align: center
+
+The text is now highlighted and you can read your annotation if you move the mouse cursor over it.
+
+.. image:: ../../img/user/annotations_3.png
+   :alt: Read your annotation
+   :align: center
+
+You can create as many annotations as you wish.

docs/en/user/configuration.rst

@@ -3,7 +3,8 @@ Configuration
 
 Now you're logged in, it's time to configure your account as you want.
 
-Click on ``Config`` menu. You have five tabs: ``Settings``, ``RSS``, ``User information``, ``Password`` and ``Tagging rules``.
+Click on ``Config`` menu. You have five tabs: ``Settings``, ``RSS``,
+``User information``, ``Password`` and ``Tagging rules``.
 
 Settings
 --------
@@ -11,17 +12,26 @@ Settings
 Theme
 ~~~~~
 
-wallabag is customizable. You can choose your prefered theme here. You can also create a new one, a chapter is dedicated for this. The default theme is ``Material``, it's the theme used in the documentation screenshots. 
+wallabag is customizable. You can choose your prefered theme here. You can also
+create a new one, a chapter will be dedicated for this. The default theme is
+``Material``, it's the theme used in the documentation screenshots.
 
 Items per page
 ~~~~~~~~~~~~~~
 
 You can change the number of articles displayed on each page.
 
+Reading speed
+~~~~~~~~~~~~~
+
+wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are
+a fast or a slow reader. wallabag will recalculate the reading time for each article.
+
 Language
 ~~~~~~~~
 
-You can change the language of wallabag interface.
+You can change the language of wallabag interface. You need to logout for this change
+to take effect.
 
 RSS
 ---
@@ -43,41 +53,49 @@ You can change your name, your email address and enable ``Two factor authenticat
 Two factor authentication
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    Two-factor authentication (also known as 2FA) is a technology patented in 1984 that provides identification of users by means of the combination of two different components.
+    Two-factor authentication (also known as 2FA) is a technology patented in 1984
+    that provides identification of users by means of the combination of two different components.
 
 https://en.wikipedia.org/wiki/Two-factor_authentication
 
-If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email. You have to put this code on the following form.
+If you enable 2FA, each time you want to login to wallabag, you'll receive
+a code by email. You have to put this code on the following form.
 
 .. image:: ../../img/user/2FA_form.png
-   :alt: Two factor authentication
-   :align: center
+    :alt: Two factor authentication
+    :align: center
 
-If you don't want to receive a code each time you want to login, you can check the ``I'm on a trusted computer`` checkbox: wallabag will remember you for 15 days.
+If you don't want to receive a code each time you want to login, you can check
+the ``I'm on a trusted computer`` checkbox: wallabag will remember you for 15 days.
 
 Password
 --------
 
-You can change your password here.
+You can change your password here (8 characters minimum).
 
 Tagging rules
 -------------
 
-If you want to automatically assign a tag to new articles, this part of the configuration is for you.
+If you want to automatically assign a tag to new articles, this part
+of the configuration is for you.
 
 What does « tagging rules » mean?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 They are rules used by wallabag to automatically tag new entries.
-Each time a new entry is added, all the tagging rules will be used to add the tags you configured, thus saving you the trouble to manually classify your entries.
+Each time a new entry is added, all the tagging rules will be used to add
+the tags you configured, thus saving you the trouble to manually classify your entries.
 
 How do I use them?
 ~~~~~~~~~~~~~~~~~~
 
-Let assume you want to tag new entries as *« short reading »* when the reading time is inferior to 3 minutes.
-In that case, you should put « readingTime <= 3 » in the **Rule** field and *« short reading »* in the **Tags** field.
+Let assume you want to tag new entries as *« short reading »* when
+the reading time is inferior to 3 minutes.
+In that case, you should put « readingTime <= 3 » in the **Rule** field
+and *« short reading »* in the **Tags** field.
 Several tags can added simultaneously by separating them by a comma: *« short reading, must read »*.
-Complex rules can be written by using predefined operators: if *« readingTime >= 5 AND domainName = "github.com" »* then tag as *« long reading, github »*.
+Complex rules can be written by using predefined operators:
+if *« readingTime >= 5 AND domainName = "github.com" »* then tag as *« long reading, github »*.
 
 Which variables and operators can I use to write rules?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -96,4 +114,4 @@ language     The entry's language                            !=        Not equal
 mimetype     The entry's mime-type                           OR        One rule or another
 readingTime  The estimated entry's reading time, in minutes  AND       One rule and another
 domainName   The domain name of the entry                    matches   Tests that a subject is matches a search (case-insensitive). Example: title matches "football"
-===========  ==============================================  ========  ==========
+===========  ==============================================  ========  ==========

docs/en/user/create_account.rst

@@ -7,13 +7,16 @@ On the login page, click on ``Register`` button.
    :alt: Registration form
    :align: center
 
-You have to fill the form. Please sure to type a valid email address, we'll send you an activation email.
+You have to fill the form. Please sure to type a valid email address,
+we'll send you an activation email.
 
 .. image:: ../../img/user/sent_email.png
    :alt: Email was sent to activate account
    :align: center
 
-Check your inbox, you now have a new mail with a link like this ``http://wallabag/register/confirm/Ba19wokGovN-DdBQNfg4YgRkUQWRP4-k2g0Bk-hBTX4``. Click on it to activate your account.
+Check your inbox, you now have a new mail with a link like this
+``http://wallabag/register/confirm/Ba19wokGovN-DdBQNfg4YgRkUQWRP4-k2g0Bk-hBTX4``.
+Click on it to activate your account.
 
 Your account is now activated.
 
@@ -33,11 +36,11 @@ Make sure that all fields are well filled:
 * same passwords in two fields
 
 I don't receive my activation email
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Are you sure your email address was correct? Did you check your spams folder?
 
 When I click on the activation link, I've got this message: ``The user with confirmation token "DtrOPfbQeVkWf6N" does not exist``.
-~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 You already enabled your account or the URL of the activation email is wrong.

docs/en/user/download_articles.rst

@@ -9,8 +9,9 @@ On the article view, click on this icon, in the sidebar:
    :alt: download article
    :align: center
 
-You can also download a full category in these formats. For example, on **Unread** view, click on this icon in the top bar:
+You can also download a full category (unread, starred, archive) in these formats.
+For example, on **Unread** view, click on this icon in the top bar:
 
 .. image:: ../../img/user/download_articles.png
    :alt: download articles
-   :align: center
+   :align: center

docs/en/user/errors_during_fetching.rst

@@ -0,0 +1,27 @@
+Errors during fetching articles
+===============================
+
+Why does the fetch of an article fail?
+--------------------------------------
+
+There may be several reasons:
+
+- network problem
+- wallabag can't fetch content due to the website structure
+
+How can I help to fix that?
+---------------------------
+
+- `by sending us an email with the article's URL <mailto:hello\@wallabag.org>`_
+- by trying to fix this article by yourself :) by creating a file for the article.
+  You can use `this tool <http://siteconfig.fivefilters.org/>`__.
+
+How can I try to re-fetch this article?
+---------------------------------------
+
+If wallabag failed when fetching an article, you can click on the reload button
+(the third on the below picture).
+
+.. image:: ../../img/user/refetch.png
+   :alt: Refetch content
+   :align: center

docs/en/user/filters.rst

@@ -1,2 +1,49 @@
 Filters
-=======
+=======
+
+To retrieve articles easier, you can use filters.
+Click on the third icon in the top bar.
+
+.. image:: ../../img/user/topbar.png
+   :alt: Top bar
+   :align: center
+
+All these filters can be combined.
+
+.. image:: ../../img/user/filters.png
+   :alt: Combine all filters
+   :align: center
+
+Status
+------
+
+Use these checkboxes to find archived or starred articles.
+
+Preview picture
+---------------
+
+Check this filter if you want to retrieve articles with a preview picture.
+
+Language
+--------
+
+wallabag (via graby) can detect article language. It's easy to you to retrieve articles
+written in a specific language.
+
+Reading time
+------------
+
+wallabag estimates how many time you need to read an article. With this filter,
+you can for example find the articles with a reading time between 2 and 5 minutes.
+
+Domain name
+-----------
+
+Thanks to this filter, you can retrieve the articles from the same domain name.
+For example, in this field, type ``bbc.co.uk`` to retrieve the articles of this website.
+
+Creation date
+-------------
+
+When you save an article, wallabag stored the current date. So handful to retrieve articles written
+between 1st and 31th January for example.

docs/en/user/first_article.rst

@@ -10,20 +10,24 @@ The main purpose of wallabag is to save web articles. You have many ways to do i
 By using a bookmarklet
 ----------------------
 
-On the ``Howto`` page, you have a ``Bookmarklet`` tab. Drag and drop the ``bag it!`` link to your bookmarks bar of your browser.
+On the ``Howto`` page, you have a ``Bookmarklet`` tab. Drag and drop the ``bag it!``
+link to your bookmarks bar of your browser.
 
-Now, each time you're reading an article on the web and you want to save it, click on the ``bag it!`` link in your bookmarks bar. The article is saved.
+Now, each time you're reading an article on the web and you want to save it,
+click on the ``bag it!`` link in your bookmarks bar. The article is saved.
 
 By using the classic form
 -------------------------
 
-In the top bar of your screen, you have 3 icons. With the first one, a plus sign, you can easily save a new article.
+In the top bar of your screen, you have 3 icons. With the first one, a plus sign,
+you can easily save a new article.
 
 .. image:: ../../img/user/topbar.png
    :alt: Top bar
    :align: center
 
-Click on it to display a new field, paste the article URL inside and press your ``Return`` key. The article is saved.
+Click on it to display a new field, paste the article URL inside and press your
+``Return`` key. The article is saved.
 
 By using a browser add-on
 -------------------------
@@ -59,4 +63,4 @@ Windows Phone
 iOS
 ~~~
 
-*This application is not yet available for wallabag v2*.
+*This application is not yet available for wallabag v2*.

docs/en/user/import.rst

@@ -1,8 +1,8 @@
 Migrate to wallabag
 ===================
 
-From wallabag 1.x
------------------
+From wallabag
+-------------
 
 Export your data from your wallabag 1.x
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -15,38 +15,57 @@ On your config page, click on ``JSON export`` in the ``Export your wallabag data
 
 You will have a ``wallabag-export-1-1970-01-01.json`` file.
 
+Export your data from your wallabag 2.x
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+On the export sidebar, click on ``JSON``.
+
+.. image:: ../../img/user/export_wllbg_2.png
+   :alt: Export from wallabag 2.x
+   :align: center
+
+You will have a ``Unread articles.json`` file.
+
 Import your data into wallabag 2.x
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Click on  ``Import`` link in the menu, select your export file on your computer and import it.
+Click on  ``Import`` link in the menu, choose the right wallabag version,
+select your export file on your computer and import it.
 
 .. image:: ../../img/user/import_wllbg.png
    :alt: Import from wallabag 1.x
    :align: center
 
-All your wallabag 1.x articles will be imported.
+All your wallabag articles will be imported.
 
 From Pocket
 -----------
 
-Create a new applicaton on Pocket
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Create a new application on Pocket
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-To import your data from Pocket, we use the Pocket API. You need to create a new application on their developer website to continue.
+To import your data from Pocket, we use the Pocket API. You need to create
+a new application on their developer website to continue.
 
 * Create a new application `on the developer website <https://getpocket.com/developer/apps/new>`_
-* Fill in the required fields: application name, application description, permissions (only **retrieve**), platform (**web**), accept the terms of service and submit your new application
+* Fill in the required fields: application name, application description,
+  permissions (only **retrieve**), platform (**web**), accept the terms of service
+  and submit your new application
 
-Pocket will give you a **Consumer Key** (for example, `49961-985e4b92fe21fe4c78d682c1`). You need to configure the ``pocket_consumer_key`` into the ``app/config/parameters.yml`` file in wallabag.
+Pocket will give you a **Consumer Key** (for example, `49961-985e4b92fe21fe4c78d682c1`).
+You need to configure the ``pocket_consumer_key`` into the ``app/config/parameters.yml`` file in wallabag.
 
 Now, all is fine to migrate from Pocket.
 
 Import your data into wallabag 2.x
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Click on  ``Import`` link in the menu, on ``Import contents`` in Pocket section and then on ``Connect to Pocket and import data``.
+Click on  ``Import`` link in the menu, on ``Import contents`` in Pocket section
+and then on ``Connect to Pocket and import data``.
 
-You need to authorize wallabag to interact with your Pocket account. Your data will be imported. Data import can be a demanding process for your server (we need to work on this import to improve it). 
+You need to authorize wallabag to interact with your Pocket account.
+Your data will be imported. Data import can be a demanding process for your server
+(we need to work on this import to improve it).
 
 From Instapaper
 ---------------

docs/en/user/installation.rst

@@ -0,0 +1,156 @@
+Install wallabag
+================
+
+Requirements
+------------
+
+wallabag is compatible with PHP >= 5.5, including PHP 7.
+
+You'll need the following extensions for wallabag to work. Some of these may already activated in your version of PHP, so you may not have to install all corresponding packages.
+
+- php-session
+- php-ctype
+- php-dom
+- php-hash
+- php-simplexml
+- php-json
+- php-gd
+- php-mbstring
+- php-xml
+- php-tidy
+- php-iconv
+- php-curl
+- php-gettext
+- php-tokenizer
+
+wallabag uses PDO to connect to database, so you'll need one of:
+
+- pdo_mysql
+- pdo_sqlite
+- pdo_pgsql
+
+and it's corresponding database server.
+
+Installation
+------------
+
+wallabag uses a big number of libraries in order to function. These libraries must be installed with a tool called Composer. You need to install it if you don't already have.
+
+Install Composer:
+
+::
+
+    curl -s http://getcomposer.org/installer | php
+
+You can find specific instructions `here <https://getcomposer.org/doc/00-intro.md>`__:
+
+To install wallabag itself, you must run these two commands:
+
+::
+
+    git clone https://github.com/wallabag/wallabag.git
+    cd wallabag
+    git checkout 2.0.2
+    SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
+    php bin/console wallabag:install --env=prod
+
+To start php's build-in server and test if everything did install correctly, you can do:
+
+::
+
+    php bin/console server:run --env=prod
+
+And access wallabag at http://yourserverip:8000
+
+.. note::
+
+    To define parameters with environment variables, you have to set these variables with ``SYMFONY__`` prefix. For example, ``SYMFONY__DATABASE_DRIVER``. You can have a look to the `Symfony documentation <http://symfony.com/doc/current/cookbook/configuration/external_parameters.html>`__.
+
+Installing on Apache
+--------------------
+
+Assuming you install wallabag in the /var/www/wallabag folder and that you want to use php as an Apache module, here's a vhost for wallabag:
+
+::
+
+    <VirtualHost *:80>
+        ServerName domain.tld
+        ServerAlias www.domain.tld
+
+        DocumentRoot /var/www/wallabag/web
+        <Directory /var/www/wallabag/web>
+            AllowOverride None
+            Order Allow,Deny
+            Allow from All
+
+            <IfModule mod_rewrite.c>
+                Options -MultiViews
+                RewriteEngine On
+                RewriteCond %{REQUEST_FILENAME} !-f
+                RewriteRule ^(.*)$ app.php [QSA,L]
+            </IfModule>
+        </Directory>
+
+        # uncomment the following lines if you install assets as symlinks
+        # or run into problems when compiling LESS/Sass/CoffeScript assets
+        # <Directory /var/www/wallabag>
+        #     Options FollowSymlinks
+        # </Directory>
+
+        # optionally disable the RewriteEngine for the asset directories
+        # which will allow apache to simply reply with a 404 when files are
+        # not found instead of passing the request into the full symfony stack
+        <Directory /var/www/wallabag/web/bundles>
+            <IfModule mod_rewrite.c>
+                RewriteEngine Off
+            </IfModule>
+        </Directory>
+        ErrorLog /var/log/apache2/wallabag_error.log
+        CustomLog /var/log/apache2/wallabag_access.log combined
+    </VirtualHost>
+
+After reloading or restarting Apache, you should now be able to access wallabag at http://domain.tld.
+
+Installing on Nginx
+-------------------
+
+Assuming you install wallabag in the /var/www/wallabag folder, here's the recipe for wallabag :
+
+::
+
+    server {
+        server_name domain.tld www.domain.tld;
+        root /var/www/wallabag/web;
+
+        location / {
+            # try to serve file directly, fallback to app.php
+            try_files $uri /app.php$is_args$args;
+        }
+        location ~ ^/app\.php(/|$) {
+            fastcgi_pass unix:/var/run/php5-fpm.sock;
+            fastcgi_split_path_info ^(.+\.php)(/.*)$;
+            include fastcgi_params;
+            # When you are using symlinks to link the document root to the
+            # current version of your application, you should pass the real
+            # application path instead of the path to the symlink to PHP
+            # FPM.
+            # Otherwise, PHP's OPcache may not properly detect changes to
+            # your PHP files (see https://github.com/zendtech/ZendOptimizerPlus/issues/126
+            # for more information).
+            fastcgi_param  SCRIPT_FILENAME  $realpath_root$fastcgi_script_name;
+            fastcgi_param DOCUMENT_ROOT $realpath_root;
+            # Prevents URIs that include the front controller. This will 404:
+            # http://domain.tld/app.php/some-path
+            # Remove the internal directive to allow URIs like this
+            internal;
+        }
+
+        error_log /var/log/nginx/wallabag_error.log;
+        access_log /var/log/nginx/wallabag_access.log;
+    }
+
+After reloading or restarting nginx, you should now be able to access wallabag at http://domain.tld.
+
+.. note::
+
+    When you want to import large file into wallabag, you need to add this line in your nginx configuration ``client_max_body_size XM; # allows file uploads up to X megabytes``.

docs/en/user/login.rst

@@ -5,7 +5,8 @@ Your account is now enabled, congratulations!
 
 To login to wallabag, fill the form on login page.
 
-If you are on your personal computer and you want to stay connected, you can check the ``Keep me logged in`` checkbox: wallabag will remember you for one year.
+If you are on your personal computer and you want to stay connected,
+you can check the ``Keep me logged in`` checkbox: wallabag will remember you for one year.
 
 .. image:: ../../img/user/login_form.png
    :alt: Login form
@@ -17,4 +18,6 @@ Frequently asked questions
 I forgot my password
 ~~~~~~~~~~~~~~~~~~~~
 
-You can reset your password by clicking on ``Forgot your password?`` link, on the login page. Then, fill the form with your email address
+You can reset your password by clicking on ``Forgot your password?`` link,
+on the login page. Then, fill the form with your email address or your username,
+you'll receive an email to reset your password.

docs/en/user/migration.rst

@@ -0,0 +1,62 @@
+Migrate wallabag
+================
+
+From wallabag 1.x
+-----------------
+
+If you were using wallabag v1.x, you need to export your data before migrating to wallabag v2.x, because the application and its database changed a lot. In your old wallabag installation, you can export your data, which can be done on the Config page of your old wallabag installation.
+
+.. image:: ../../img/user/export_v1.png
+   :alt: Exporting from wallabag v1
+   :align: center
+
+.. note::
+    If you have multiple accounts on the same instance of wallabag, each user must export from v1 and import into v2 its data.
+
+.. note::
+    If you encounter issues during the export or the import, don't hesitate to `ask for support <https://www.wallabag.org/pages/support.html>`__.
+
+When you have retrieved the json file containing your entries, you can install wallabag v2 if needed by following `the standard procedure <http://doc.wallabag.org/en/v2/user/installation.html>`__.
+
+After creating an user account on your new wallabag v2 instance, you must head over to the `Import` section and select `Import from wallabag v1`. Select your json file and upload it.
+
+.. image:: ../../img/user/import_wallabagv1.png
+   :alt: Import from wallabag v1
+   :align: center
+
+Import via command-line interface (CLI)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+If you have a CLI access on your web server, you can execute this command to import your wallabag v1 export:
+
+::
+
+    bin/console wallabag:import-v1 1 ~/Downloads/wallabag-export-1-2016-04-05.json --env=prod
+
+Please replace values:
+
+* ``1`` is the user identifier in database (The ID of the first user created on wallabag is 1)
+* ``~/Downloads/wallabag-export-1-2016-04-05.json`` is the path of your wallabag v1 export
+
+You'll have this in return:
+
+::
+
+    Start : 05-04-2016 11:36:07 ---
+    403 imported
+    0 already saved
+    End : 05-04-2016 11:36:09 ---
+
+From wallabag 2.x
+-----------------
+
+From the previous wallabag instance on which you were before, go to `All articles`, then export these articles as json.
+
+.. image:: ../../img/user/export_v2.png
+   :alt: Export depuis wallabag v2
+   :align: center
+
+From your new wallabag instance, create your user account and click on the link in the menu to proceed to import. Choose import from wallabag v2 and select your json file to upload it.
+
+.. note::
+    If you encounter issues during the export or the import, don't hesitate to `ask for support <https://www.wallabag.org/pages/support.html>`__.

docs/fr/developer/docker.rst

@@ -0,0 +1,50 @@
+Exécuter wallabag avec docker-compose
+=====================================
+
+Pour faire tourner votre propre instance de développement de wallabag, vous pouvez
+utiliser les fichiers docker pré-configurés.
+
+Pré-requis
+----------
+
+Soyez sur d'avoir `Docker
+<https://docs.docker.com/installation/ubuntulinux/>`__ et `Docker
+Compose <https://docs.docker.com/compose/install/>`__ installés et à jour sur votre
+système.
+
+Changer de SGBD
+---------------
+
+Par défaut, wallabag fonctionne avec une base de données SQLite.
+Depuis que wallabag supporte Postgresql et MySQL, les conteneurs Docker sont
+aussi disponibles pour ces SGBD.
+
+Dans ``docker-compose.yml``, en fonction de votre SGBD, décommentez :
+
+- la définition du conteneur (le block racine ``postgres`` ou ``mariadb``)
+- le conteneur ``links`` dans le conteneur ``php``
+- le conteneur ``env_file`` dans le conteneur ``php``
+
+Pour que les commandes Symfony (par exemple ``wallabag:install``) continuent de
+fonctionner sur votre système, vous devez aussi :
+
+- charger le bon fichier d'environnement dans votre ligne de commandes (``source``),
+pour que les variables comme ``SYMFONY__ENV__DATABASE_HOST`` existent.
+- ajouter une ligne ``127.0.0.1 rdbms`` dans votre fichier ``hosts``
+
+Exécuter wallabag
+-----------------
+
+#. Forker et cloner le projet
+#. Editer ``app/config/parameters.yml`` pour remplacer les propriétés ``database_*``
+    par les lignes commentées (celles avec des valeurs préfixées par ``env.``)
+#. ``composer install`` pour installer les dépendances
+#. ``php app/console wallabag:install`` pour créer le schéma de la BDD
+#. ``docker-compose up`` pour démarrer les conteneurs
+#. Enfin, se rendre sur http://localhost:8080/ pour accéder à une installation
+    tout propre de wallabag.
+
+Il est possible de rencontrer des problèmes de droits UNIX, de mauvais chemins
+dans les fichiers de cache, etc…
+Les opérations comme vider le cache ou restaurer les permissions des fichiers
+peuvent être fréquemment nécessaires, n'ayez crainte !

docs/fr/developer/maintenance.rst

@@ -0,0 +1,33 @@
+Mode maintenance
+================
+
+Si vous devez effectuer de longues tâches sur votre instance de wallabag, vous pouvez activer le mode maintenance.
+Plus personne ne pourra accéder à wallabag.
+
+Activer le mode maintenance
+---------------------------
+
+Pour activer le mode maintenance, exécutez cette commande :
+
+::
+
+    bin/console lexik:maintenance:lock --no-interaction
+
+Vous pouvez spécifier votre adresse IP dans ``app/config/config.yml`` si vous souhaitez accéder à wallabag même si
+ le mode maintenance est activé. Par exemple :
+
+::
+
+    lexik_maintenance:
+        authorized:
+            ips: ['127.0.0.1']
+
+
+Désactiver le mode maintenance
+------------------------------
+
+Pour désactiver le mode maintenance, exécutez cette commande :
+
+::
+
+    bin/console lexik:maintenance:unlock

docs/fr/developer/translate.rst

@@ -0,0 +1,62 @@
+Traduire wallabag
+=================
+
+L'application web
+-----------------
+
+Fichiers de traductions
+~~~~~~~~~~~~~~~~~~~~~~~
+
+.. note::
+
+    Comme wallabag est principalement dévelopée par une équipe française, c'est
+    cette traduction qui est considérée comme la plus récente. Merci de vous baser
+    sur celle-ci pour créer votre traduction.
+
+Les principaux fichiers de traduction se trouvent ici : https://github.com/wallabag/wallabag/tree/master/src/Wallabag/CoreBundle/Resources/translations.
+
+Vous devez créer le fichier ``messages.CODE.yml``,
+où CODE est le code ISO 639-1 de votre langue (`cf wikipedia <https://fr.wikipedia.org/wiki/Liste_des_codes_ISO_639-1>`__).
+
+Autres fichiers à traduire :
+
+- https://github.com/wallabag/wallabag/tree/master/app/Resources/CraueConfigBundle/translations.
+- https://github.com/wallabag/wallabag/tree/master/app/Resources/FOSUserBundle/translations.
+
+Vous devez créer les fichiers ``LE_FICHIER_DE_TRADUCTION.CODE.yml``.
+
+Fichier de configuration
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+Vous devez éditer `app/config/config.yml
+<https://github.com/wallabag/wallabag/blob/master/app/config/config.yml>`__ pour
+afficher votre langue dans la page Configuration de wallabag (pour permettre aux
+utilisateurs de choisir cette nouvelle traduction).
+
+Dans la section ``wallabag_core.languages``, vous devez ajouter une nouvelle ligne
+avec votre traduction. Par exemple :
+
+::
+
+    wallabag_core:
+        ...
+        languages:
+            en: 'English'
+            fr: 'Français'
+
+
+Pour la première colonne (``en``, ``fr``, etc.), vous devez ajouter le code ISO 639-1
+de votre langue (voir ci-dessus).
+
+Pour la seconde colonne, c'est juste le nom de votre langue.
+
+Documentation de wallabag
+-------------------------
+
+.. note::
+
+    Contrairement à l'application, la langue principale de la documentation est l'anglais
+
+Les fichiers de documentation se trouvent ici : https://github.com/wallabag/wallabag/tree/master/docs
+
+Vous devez respecter la structure du dossier ``en`` quand vous crééz votre traduction.

docs/fr/index.rst

@@ -9,9 +9,41 @@ Documentation de wallabag
 simplement d’archiver une page web en ne conservant que le contenu. Les
 éléments superflus (menu, publicité, etc.) sont supprimés.
 
+.. note::
+
+    Vous vous trouvez sur la documentation de wallabag v2. Si vous voulez lire la documentation de wallabag v1, `vous pouvez jeter un œil ici <https://github.com/wallabag/documentation>`__.
+
 La documentation principale de cette application est découpée en plusieurs sections :
 
+* :ref:`user-docs`
+* :ref:`dev-docs`
+
+.. _user-docs:
+
 .. toctree::
    :maxdepth: 2
+   :caption: Documentation utilisateur
 
-   index
+   user/installation
+   user/migration
+   user/create_account
+   user/login
+   user/configuration
+   user/first_article
+   user/errors_during_fetching
+   user/annotations
+   user/import
+   user/download_articles
+   user/filters
+   user/tags
+
+.. _dev-docs:
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Documentation développeur
+
+   developer/api
+   developer/docker
+   developer/translate
+   developer/maintenance

docs/fr/user/annotations.rst

@@ -0,0 +1,25 @@
+Annotations
+===========
+
+Sur chaque article que vous lisez, vous pouvez écrire des annotations. Puisqu'une image vaut mieux qu'un long discours,
+voici ce que ça donne.
+
+Sélectionnez la zone du texte que vous souhaitez annoter et cliquez sur le crayon :
+
+.. image:: ../../img/user/annotations_1.png
+   :alt: Sélectionnez votre texte
+   :align: center
+
+Ensuite, écrivez votre annotation :
+
+.. image:: ../../img/user/annotations_2.png
+   :alt: Écrivez votre annotation
+   :align: center
+
+Le texte est maintenant surligné et vous pouvez lire le annotation en le survolant avec votre souris.
+
+.. image:: ../../img/user/annotations_3.png
+   :alt: Lisez votre annotation
+   :align: center
+
+Vous pouvez créer autant de annotations que vous le souhaitez.

docs/fr/user/configuration.rst

@@ -0,0 +1,119 @@
+Configuration
+=============
+
+Maintenant que vous êtes connecté, il est temps de configurer votre compte.
+
+Cliquez sur le menu ``Configuration``. Vous avez accès à 5 onglets :
+``Paramètres``, ``RSS``, ``Mon compte``, ``Mot de passe`` and ``Règles de tag automatiques``.
+
+Paramètres
+----------
+
+Thème
+~~~~~
+
+L'affichage de wallabag est personnalisable. C'est ici que vous choisissez le thème
+que vous préférez. Vous pouvez aussi en créer un nouveau, une documentation sera
+disponible pour guider. Le thème par défaut est ``Material``, c'est celui
+qui est utilisé dans les captures d'écran de la documentation.
+
+Nombre d'articles par page
+~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Vous pouvez définir le nombre d'articles affichés sur chaque page.
+
+Vitesse de lecture
+~~~~~~~~~~~~~~~~~~
+
+wallabag calcule une durée de lecture pour chaque article. Vous pouvez définir ici, grâce à cette liste déroulante, si vous lisez plus ou moins vite. wallabag recalculera la durée de lecture de chaque article.
+
+Langue
+~~~~~~
+
+Vous pouvez définir la langue de l'interface de wallabag. Vous devrez vous déconnecter
+pour que la nouvelle langue soit prise en compte.
+
+RSS
+---
+
+wallabag propose un flux RSS pour chaque statut d'article : non lus, favoris et lus.
+
+Tout d'abord, vous devez vous créer un jeton personnel : cliquez sur ``Créez votre jeton``.
+Il est possible de regénérer votre jeton en cliquant sur ``Réinitialisez votre jeton``.
+
+Vous avez maintenant trois liens, un par statut : ajoutez-les dans votre agrégateur de flux RSS préféré.
+
+Vous pouvez aussi définir combien d'articles vous souhaitez dans vos flux RSS
+(50 est la valeur par défaut).
+
+Mon compte
+----------
+
+Vous pouvez ici modifier votre nom, votre adresse email et activer la ``Double authentification``.
+
+Double authentification (2FA)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    L'authentification à deux facteurs (également appelée 2FA) est une technologie brevetée en 1984
+    qui fournit l'identification des utilisateurs au moyen de la combinaison de deux composants différents .
+
+https://fr.wikipedia.org/wiki/Authentification_forte
+
+Si vous activez 2FA, à chaque tentative de connexion à wallabag, vous recevrez
+un code par email. Vous devez renseigner ce code dans le formulaire suivant :
+
+.. image:: ../../img/user/2FA_form.png
+    :alt: Authentification à deux facteurs
+    :align: center
+
+Si vous ne souhaitez pas recevoir un code à chaque fois que vous vous connectez,
+vous pouvez cocher la case ``Je suis sur un ordinateur de confiance`` : wallabag
+se souviendra de vous pour 15 jours.
+
+Mot de passe
+------------
+
+Vous pouvez changer de mot de passe ici (8 caractères minimum).
+
+Règles de tag automatiques
+--------------------------
+
+Si vous voulez automatiquement assigner un tag à de nouveaux articles en fonction de
+certains critères, cette partie de la configuration est pour vous.
+
+Que veut dire « règles de tag automatiques » ?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Ce sont des règles utilisées par wallabag pour automatiquement assigner un tag
+à un nouvel article.
+À chaque fois que vous ajoutez un nouvel article, toutes les règles sont utilisées pour ajouter
+les tags que vous avez configurés, vous épargnant ainsi la peine de classer manuellement vos articles.
+
+Comment les utiliser ?
+~~~~~~~~~~~~~~~~~~~~~~
+
+Admettons que vous voulez ajouter comme tag *« lecture rapide »* quand le temps de lecture
+d'un article est inférieur à 3 minutes.
+Dans ce cas, vous devez ajouter « readingTime <= 3 » dans le champ **Règle** et *« lecture rapide »* dans le champ **Tags**.
+Plusieurs tags peuvent être ajoutés en même temps en les séparant par une virgule : *« lecture rapide, à lire »*.
+Des règles complexes peuvent être écrites en utilisant les opérateurs pré-définis :
+if *« readingTime >= 5 AND domainName = "github.com" »* then tag as *« long reading, github »*.
+
+Quels variables et opérateurs puis-je utiliser pour écrire mes règles ?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Les variables et opérateurs suivants peuvent être utilisés lors de la création de vos règles :
+
+===========  ==============================================  ==========  ==========
+Variable     Sens                                            Opérateur   Sens
+-----------  ----------------------------------------------  ----------  ----------
+title        Titre de l'article                              <=          Inférieur ou égal à …
+url          URL de l'article                                <           Strictement inférieur à …
+isArchived   Si l'article est archivé ou non                 =>          Supérieur ou égal à …
+isStared     Si l'article est en favori ou non               >           Strictement supérieur à …
+content      Le contenu de l'article                         =           Égal à …
+language     La langue de l'article                          !=          Différent de …
+mimetype     The type MIME de l'article                      OR          Telle règle ou telle autre règle
+readingTime  Le temps de lecture de l'article, en minutes    AND         Telle règle et telle règle
+domainName   Le nom de domaine de l'article                  matches     Contient telle chaîne de caractère (insensible à la casse). Exemple : title matches "football"
+===========  ==============================================  ==========  ==========

docs/fr/user/create_account.rst

@@ -0,0 +1,46 @@
+Se créer un compte
+==================
+
+Sur la page de connexion, cliquez sur le bouton ``Créer un compte``.
+
+.. image:: ../../img/user/registration_form.png
+   :alt: Formulaire de création de compte
+   :align: center
+
+Vous devez renseigner le formulaire. Faites attention de bien renseigner une adresse
+email valide, nous allons vous envoyer un email d'activation.
+
+.. image:: ../../img/user/sent_email.png
+   :alt: Un email a été envoyé pour activer votre compte
+   :align: center
+
+Vérifiez votre boite de réception, vous avez un nouvel email avec un lien comme celui-ci
+``http://wallabag/register/confirm/Ba19wokGovN-DdBQNfg4YgRkUQWRP4-k2g0Bk-hBTX4``.
+Cliquez dessus pour activer votre compte.
+
+Votre compte est maintenant actif.
+
+.. image:: ../../img/user/activated_account.png
+   :alt: Bienvenue à bord !
+   :align: center
+
+Foire aux questions
+-------------------
+
+Je ne peux pas valider le formulaire de création de compte
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Soyez sur d'avoir bien renseigné tous les champs :
+
+* une adresse email valide
+* le même mot de passe dans les deux champs
+
+Je n'ai pas reçu mon email d'activation
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Êtes-vous sur d'avoir renseigné votre bonne adresse ? Avez-vous vérifié le dossier de spams ?
+
+Quand je clique sur le lien d'activation, j'ai ce message : ``The user with confirmation token "DtrOPfbQeVkWf6N" does not exist``.
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Vous avez déjà activé votre compte ou l'URL d'activation n'est pas correcte.

docs/fr/user/download_articles.rst

@@ -0,0 +1,17 @@
+Télécharger des articles
+========================
+
+Vous pouvez télécharger chaque article dans plusieurs formats : ePUB, MOBI, PDF, XML, JSON, CSV.
+
+Lorsque vous lisez un article, cliquez sur cette icône dans la barre latérale :
+
+.. image:: ../../img/user/download_article.png
+   :alt: Télécharger l'article
+   :align: center
+
+Vous pouvez aussi télécharger une catégorie (non lus, favoris, lus) dans ces formats.
+Par exemple, dans la vue **Non lus**, cliquez sur cette icône dans la barre supérieure :
+
+.. image:: ../../img/user/download_articles.png
+   :alt: Télécharger l'article
+   :align: center

docs/fr/user/errors_during_fetching.rst

@@ -0,0 +1,27 @@
+Erreur durant la récupération des articles
+==========================================
+
+Pourquoi la récupération des articles échoue ?
+----------------------------------------------
+
+Il peut y avoir plusieurs raisons :
+
+- problème de connexion internet
+- wallabag ne peut pas récupérer le contenu à cause de la structure du site web
+
+Comment puis-je aider pour réparer ça ?
+---------------------------------------
+
+- `en nous envoyant un email avec l'URL de l'article <mailto:hello\@wallabag.org>`_
+- en essayant de réparer cet article par vous-même :) en créant un fichier pour l'article.
+  Vous pouvez utiliser `cet outil <http://siteconfig.fivefilters.org/>`__.
+
+Comment puis-je réessayer de récupérer le contenu ?
+---------------------------------------------------
+
+Si wallabag échoue en récupérant l'article, vous pouvez cliquer sur le bouton suivant
+(le troisième sur l'image ci-dessous).
+
+.. image:: ../../img/user/refetch.png
+   :alt: Réessayer de récupérer le contenu
+   :align: center

docs/fr/user/filters.rst

@@ -0,0 +1,50 @@
+Filtres
+=======
+
+Pour retrouver plus facilement vos articles, vous pouvez utiliser les filtres.
+Cliquez sur la troisième icône de la barre supérieure.
+
+.. image:: ../../img/user/topbar.png
+   :alt: Barre supérieure
+   :align: center
+
+Tous ces filtres peuvent être combinés.
+
+.. image:: ../../img/user/filters.png
+   :alt: Combine all filters
+   :align: center
+
+Statut
+------
+
+Utilisez ces cases à cocher pour retrouver les articles lus ou mis en favori.
+
+Image de prévisualisation
+-------------------------
+
+Cochez ce filtre si vous voulez retrouver les articles avec une image de prévisualisation.
+
+Langage
+-------
+
+wallabag (via graby) peut détecter la langue dans laquelle l'article est écrit.
+C'est ainsi facile pour vous de retrouver des articles écrits dans une langue spécifique.
+
+Temps de lecture
+----------------
+
+wallabag estime combien de temps vous avez besoin pour lire un article.
+Avec ce filtre, vous pouvez par exemple retrouver les articles qui ont une estimation
+entre 2 et 5 minutes.
+
+Nom de domaine
+--------------
+
+Grâce à ce filtre, vous pouvez retrouver les articles venant d'un même nom de domaine.
+Par exemple, dans ce champ, saisissez ``lemonde.fr`` pour retrouver les articles de ce site.
+
+Date de création
+----------------
+
+Quand vous ajoutez un article, wallabag stocke la date courante.
+C'est très pratique pour retrouver les articles ajoutés entre le 1er et le 31 janvier par exemple.

docs/fr/user/first_article.rst

@@ -0,0 +1,68 @@
+Sauvegardez votre premier article
+=================================
+
+La fonctionnalité principale de wallabag est de sauvegarder des articles.
+Vous avez plusieurs manières de le faire.
+
+.. note::
+
+    Un guide de démarrage s'affichera dans l'application jusqu'à ce que vous
+    enregistriez votre premier article.
+
+En utilisant le bookmarklet
+---------------------------
+
+Sur la page ``Aide``, vous avez un onglet ``Bookmarklet``. Glissez/déposez le lien ``bag it!``
+dans votre barre de favoris de votre navigateur.
+
+Maintennat, à chaque fois que vous lisez un article et que vous souhaitez le sauvegarder,
+cliquez sur le lien ``bag it!`` dans votre barre de favoris. L'article est enregistré.
+
+En utilisant le formulaire classique
+------------------------------------
+
+Dans la barre haut de wallabag, vous avez trois icônes. Avec la première icône,
+un signe plus, vous pouvez facilement ajouter un nouvel article.
+
+.. image:: ../../img/user/topbar.png
+   :alt: Barre supérieure
+   :align: center
+
+Cliquez dessus pour afficher un nouveau champ, collez-y l'URL de l'article et appuyez
+sur la touche ``Entrée``. L'article est enregistré.
+
+En utilisant l'extension de votre navigateur
+--------------------------------------------
+
+Firefox
+~~~~~~~
+
+*Cette extension n'est pas encore disponible pour wallabag v2*.
+
+Chrome
+~~~~~~
+
+*Cette extension n'est pas encore disponible pour wallabag v2*.
+
+En utilisant l'application de votre smartphone
+----------------------------------------------
+
+Android
+~~~~~~~
+
+*Cette application n'est pas encore disponible pour wallabag v2*.
+
+Firefox OS
+~~~~~~~~~~
+
+*Cette application n'est pas encore disponible pour wallabag v2*.
+
+Windows Phone
+~~~~~~~~~~~~~
+
+*Cette application n'est pas encore disponible pour wallabag v2*.
+
+iOS
+~~~
+
+*Cette application n'est pas encore disponible pour wallabag v2*.

docs/fr/user/import.rst

@@ -0,0 +1,83 @@
+Migrer à wallabag
+=================
+
+Depuis wallabag
+---------------
+
+Exportez vos données de wallabag 1.x
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Sur la page de configuration, cliquez sur ``Export JSON`` dans la section ``Exportez vos données wallabag``.
+
+.. image:: ../../img/user/export_wllbg_1.png
+   :alt: Export depuis wallabag 1.x
+   :align: center
+
+Vous obtiendrez un fichier ``wallabag-export-1-1970-01-01.json``.
+
+Exportez vos données de wallabag 2.x
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Dans la barre latérale de téléchargement, cliquez sur ``JSON``.
+
+.. image:: ../../img/user/export_wllbg_2.png
+   :alt: Export depuis wallabag 2.x
+   :align: center
+
+Vous obtiendrez un fichier ``Unread articles.json``.
+
+Importez vos données wallabag 2.x
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Cliquez sur le lien ``Importer`` dans le menu, choisissez la version de wallabag correspondante,
+sélectionnez votre fichier d'export sur votre ordinateur et importez-le.
+
+.. image:: ../../img/user/import_wllbg.png
+   :alt: Import depuis wallabag 1.x
+   :align: center
+
+Tous vos articles wallabag seront importés.
+
+Depuis Pocket
+-------------
+
+Créer une nouvelle application dans Pocket
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Pour importer vos données depuis Pocket, nous utilisons l'API de Pocket.
+Vous devez créer une nouvelle application sur leur site dédié aux développeurs pour continuer.
+
+* Créez une nouvelle application `sur leur site Développeurs <https://getpocket.com/developer/apps/new>`_
+* Remplissez les champs requis : nom de l'application, description de l'application,
+  permissions (seulement **retrieve**), la plateforme (**web**), acceptez les
+  termes d'utilisation du service et soumettez votre application
+
+Pocket vous fournira une **Consumer Key** (par exemple, `49961-985e4b92fe21fe4c78d682c1`).
+Vous devez configurer la ``pocket_consumer_key`` dans le fichier ``app/config/parameters.yml``.
+
+Maintenant, tout est bien configuré pour migrer depuis Pocket.
+
+Importez vos données dans wallabag 2.x
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Cliquez sur le lien ``Importer`` dans le menu, sur  ``Importer les contenus`` dans
+la section Pocket puis sur ``Se connecter à Pocket et importer les données``.
+
+Vous devez autoriser wallabag à se connecter à votre compte Pocket.
+Vos données vont être importées. L'import de données est une action qui peut être couteuse
+pour votre serveur (nous devons encore travailler pour améliorer cet import).
+
+Depuis Instapaper
+-----------------
+
+*Fonctionnalité pas encore implémentée dans wallabag v2.*
+
+Depuis Readability
+------------------
+
+*Fonctionnalité pas encore implémentée dans wallabag v2.*
+
+Depuis un fichier HTML ou JSON
+------------------------------
+
+*Fonctionnalité pas encore implémentée dans wallabag v2.*

docs/fr/user/installation.rst

@@ -0,0 +1,153 @@
+Installer wallabag
+==================
+
+Pré-requis
+------------
+
+wallabag est compatible avec PHP >= 5.5, PHP 7 inclus.
+
+Vous aurez besoin des extensions suivantes pour que wallabag fonctionne. Il est possible que certaines de ces extensions soient déjà activées dans votre version de PHP, donc vous n'avez pas forcément besoin d'installer tous les paquets correspondants.
+
+- php-session
+- php-ctype
+- php-dom
+- php-hash
+- php-simplexml
+- php-json
+- php-gd
+- php-mbstring
+- php-xml
+- php-tidy
+- php-iconv
+- php-curl
+- php-gettext
+- php-tokenizer
+
+wallabag utilise PDO afin de se connecter à une base de données, donc vous aurez besoin d'une extension et d'un système de bases de données parmi :
+
+- pdo_mysql
+- pdo_sqlite
+- pdo_pgsql
+
+Installation
+------------
+
+wallabag utilise un grand nombre de bibliothèques pour fonctionner. Ces bibliothèques doivent être installées à l'aide d'un outil nommé Composer. Vous devez l'installer si ce n'est déjà fait.
+
+Installation de Composer :
+
+::
+
+    curl -s http://getcomposer.org/installer | php
+
+Vous pouvez trouver des instructions spécifiques `ici (en anglais) <https://getcomposer.org/doc/00-intro.md>`__ :
+
+Pour installer wallabag, vous devez exécuter ces deux commandes :
+
+::
+
+    git clone https://github.com/wallabag/wallabag.git
+    cd wallabag
+    git checkout 2.0.2
+    SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist
+    php bin/console wallabag:install --env=prod
+
+Pour démarrer le serveur interne à php et vérifier que tout s'est installé correctement, vous pouvez exécuter :
+
+::
+
+    php bin/console server:run --env=prod
+
+Et accéder wallabag à l'adresse http://lipdevotreserveur:8000
+
+.. note::
+    Pour définir des paramètres via des variables d'environnement, vous pouvez les spécifier avec le préfixe ``SYMFONY__``. Par exemple, ``SYMFONY__DATABASE_DRIVER``. Vous pouvez lire `documentation Symfony <http://symfony.com/doc/current/cookbook/configuration/external_parameters.html>`__ pour en savoir plus.
+
+Installation avec Apache
+------------------------
+
+En imaginant que vous vouliez installer wallabag dans le dossier /var/www/wallabag et que vous utilisiez php comme un module Apache, voici un vhost pour wallabag :
+
+::
+
+    <VirtualHost *:80>
+        ServerName domain.tld
+        ServerAlias www.domain.tld
+
+        DocumentRoot /var/www/wallabag/web
+        <Directory /var/www/wallabag/web>
+            AllowOverride None
+            Order Allow,Deny
+            Allow from All
+
+            <IfModule mod_rewrite.c>
+                Options -MultiViews
+                RewriteEngine On
+                RewriteCond %{REQUEST_FILENAME} !-f
+                RewriteRule ^(.*)$ app.php [QSA,L]
+            </IfModule>
+        </Directory>
+
+        # uncomment the following lines if you install assets as symlinks
+        # or run into problems when compiling LESS/Sass/CoffeScript assets
+        # <Directory /var/www/wallabag>
+        #     Options FollowSymlinks
+        # </Directory>
+
+        # optionally disable the RewriteEngine for the asset directories
+        # which will allow apache to simply reply with a 404 when files are
+        # not found instead of passing the request into the full symfony stack
+        <Directory /var/www/wallabag/web/bundles>
+            <IfModule mod_rewrite.c>
+                RewriteEngine Off
+            </IfModule>
+        </Directory>
+        ErrorLog /var/log/apache2/wallabag_error.log
+        CustomLog /var/log/apache2/wallabag_access.log combined
+    </VirtualHost>
+
+Après que vous ayez rechargé/redémarré Apache, vous devriez pouvoir avoir accès à wallabag à l'adresse http://domain.tld.
+
+Installation avec Nginx
+-----------------------
+
+En imaginant que vous vouliez installer wallabag dans le dossier /var/www/wallabag, voici un fichier de configuration Nginx pour wallabag :
+
+::
+
+    server {
+        server_name domain.tld www.domain.tld;
+        root /var/www/wallabag/web;
+
+        location / {
+            # try to serve file directly, fallback to app.php
+            try_files $uri /app.php$is_args$args;
+        }
+        location ~ ^/app\.php(/|$) {
+            fastcgi_pass unix:/var/run/php5-fpm.sock;
+            fastcgi_split_path_info ^(.+\.php)(/.*)$;
+            include fastcgi_params;
+            # When you are using symlinks to link the document root to the
+            # current version of your application, you should pass the real
+            # application path instead of the path to the symlink to PHP
+            # FPM.
+            # Otherwise, PHP's OPcache may not properly detect changes to
+            # your PHP files (see https://github.com/zendtech/ZendOptimizerPlus/issues/126
+            # for more information).
+            fastcgi_param  SCRIPT_FILENAME  $realpath_root$fastcgi_script_name;
+            fastcgi_param DOCUMENT_ROOT $realpath_root;
+            # Prevents URIs that include the front controller. This will 404:
+            # http://domain.tld/app.php/some-path
+            # Remove the internal directive to allow URIs like this
+            internal;
+        }
+
+        error_log /var/log/nginx/wallabag_error.log;
+        access_log /var/log/nginx/wallabag_access.log;
+    }
+
+Après que vous ayez rechargé/redémarré Nginx, vous devriez pouvoir avoir accès à wallabag à l'adresse http://domain.tld.
+
+.. note::
+
+    Si vous voulez importer un fichier important dans wallabag, vous devez ajouter cette ligne dans votre configuration nginx ``client_max_body_size XM; # allows file uploads up to X megabytes``.

docs/fr/user/login.rst

@@ -0,0 +1,23 @@
+Se connecter
+============
+
+Votre compte est maintenant actif, félicitations !
+
+Pour vous connecter à wallabag, remplissez le formulaire de connexion.
+
+Si vous êtes sur un ordinateur de confiance et que vous souhaitez rester connecté
+vous pouvez cocher la case ``Restez connecté`` : wallabag se souviendra de vous pour un an.
+
+.. image:: ../../img/user/login_form.png
+   :alt: Formulaire de connexion
+   :align: center
+
+Foire aux questions
+-------------------
+
+J'ai oublié mon mot de passe
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Vous pouvez réinitialiser votre mot de passe en cliquant sur ``Mot de passe oublié ?``,
+sur la page de connexion. Ensuite, renseignez votre adresse email ou votre nom d'utilisateur,
+un email vous sera envoyé.

docs/fr/user/migration.rst

@@ -0,0 +1,62 @@
+Migrer wallabag
+===============
+
+Depuis wallabag 1.x
+-------------------
+
+Si vous utilisiez wallabag v1.x, vous devez exporter vos données avant de migrer à wallabag v2.x, à cause du changement complet de l'application et de sa base de données. Sur votre ancienne instance de wallabag v1, vous pouvez exporter vos données en allant sur la page de configuration de l'application.
+
+.. image:: ../../img/user/export_v1.png
+   :alt: Export depuis wallabag v1
+   :align: center
+
+.. note::
+    Si vous avez plusieurs comptes sur la même instance de wallabag, chaque utilisateur doit exporter ses données depuis wallabag v1 et les importer dans la v2.
+
+.. note::
+    S'il vous arrive des problèmes durant l'export ou l'import, n'hésitez pas à `demander de l'aide <https://www.wallabag.org/pages/support.html>`__.
+
+Une fois que vous avez récupéré le fichier json contenant vos données, vous pouvez installer wallabag v2 si c'est nécessaire en suivant `la procédure standard <http://doc.wallabag.org/fr/v2/user/installation.html>`__.
+
+Une fois que vous avez créé un compte utilisateur sur votre nouvelle instance de wallabag v2, rendez-vous dans la section `Import`. Vous devez choisir l'import depuis wallabag v1 puis sélectionner votre fichier json récupéré précédemment.
+
+.. image:: ../../img/user/import_wallabagv1.png
+   :alt: Import depuis wallabag v1
+   :align: center
+
+Import via via la ligne de commande (CLI)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Si vous avez accès à la ligne de commandes de votre serveur web, vous pouvez exécuter cette commande pour import votre fichier wallabag v1 :
+
+::
+
+    bin/console wallabag:import-v1 1 ~/Downloads/wallabag-export-1-2016-04-05.json --env=prod
+
+Remplacez les valeurs :
+
+* ``1`` est l'identifiant de votre utilisateur en base (l'ID de votre premier utilisateur créé sur wallabag est 1)
+* ``~/Downloads/wallabag-export-1-2016-04-05.json`` est le chemin de votre export wallabag v1
+
+Vous obtiendrez :
+
+::
+
+    Start : 05-04-2016 11:36:07 ---
+    403 imported
+    0 already saved
+    End : 05-04-2016 11:36:09 ---
+
+Depuis wallabag 2.x
+-------------------
+
+Depuis l'instance sur laquelle vous étiez, rendez-vous dans la section `Tous les articles`, puis exportez ces articles au format json.
+
+.. image:: ../../img/user/export_v2.png
+   :alt: Export depuis wallabag v2
+   :align: center
+
+Depuis votre nouvelle instance de wallabag, créez votre compte utilisateur puis cliquez sur le lien dans le menu pour accéder à l'import. Choisissez l'import depuis wallabag v2 puis sélectionnez votre fichier json pour l'uploader.
+
+.. note::
+    S'il vous arrive des problèmes durant l'export ou l'import, n'hésitez pas à `demander de l'aide <https://www.wallabag.org/pages/support.html>`__.

docs/fr/user/tags.rst

@@ -0,0 +1,2 @@
+Tags
+====

docs/pt-br/conf.py

@@ -1,55 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# wallabag documentation build configuration file, created by
-# sphinx-quickstart on Fri Oct 16 06:47:23 2015.
-
-import sys
-import os
-
-extensions = []
-templates_path = ['_templates']
-source_suffix = '.rst'
-master_doc = 'index'
-project = u'wallabag-pt'
-copyright = u'2013-2016, Nicolas Lœuillet - MIT Licence'
-version = '2.0.0'
-release = version
-exclude_patterns = ['_build']
-pygments_style = 'sphinx'
-html_theme = 'default'
-html_static_path = ['_static']
-htmlhelp_basename = 'wallabagfrdoc'
-
-latex_elements = {
-}
-
-latex_documents = [
-  ('index', 'wallabag-pt.tex', u'wallabag Documentation',
-   u'Nicolas Lœuillet', 'manual'),
-]
-
-man_pages = [
-    ('index', 'wallabagpt', u'wallabag Documentation',
-     [u'Nicolas Lœuillet'], 1)
-]
-
-texinfo_documents = [
-  ('index', 'wallabag', u'wallabag Documentation',
-   u'Nicolas Lœuillet', 'wallabag', 'wallabag is an opensource read-it-later.',
-   'Miscellaneous'),
-]
-
-##### Guzzle sphinx theme
-
-import guzzle_sphinx_theme
-html_translator_class = 'guzzle_sphinx_theme.HTMLTranslator'
-html_theme_path = guzzle_sphinx_theme.html_theme_path()
-html_theme = 'guzzle_sphinx_theme'
-
-# Custom sidebar templates, maps document names to template names.
-html_sidebars = {
-    '**': ['logo-text.html', 'globaltoc.html', 'searchbox.html']
-}
-
-# Register the theme as an extension to generate a sitemap.xml
-extensions.append("guzzle_sphinx_theme")

docs/pt-br/index.rst

@@ -1,36 +0,0 @@
-wallabag documentation
-======================
-
-.. image:: ../img/wallabag.png
-   :alt: wallabag logo
-   :align: center
-
-**wallabag** É uma aplicação "leia mais tarde": Ele salva páginas da web mantendo apenas o conteúdo. Elementos como ícones de navegação ou propaganda são deletedos.
-
-A documentação principal desta aplicação é organizada em duas seções:
-
-* :ref:`doc-usuario`
-* :ref:`doc-desenvolvedor`
-
-.. _user-docs:
-
-.. toctree::
-   :maxdepth: 2
-   :caption: Documentação do usuário
-
-   user/criar_conta
-   user/login
-   user/configuração
-   user/primeiro_artigo
-   user/importar
-   user/baixar_artigos
-   user/filtros
-   user/tags
-
-.. _dev-docs:
-
-.. toctree::
-   :maxdepth: 2
-   :caption: Documentação do desenvolvedor
-
-   developer/docker

docs/pt-br/requirements.txt

@@ -1,2 +0,0 @@
-Sphinx>=1.3.0,<1.4.0
-guzzle_sphinx_theme>=0.7.0,<0.8.0

src/Wallabag/AnnotationBundle/Controller/WallabagAnnotationController.php

@@ -0,0 +1,146 @@
+<?php
+
+namespace Wallabag\AnnotationBundle\Controller;
+
+use FOS\RestBundle\Controller\FOSRestController;
+use Nelmio\ApiDocBundle\Annotation\ApiDoc;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
+use Wallabag\AnnotationBundle\Entity\Annotation;
+use Wallabag\CoreBundle\Entity\Entry;
+
+class WallabagAnnotationController extends FOSRestController
+{
+    /**
+     * Retrieve annotations for an entry.
+     *
+     * @ApiDoc(
+     *      requirements={
+     *          {"name"="entry", "dataType"="integer", "requirement"="\w+", "description"="The entry ID"}
+     *      }
+     * )
+     *
+     * @return Response
+     */
+    public function getAnnotationsAction(Entry $entry)
+    {
+        $annotationRows = $this
+                ->getDoctrine()
+                ->getRepository('WallabagAnnotationBundle:Annotation')
+                ->findAnnotationsByPageId($entry->getId(), $this->getUser()->getId());
+        $total = count($annotationRows);
+        $annotations = ['total' => $total, 'rows' => $annotationRows];
+
+        $json = $this->get('serializer')->serialize($annotations, 'json');
+
+        return $this->renderJsonResponse($json);
+    }
+
+    /**
+     * Creates a new annotation.
+     *
+     * @param Entry $entry
+     *
+     * @ApiDoc(
+     *      requirements={
+     *          {"name"="ranges", "dataType"="array", "requirement"="\w+", "description"="The range array for the annotation"},
+     *          {"name"="quote", "dataType"="string", "required"=false, "description"="Optional, quote for the annotation"},
+     *          {"name"="text", "dataType"="string", "required"=true, "description"=""},
+     *      }
+     * )
+     *
+     * @return Response
+     */
+    public function postAnnotationAction(Request $request, Entry $entry)
+    {
+        $data = json_decode($request->getContent(), true);
+
+        $em = $this->getDoctrine()->getManager();
+
+        $annotation = new Annotation($this->getUser());
+
+        $annotation->setText($data['text']);
+        if (array_key_exists('quote', $data)) {
+            $annotation->setQuote($data['quote']);
+        }
+        if (array_key_exists('ranges', $data)) {
+            $annotation->setRanges($data['ranges']);
+        }
+
+        $annotation->setEntry($entry);
+
+        $em->persist($annotation);
+        $em->flush();
+
+        $json = $this->get('serializer')->serialize($annotation, 'json');
+
+        return $this->renderJsonResponse($json);
+    }
+
+    /**
+     * Updates an annotation.
+     *
+     * @ApiDoc(
+     *      requirements={
+     *          {"name"="annotation", "dataType"="string", "requirement"="\w+", "description"="The annotation ID"}
+     *      }
+     * )
+     *
+     * @ParamConverter("annotation", class="WallabagAnnotationBundle:Annotation")
+     *
+     * @return Response
+     */
+    public function putAnnotationAction(Annotation $annotation, Request $request)
+    {
+        $data = json_decode($request->getContent(), true);
+
+        if (!is_null($data['text'])) {
+            $annotation->setText($data['text']);
+        }
+
+        $em = $this->getDoctrine()->getManager();
+        $em->flush();
+
+        $json = $this->get('serializer')->serialize($annotation, 'json');
+
+        return $this->renderJsonResponse($json);
+    }
+
+    /**
+     * Removes an annotation.
+     *
+     * @ApiDoc(
+     *      requirements={
+     *          {"name"="annotation", "dataType"="string", "requirement"="\w+", "description"="The annotation ID"}
+     *      }
+     * )
+     *
+     * @ParamConverter("annotation", class="WallabagAnnotationBundle:Annotation")
+     *
+     * @return Response
+     */
+    public function deleteAnnotationAction(Annotation $annotation)
+    {
+        $em = $this->getDoctrine()->getManager();
+        $em->remove($annotation);
+        $em->flush();
+
+        $json = $this->get('serializer')->serialize($annotation, 'json');
+
+        return $this->renderJsonResponse($json);
+    }
+
+    /**
+     * Send a JSON Response.
+     * We don't use the Symfony JsonRespone, because it takes an array as parameter instead of a JSON string.
+     *
+     * @param string $json
+     *
+     * @return Response
+     */
+    private function renderJsonResponse($json, $code = 200)
+    {
+        return new Response($json, $code, ['application/json']);
+    }
+}

src/Wallabag/AnnotationBundle/DataFixtures/ORM/LoadAnnotationData.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace Wallabag\AnnotationBundle\DataFixtures\ORM;
+
+use Doctrine\Common\DataFixtures\AbstractFixture;
+use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
+use Doctrine\Common\Persistence\ObjectManager;
+use Wallabag\AnnotationBundle\Entity\Annotation;
+
+class LoadAnnotationData extends AbstractFixture implements OrderedFixtureInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function load(ObjectManager $manager)
+    {
+        $annotation1 = new Annotation($this->getReference('admin-user'));
+        $annotation1->setEntry($this->getReference('entry1'));
+        $annotation1->setText('This is my annotation /o/');
+        $annotation1->setQuote('content');
+
+        $manager->persist($annotation1);
+
+        $this->addReference('annotation1', $annotation1);
+
+        $annotation2 = new Annotation($this->getReference('admin-user'));
+        $annotation2->setEntry($this->getReference('entry2'));
+        $annotation2->setText('This is my 2nd annotation /o/');
+        $annotation2->setQuote('content');
+
+        $manager->persist($annotation2);
+
+        $this->addReference('annotation2', $annotation2);
+
+        $manager->flush();
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getOrder()
+    {
+        return 35;
+    }
+}

src/Wallabag/AnnotationBundle/DependencyInjection/Configuration.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Wallabag\AnnotationBundle\DependencyInjection;
+
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
+
+class Configuration implements ConfigurationInterface
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function getConfigTreeBuilder()
+    {
+        $treeBuilder = new TreeBuilder();
+        $rootNode = $treeBuilder->root('wallabag_annotation');
+
+        return $treeBuilder;
+    }
+}

src/Wallabag/AnnotationBundle/DependencyInjection/WallabagAnnotationExtension.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace Wallabag\AnnotationBundle\DependencyInjection;
+
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\HttpKernel\DependencyInjection\Extension;
+
+class WallabagAnnotationExtension extends Extension
+{
+    /**
+     * {@inheritdoc}
+     */
+    public function load(array $configs, ContainerBuilder $container)
+    {
+        $configuration = new Configuration();
+        $config = $this->processConfiguration($configuration, $configs);
+    }
+}

src/Wallabag/AnnotationBundle/Entity/Annotation.php

@@ -0,0 +1,270 @@
+<?php
+
+namespace Wallabag\AnnotationBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+use JMS\Serializer\Annotation\ExclusionPolicy;
+use JMS\Serializer\Annotation\Exclude;
+use JMS\Serializer\Annotation\VirtualProperty;
+use JMS\Serializer\Annotation\SerializedName;
+use Wallabag\UserBundle\Entity\User;
+use Wallabag\CoreBundle\Entity\Entry;
+
+/**
+ * Annotation.
+ *
+ * @ORM\Table(name="annotation")
+ * @ORM\Entity(repositoryClass="Wallabag\AnnotationBundle\Repository\AnnotationRepository")
+ * @ORM\HasLifecycleCallbacks()
+ * @ExclusionPolicy("none")
+ */
+class Annotation
+{
+    /**
+     * @var int
+     *
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    private $id;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="text", type="text")
+     */
+    private $text;
+
+    /**
+     * @var \DateTime
+     *
+     * @ORM\Column(name="created_at", type="datetime")
+     */
+    private $createdAt;
+
+    /**
+     * @var \DateTime
+     *
+     * @ORM\Column(name="updated_at", type="datetime")
+     */
+    private $updatedAt;
+
+    /**
+     * @var string
+     *
+     * @ORM\Column(name="quote", type="string")
+     */
+    private $quote;
+
+    /**
+     * @var array
+     *
+     * @ORM\Column(name="ranges", type="array")
+     */
+    private $ranges;
+
+    /**
+     * @Exclude
+     *
+     * @ORM\ManyToOne(targetEntity="Wallabag\UserBundle\Entity\User")
+     */
+    private $user;
+
+    /**
+     * @Exclude
+     *
+     * @ORM\ManyToOne(targetEntity="Wallabag\CoreBundle\Entity\Entry", inversedBy="annotations")
+     * @ORM\JoinColumn(name="entry_id", referencedColumnName="id")
+     */
+    private $entry;
+
+    /*
+     * @param User     $user
+     */
+    public function __construct(User $user)
+    {
+        $this->user = $user;
+    }
+
+    /**
+     * Get id.
+     *
+     * @return int
+     */
+    public function getId()
+    {
+        return $this->id;
+    }
+
+    /**
+     * Set text.
+     *
+     * @param string $text
+     *
+     * @return Annotation
+     */
+    public function setText($text)
+    {
+        $this->text = $text;
+
+        return $this;
+    }
+
+    /**
+     * Get text.
+     *
+     * @return string
+     */
+    public function getText()
+    {
+        return $this->text;
+    }
+
+    /**
+     * @ORM\PrePersist
+     * @ORM\PreUpdate
+     */
+    public function timestamps()
+    {
+        if (is_null($this->createdAt)) {
+            $this->createdAt = new \DateTime();
+        }
+        $this->updatedAt = new \DateTime();
+    }
+
+    /**
+     * Get created.
+     *
+     * @return \DateTime
+     */
+    public function getCreatedAt()
+    {
+        return $this->createdAt;
+    }
+
+    /**
+     * Get updated.
+     *
+     * @return \DateTime
+     */
+    public function getUpdatedAt()
+    {
+        return $this->updatedAt;
+    }
+
+    /**
+     * Get quote.
+     *
+     * @return string
+     */
+    public function getQuote()
+    {
+        return $this->quote;
+    }
+
+    /**
+     * Set quote.
+     *
+     * @param string $quote
+     *
+     * @return Annotation
+     */
+    public function setQuote($quote)
+    {
+        $this->quote = $quote;
+
+        return $this;
+    }
+
+    /**
+     * Get ranges.
+     *
+     * @return array
+     */
+    public function getRanges()
+    {
+        return $this->ranges;
+    }
+
+    /**
+     * Set ranges.
+     *
+     * @param array $ranges
+     *
+     * @return Annotation
+     */
+    public function setRanges($ranges)
+    {
+        $this->ranges = $ranges;
+
+        return $this;
+    }
+
+    /**
+     * Set user.
+     *
+     * @param User $user
+     *
+     * @return Annotation
+     */
+    public function setUser($user)
+    {
+        $this->user = $user;
+
+        return $this;
+    }
+
+    /**
+     * Get user.
+     *
+     * @return User
+     */
+    public function getUser()
+    {
+        return $this->user;
+    }
+
+    /**
+     * @VirtualProperty
+     * @SerializedName("user")
+     */
+    public function getUserName()
+    {
+        return $this->user->getName();
+    }
+
+    /**
+     * Set entry.
+     *
+     * @param Entry $entry
+     *
+     * @return Annotation
+     */
+    public function setEntry($entry)
+    {
+        $this->entry = $entry;
+        $entry->setAnnotation($this);
+
+        return $this;
+    }
+
+    /**
+     * Get entry.
+     *
+     * @return Entry
+     */
+    public function getEntry()
+    {
+        return $this->entry;
+    }
+
+    /**
+     * @VirtualProperty
+     * @SerializedName("annotator_schema_version")
+     */
+    public function getVersion()
+    {
+        return 'v1.0';
+    }
+}