Release wallabag 2.0.0-beta.1

Prepare wallabag for first beta 🚀

.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,18 @@
+### 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:
+* 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

.gitignore

@@ -1,25 +1,20 @@
-# Cache and logs (Symfony2)
-/app/cache/*
-/app/logs/*
-!app/cache/.gitkeep
-!app/logs/.gitkeep
-
-# Cache and logs (Symfony3)
+# Cache, logs & sessions
+/var/*
+!/var/cache
 /var/cache/*
-/var/logs/*
 !var/cache/.gitkeep
+!/var/logs
+/var/logs/*
 !var/logs/.gitkeep
+!/var/sessions
+/var/sessions/*
+!var/sessions/.gitkeep
+!var/SymfonyRequirements.php
 
 # Parameters
 /app/config/parameters.yml
-/app/config/parameters.ini
 
 # Managed by Composer
-/app/bootstrap.php.cache
-/var/bootstrap.php.cache
-/bin/*
-!bin/console
-!bin/symfony_requirements
 /vendor/
 
 # Assets and user uploads
@@ -36,3 +31,10 @@
 # Data for wallabag
 data/assets/*
 data/db/wallabag*.sqlite
+
+# Docker container logs and data
+docker/logs/
+docker/data/
+
+# To avoid crazy stuff on some PR, we must manually FORCE ADD IT on each new release
+composer.lock

.scrutinizer.yml

@@ -4,6 +4,7 @@ filter:
     excluded_paths:
         - 'vendor/*'
         - 'app/*'
+        - 'var/*'
         - 'web/*'
         - 'src/Wallabag/*Bundle/Tests/*'
         - '*Test.php'

.travis.yml

@@ -34,26 +34,22 @@ matrix:
     allow_failures:
         - php: hhvm
 
+# exclude v1 branches
 branches:
-    only:
-        - v2
+    except:
+        - master
+        - dev
 
 before_script:
-    - composer self-update
-    - if [ -n "$GH_TOKEN" ]; then composer config github-oauth.github.com ${GH_TOKEN}; fi;
-    # disable xdebug since we don't use code-coverage for now
-    - if [[ $TRAVIS_PHP_VERSION != '5.6' && $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != '7.0' ]]; then phpenv config-rm xdebug.ini; fi
-    # build coverage only on one build, to speed up results feedbacks
-    # - if [[ "$TRAVIS_PHP_VERSION" = "5.6" ]]; then PHPUNIT_FLAGS="--coverage-clover=coverage.clover"; else PHPUNIT_FLAGS=""; fi;
-    - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag;' -U postgres; fi;
+    - 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 [[ "$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
     - ant prepare-$DB
-    - SYMFONY_DEPRECATIONS_HELPER=weak bin/phpunit -v
-
-# after_script:
-    # - |
-        # if [ $TRAVIS_PHP_VERSION = '5.6' ]; then
-            # wget https://scrutinizer-ci.com/ocular.phar
-            # php ocular.phar code-coverage:upload --format=php-clover coverage.clover
-        # fi
+    - bin/phpunit -v

COPYING.md

@@ -1,19 +1,19 @@
-Copyright (c) 2013-2015 Nicolas Lœuillet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is furnished
-to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+Copyright (c) 2013-2016 Nicolas Lœuillet
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

CREDITS.md

@@ -1,6 +1,3 @@
-wallabag is mainly developed by [Nicolas Lœuillet](https://github.com/nicosomb) under the MIT License.
+wallabag is mainly developed by [Nicolas Lœuillet](https://github.com/nicosomb), [@j0k3r](https://github.com/j0k3r) and [@tcitworld](https://github.com/tcitworld) under the MIT License.
 
-Thank you so much to [@tcitworld](https://github.com/tcitworld) and [@j0k3r](https://github.com/j0k3r).
-
-Thank you [to others contributors](https://github.com/wallabag/wallabag/graphs/contributors
-).
+Thank you [to others contributors](https://github.com/wallabag/wallabag/graphs/contributors).

Capfile

@@ -1,3 +1,6 @@
+set :deploy_config_path, 'app/config/capistrano/deploy.rb'
+set :stage_config_path, 'app/config/capistrano/deploy'
+
 # Load DSL and set up stages
 require 'capistrano/setup'
 
@@ -6,24 +9,5 @@ require 'capistrano/deploy'
 
 require 'capistrano/symfony'
 
-# Include tasks from other gems included in your Gemfile
-#
-# For documentation on these, see for example:
-#
-#   https://github.com/capistrano/rvm
-#   https://github.com/capistrano/rbenv
-#   https://github.com/capistrano/chruby
-#   https://github.com/capistrano/bundler
-#   https://github.com/capistrano/rails
-#   https://github.com/capistrano/passenger
-#
-# require 'capistrano/rvm'
-# require 'capistrano/rbenv'
-# require 'capistrano/chruby'
-# require 'capistrano/bundler'
-# require 'capistrano/rails/assets'
-# require 'capistrano/rails/migrations'
-# require 'capistrano/passenger'
-
 # Load custom tasks from `lib/capistrano/tasks` if you have any defined
 Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }

GUIDELINES.md

@@ -1,53 +0,0 @@
-# Guidelines for wallabag
-
-If you want to contribute to wallabag, you have some rules to respect. These rules were defined by [PHP Framework Interop Group](http://www.php-fig.org).
-
-## Basic Coding Standard (PSR-1)
-
-This section of the standard comprises what should be considered the standard coding elements that are required to ensure a high level of technical interoperability between shared PHP code.
-
-* Files MUST use only `<?php` and `<?=` tags.
-
-* Files MUST use only UTF-8 without BOM for PHP code.
-
-* Files SHOULD either declare symbols (classes, functions, constants, etc.) or cause side-effects (e.g. generate output, change .ini settings, etc.) but SHOULD NOT do both.
-
-* Namespaces and classes MUST follow [PSR-0](https://github.com/php-fig/fig-standards/blob/master/accepted/PSR-0.md).
-
-* Class names MUST be declared in `StudlyCaps`.
-
-* Class constants MUST be declared in all upper case with underscore separators.
-
-* Method names MUST be declared in `camelCase`.
-
-You can read details on [PHP FIG website](http://www.php-fig.org/psr/psr-1/).
-
-## Coding Style Guide (PSR-2)
-
-This guide extends and expands on PSR-1, the basic coding standard.
-
-The intent of this guide is to reduce cognitive friction when scanning code from different authors. It does so by enumerating a shared set of rules and expectations about how to format PHP code.
-
-The style rules herein are derived from commonalities among the various member projects. When various authors collaborate across multiple projects, it helps to have one set of guidelines to be used among all those projects. Thus, the benefit of this guide is not in the rules themselves, but in the sharing of those rules.
-
-* Code MUST follow PSR-1.
-
-* Code MUST use 4 spaces for indenting, not tabs.
-
-* There MUST NOT be a hard limit on line length; the soft limit MUST be 120 characters; lines SHOULD be 80 characters or less.
-
-* There MUST be one blank line after the `namespace` declaration, and there MUST be one blank line after the block of `use` declarations.
-
-* Opening braces for classes MUST go on the next line, and closing braces MUST go on the next line after the body.
-
-* Opening braces for methods MUST go on the next line, and closing braces MUST go on the next line after the body.
-
-* Visibility MUST be declared on all properties and methods; `abstract` and `final` MUST be declared before the visibility; `static` MUST be declared after the visibility.
-
-* Control structure keywords MUST have one space after them; method and function calls MUST NOT.
-
-* Opening braces for control structures MUST go on the same line, and closing braces MUST go on the next line after the body.
-
-* Opening parentheses for control structures MUST NOT have a space after them, and closing parentheses for control structures MUST NOT have a space before.
-
-You can read details on [PHP FIG website](http://www.php-fig.org/psr/psr-2/).

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,26 +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 ?
+# What is wallabag?
 wallabag is a self hostable application allowing you to not miss any content anymore.
-Click, save, read it when you can. It extracts content so that you can read it when you have time.
+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 ?
+# Want to test the v2?
+Keep in mind it's an **unstable** branch, everything can be broken :)
 
-Keep in mind it's an **instable** 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:
 
 ```
-git clone https://github.com/wallabag/wallabag.git -b v2
-cd wallabag
-composer install
-php app/console wallabag:install
-php app/console server:run
+SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.1" --no-dev
+php bin/console wallabag:install --env=prod
+php bin/console server:run --env=prod
 ```
 
 ## License
-Copyright © 2013-2015 Nicolas Lœuillet <nicolas@loeuillet.org>
+Copyright © 2013-2016 Nicolas Lœuillet <nicolas@loeuillet.org>
 This work is free. You can redistribute it and/or modify it under the
 terms of the MIT License. See the COPYING file for more details.

TRANSLATION.md

@@ -1,67 +0,0 @@
-# How to manage translations for wallabag
-
-This guide will describe the procedure of translation management of the wallabag web application.
-
-All translations are made using [gettext](http://en.wikipedia.org/wiki/Gettext) system and tools. 
-
-You will need the [Poedit](http://www.poedit.net/download.php) editor to update, edit and create your translation files easily. However, you can also handle translations also without it: all can be done using gettext tools and your favorite plain text editor only. This guide, however, describes editing with Poedit. If you want to use gettext only, please refer to the xgettext manual page to update po files from sources (see also how it is used by Poedit below) and use msgunfmt tool to compile .mo files manually.  
-
-You need to know, that translation phrases are stored in **".po"** files (for example: `locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po`), which are then complied in **".mo"** files using **msgfmt** gettext tool or by Poedit, which will run msgfmt for you in background. 
-
-**It's assumed, that you have wallabag installed locally on your computer or on the server you have access to.**
-
-## To change existing translation you will need to do:
-
-### 1. Clear cache
-You can do this using **http://your-wallabag-host.com/?empty-cache** link (replace http://your-wallabag-host.com/ with real url of your wallabag application)
-
-OR
-
-from command line:
-go to root of your installation of wallabag project and run next command:
-
-`rm -rf ./cache/*`
-
-(this may require root privileges if you run, for example Apache web server with mod_php)
-
-### 2. Generate php files from all twig templates
-Do this using next command:
-
-`php ./locale/tools/fillCache.php`
-
-OR
-
-from your browser: **http://your-wallabag-host.com/locale/tools/fillCache.php** (this may require removal of .htaccess file in locale/ directory).
-
-### 3. Configure your Poedit
-Open Poedit editor, open Edit->Preferences. Go to "Parsers" tab, click on PHP and press "Edit" button. Make sure your "Parser command:" looks like
-
-`xgettext --no-location --force-po -o %o %C %K %F`
-
-Usually it is required to add "--no-location" to default value. 
-
-### 4. Open .po file you want to edit in Poedit and change its settings
-Open, for example `locale/pl_PL.utf8/LC_MESSAGES/pl_PL.utf8.po` file in your Poedit.
-
-Go to "Catalog"->"Settings..." menu. Then go to "Path" tab and add path to wallabag installation in your local file system. This step can't be omitted as you will not be able to update phrases otherwise.
-
-You can also check "project into" tab to be sure, that "Language" is set correctly (this will allow you to spell check your translation).
-
-### 5. Update opened .po file from sources
-Once you have set your path correctly, you are able to update phrases from sources. Press "Update catalog - synchronize it with sources" button or go to "Catalog"->"Update from sources" menu.
-
-As a result you will see confirmation popup with two tabs: "New strings" and "Obsolete strings". Please review and accept changes (or press "Undo" if you see too many obsolete strings, as Poedit will remove them all - in this case please make sure all previous steps are performed w/o errors).
-
-### 6. Translate and save your .po file
-If you have any difficulties on this step, please consult with Poedit manual.
-Every time you save your .po file, Poedit will also compile appropriate .mo file by default (of course, if not disabled in preferences).
-
-You are now almost done.
-
-### 7. Clear cache again
-This step may be required if your web server runs php scripts in name of, say, www user (i.e. Apache with mod_php, not cgi).
-
-
-##To create new translation
-You just have to copy the folder corresponding to the language you want to translate from, change language in the project settings and for the folder and files names. Then start replacing all existing translations with your own.
-

Vagrantfile

@@ -1,71 +0,0 @@
-
-$script_sqlite = <<SCRIPT
-apt-get update
-apt-get install -y apache2 php5 php5-sqlite php5-xdebug
-apt-get clean -y
-echo "ServerName localhost" >> /etc/apache2/apache2.conf
-service apache2 restart
-rm -f /var/www/html/index.html
-date > /etc/vagrant_provisioned_at
-SCRIPT
-
-$script_mysql = <<SCRIPT
-export DEBIAN_FRONTEND=noninteractive
-apt-get update
-apt-get install -y apache2 php5 php5-mysql php5-xdebug mysql-server mysql-client
-apt-get clean -y
-echo "ServerName localhost" >> /etc/apache2/apache2.conf
-service apache2 restart
-service mysql restart
-echo "create database wallabag;" | mysql -u root
-rm -f /var/www/html/index.html
-date > /etc/vagrant_provisioned_at
-SCRIPT
-
-$script_postgres = <<SCRIPT
-export DEBIAN_FRONTEND=noninteractive
-apt-get update
-apt-get install -y apache2 php5 php5-pgsql php5-xdebug postgresql postgresql-contrib
-apt-get clean -y
-echo "ServerName localhost" >> /etc/apache2/apache2.conf
-service apache2 restart
-service postgresql restart
-rm -f /var/www/html/index.html
-date > /etc/vagrant_provisioned_at
-SCRIPT
-
-Vagrant.configure("2") do |config|
-
-  config.vm.define "sqlite" do |m|
-    m.vm.box = "ubuntu/trusty64"
-    m.vm.provision "shell", inline: $script_sqlite
-    m.vm.synced_folder ".", "/var/www/html", owner: "www-data", group: "www-data"
-  end
-
-  config.vm.define "mysql" do |m|
-    m.vm.box = "ubuntu/trusty64"
-    m.vm.provision "shell", inline: $script_mysql
-    m.vm.synced_folder ".", "/var/www/html", owner: "www-data", group: "www-data"
-  end
-
-  config.vm.define "postgres" do |m|
-    m.vm.box = "ubuntu/trusty64"
-    m.vm.provision "shell", inline: $script_postgres
-    m.vm.synced_folder ".", "/var/www/html", owner: "www-data", group: "www-data"
-  end
-
-  config.vm.define "debian7" do |m|
-    m.vm.box = "chef/debian-7.6"
-    m.vm.provision "shell", inline: $script_sqlite
-    m.vm.synced_folder ".", "/var/www", owner: "www-data", group: "www-data"
-  end
-
-  config.vm.define "debian6" do |m|
-    m.vm.box = "chef/debian-6.0.10"
-    m.vm.provision "shell", inline: $script_sqlite
-    m.vm.synced_folder ".", "/var/www", owner: "www-data", group: "www-data"
-  end
-
-  config.vm.network :forwarded_port, guest: 80, host: 8003
-  #config.vm.network "public_network", :bridge => "en0: Wi-Fi (AirPort)"
-end

app/AppCache.php

@@ -1,7 +1,5 @@
 <?php
 
-require_once __DIR__.'/AppKernel.php';
-
 use Symfony\Bundle\FrameworkBundle\HttpCache\HttpCache;
 
 class AppCache extends HttpCache

app/AppKernel.php

@@ -7,7 +7,7 @@ class AppKernel extends Kernel
 {
     public function registerBundles()
     {
-        $bundles = array(
+        $bundles = [
             new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
             new Symfony\Bundle\SecurityBundle\SecurityBundle(),
             new Symfony\Bundle\TwigBundle\TwigBundle(),
@@ -32,9 +32,13 @@ class AppKernel extends Kernel
             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 Wallabag\AnnotationBundle\WallabagAnnotationBundle(),
+        ];
 
-        if (in_array($this->getEnvironment(), array('dev', 'test'))) {
+        if (in_array($this->getEnvironment(), ['dev', 'test'], true)) {
             $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle();
             $bundles[] = new Symfony\Bundle\WebProfilerBundle\WebProfilerBundle();
             $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
@@ -45,8 +49,23 @@ class AppKernel extends Kernel
         return $bundles;
     }
 
+    public function getRootDir()
+    {
+        return __DIR__;
+    }
+
+    public function getCacheDir()
+    {
+        return dirname(__DIR__).'/var/cache/'.$this->getEnvironment();
+    }
+
+    public function getLogDir()
+    {
+        return dirname(__DIR__).'/var/logs';
+    }
+
     public function registerContainerConfiguration(LoaderInterface $loader)
     {
-        $loader->load(__DIR__.'/config/config_'.$this->getEnvironment().'.yml');
+        $loader->load($this->getRootDir().'/config/config_'.$this->getEnvironment().'.yml');
     }
 }

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.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.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.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.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/autoload.php

@@ -8,6 +8,6 @@ use Composer\Autoload\ClassLoader;
  */
 $loader = require __DIR__.'/../vendor/autoload.php';
 
-AnnotationRegistry::registerLoader(array($loader, 'loadClass'));
+AnnotationRegistry::registerLoader([$loader, 'loadClass']);
 
 return $loader;

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/config.yml

@@ -21,15 +21,28 @@ framework:
     trusted_proxies: ~
     session:
         # handler_id set to null will use default session handler from php.ini
-        handler_id:  ~
+        handler_id:  session.handler.native_file
+        save_path:   "%kernel.root_dir%/../var/sessions/%kernel.environment%"
     fragments:       ~
     http_method_override: true
+    assets: ~
 
 wallabag_core:
+    version: 2.0.0-beta.1
+    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'
+    items_on_page: 12
+    theme: material
+    language: en
+    rss_limit: 50
 
 wallabag_import:
     allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain']
@@ -39,29 +52,8 @@ 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"
-        flattr_url: "https://flattr.com/thing/1265480"
-    form:
-        resources:
-            - LexikFormFilterBundle:Form:form_div_layout.html.twig
+    form_themes:
+        - "LexikFormFilterBundle:Form:form_div_layout.html.twig"
 
 # Assetic Configuration
 assetic:
@@ -102,6 +94,12 @@ stof_doctrine_extensions:
             tree: true
             sluggable: true
 
+doctrine_migrations:
+    dir_name: "%kernel.root_dir%/DoctrineMigrations"
+    namespace: Application\Migrations
+    table_name: migration_versions
+    name: Application Migrations
+
 # Swiftmailer Configuration
 swiftmailer:
     transport: "%mailer_transport%"
@@ -165,14 +163,8 @@ liip_theme:
     autodetect_theme: wallabag_core.helper.detect_active_theme
 
     path_patterns:
-        # app_resource:
-        #     - %%app_path%%/views/themes/%%current_theme%%/%%template%%
-        #     - %%app_path%%/views/%%template%%
         bundle_resource:
             - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%
-        # bundle_resource_dir:
-        #     - %%dir%%/views/themes/%%current_theme%%/%%bundle_name%%/%%template%%
-        #     - %%dir%%/views/%%bundle_name%%/%%override_path%%
 
 fos_user:
     db_driver: orm
@@ -180,8 +172,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 +201,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_dev.yml

@@ -17,13 +17,14 @@ monolog:
             type:   stream
             path:   "%kernel.logs_dir%/%kernel.environment%.log"
             level:  debug
+            channels: [!event]
         console:
             type:   console
             bubble: false
             verbosity_levels:
                 VERBOSITY_VERBOSE: INFO
                 VERBOSITY_VERY_VERBOSE: DEBUG
-            channels: ["!doctrine"]
+            channels: [!event, !doctrine]
         console_very_verbose:
             type:   console
             bubble: false
@@ -31,15 +32,7 @@ monolog:
                 VERBOSITY_VERBOSE: NOTICE
                 VERBOSITY_VERY_VERBOSE: NOTICE
                 VERBOSITY_DEBUG: DEBUG
-            channels: ["doctrine"]
-        # uncomment to get logging in your browser
-        # you may have to allow bigger header sizes in your Web server configuration
-        #firephp:
-        #    type:   firephp
-        #    level:  info
-        #chromephp:
-        #    type:   chromephp
-        #    level:  info
+            channels: [doctrine]
 
 assetic:
     use_controller: true
@@ -49,6 +42,3 @@ swiftmailer:
     transport: smtp
     host: 'localhost'
     port: 1025
-    username: null
-    password: null
-

app/config/parameters.yml.dist

@@ -1,5 +1,15 @@
 # This file is a "template" of what your parameters.yml file should look like
 parameters:
+    # Uncomment these settings or manually update your parameters.yml
+    # to use docker-compose
+    #
+    # database_driver: %env.database_driver%
+    # database_host: %env.database_host%
+    # database_port: %env.database_port%
+    # database_name: %env.database_name%
+    # database_user: %env.database_user%
+    # database_password: %env.database_password%
+
     database_driver: pdo_sqlite
     database_host: 127.0.0.1
     database_port: ~
@@ -25,41 +35,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/routing.yml

@@ -1,3 +1,7 @@
+wallabag_annotation:
+  type : rest
+  resource: "@WallabagAnnotationBundle/Resources/config/routing_annotations.yml"
+
 wallabag_import:
     resource: "@WallabagImportBundle/Controller/"
     type:     annotation
@@ -8,7 +12,7 @@ wallabag_api:
     prefix: /
 
 app:
-    resource: @WallabagCoreBundle/Controller/
+    resource: "@WallabagCoreBundle/Controller/"
     type: annotation
 
 doc-api:
@@ -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_dev.yml

@@ -6,13 +6,9 @@ _profiler:
     resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml"
     prefix:   /_profiler
 
-_configurator:
-    resource: "@SensioDistributionBundle/Resources/config/routing/webconfigurator.xml"
-    prefix:   /_configurator
-
 _errors:
     resource: "@TwigBundle/Resources/config/routing/errors.xml"
     prefix:   /_error
 
 _main:
-    resource: routing.yml
+    resource: routing.yml

app/config/routing_rest.yml

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

app/config/security.yml

@@ -15,6 +15,11 @@ security:
     # the main part of the security, where you can set up firewalls
     # for specific sections of your app
     firewalls:
+        # disables authentication for assets and the profiler, adapt it according to your needs
+        dev:
+            pattern: ^/(_(profiler|wdt)|css|images|js)/
+            security: false
+
         oauth_token:
             pattern: ^/oauth/v2/token
             security: false
@@ -33,11 +38,11 @@ security:
             pattern: ^/
             form_login:
                 provider: fos_userbundle
-                csrf_provider: security.csrf.token_manager
+                csrf_token_generator: security.csrf.token_manager
 
             anonymous:    true
             remember_me:
-                key:      "%secret%"
+                secret:   "%secret%"
                 lifetime: 31536000
                 path:     /
                 domain:   ~
@@ -52,4 +57,6 @@ security:
         - { 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

@@ -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

@@ -12,7 +12,7 @@ parameters:
     test_database_driver: pdo_mysql
     test_database_host: localhost
     test_database_port: 3306
-    test_database_name: wallabag
+    test_database_name: wallabag_test
     test_database_user: root
     test_database_password: ~
     test_database_path: ~
@@ -27,39 +27,11 @@ parameters:
     # A secret key that's used to generate certain security-related tokens
     secret:            ThisTokenIsNotSoSecretChangeIt
 
-    # 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_US
     from_email: no-reply@wallabag.org
-    rss_limit: 50
-
-    # pocket import
-    pocket_consumer_key: xxxxxxxx

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

@@ -12,7 +12,7 @@ parameters:
     test_database_driver: pdo_pgsql
     test_database_host: localhost
     test_database_port:
-    test_database_name: wallabag
+    test_database_name: wallabag_test
     test_database_user: travis
     test_database_password: ~
     test_database_path: ~
@@ -27,39 +27,11 @@ parameters:
     # A secret key that's used to generate certain security-related tokens
     secret:            ThisTokenIsNotSoSecretChangeIt
 
-    # 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_US
     from_email: no-reply@wallabag.org
-    rss_limit: 50
-
-    # pocket import
-    pocket_consumer_key: xxxxxxxx

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

@@ -27,39 +27,11 @@ parameters:
     # A secret key that's used to generate certain security-related tokens
     secret:            ThisTokenIsNotSoSecretChangeIt
 
-    # 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_US
     from_email: no-reply@wallabag.org
-    rss_limit: 50
-
-    # pocket import
-    pocket_consumer_key: xxxxxxxx

bin/console

@@ -1,22 +1,24 @@
 #!/usr/bin/env php
 <?php
 
+use Symfony\Bundle\FrameworkBundle\Console\Application;
+use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Debug\Debug;
+
 // if you don't want to setup permissions the proper way, just uncomment the following PHP line
 // read http://symfony.com/doc/current/book/installation.html#configuration-and-setup for more information
 //umask(0000);
 
 set_time_limit(0);
 
-require_once __DIR__.'/bootstrap.php.cache';
-require_once __DIR__.'/AppKernel.php';
-
-use Symfony\Bundle\FrameworkBundle\Console\Application;
-use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Debug\Debug;
+/**
+ * @var Composer\Autoload\ClassLoader $loader
+ */
+$loader = require __DIR__.'/../app/autoload.php';
 
 $input = new ArgvInput();
-$env = $input->getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev');
-$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('--no-debug', '')) && $env !== 'prod';
+$env = $input->getParameterOption(['--env', '-e'], getenv('SYMFONY_ENV') ?: 'dev');
+$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(['--no-debug', '']) && $env !== 'prod';
 
 if ($debug) {
     Debug::enable();

bin/doctrine

@@ -0,0 +1 @@
+../vendor/doctrine/orm/bin/doctrine

bin/doctrine-dbal

@@ -0,0 +1 @@
+../vendor/doctrine/dbal/bin/doctrine-dbal

bin/doctrine-migrations

@@ -0,0 +1 @@
+../vendor/doctrine/migrations/bin/doctrine-migrations

bin/doctrine.php

@@ -0,0 +1 @@
+../vendor/doctrine/orm/bin/doctrine.php

bin/security-checker

@@ -0,0 +1 @@
+../vendor/sensiolabs/security-checker/security-checker

bin/symfony_requirements

@@ -1,12 +1,13 @@
+#!/usr/bin/env php
 <?php
 
-require_once dirname(__FILE__).'/SymfonyRequirements.php';
+require_once dirname(__FILE__).'/../var/SymfonyRequirements.php';
 
 $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) {
@@ -42,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');
 
@@ -80,7 +81,7 @@ function get_error_message(Requirement $requirement, $lineSize)
         return;
     }
 
-    $errorMessage  = wordwrap($requirement->getTestMessage(), $lineSize - 3, PHP_EOL.'   ').PHP_EOL;
+    $errorMessage = wordwrap($requirement->getTestMessage(), $lineSize - 3, PHP_EOL.'   ').PHP_EOL;
     $errorMessage .= '   > '.wordwrap($requirement->getHelpText(), $lineSize - 5, PHP_EOL.'   > ').PHP_EOL;
 
     return $errorMessage;
@@ -121,8 +122,8 @@ function echo_block($style, $title, $message)
     echo PHP_EOL.PHP_EOL;
 
     echo_style($style, str_repeat(' ', $width).PHP_EOL);
-    echo_style($style, str_pad(' ['.$title.']',  $width, ' ', STR_PAD_RIGHT).PHP_EOL);
-    echo_style($style, str_pad($message,  $width, ' ', STR_PAD_RIGHT).PHP_EOL);
+    echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT).PHP_EOL);
+    echo_style($style, str_pad($message, $width, ' ', STR_PAD_RIGHT).PHP_EOL);
     echo_style($style, str_repeat(' ', $width).PHP_EOL);
 }
 

build.xml

@@ -1,46 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="wallabag" default="build">
-    <target name="build" depends="clean,composer,prepare,phpunit"/>
-    <target name="prepare-mysql" depends="clean,composer,db_mysql,prepare"/>
-    <target name="prepare-sqlite" depends="clean,composer,db_sqlite,prepare"/>
-    <target name="prepare-pgsql" depends="clean,composer,db_pgsql,prepare"/>
+    <target name="build" depends="clean,prepare,phpunit"/>
+    <target name="prepare-mysql" depends="clean,db_mysql,prepare"/>
+    <target name="prepare-sqlite" depends="clean,db_sqlite,prepare"/>
+    <target name="prepare-pgsql" depends="clean,db_pgsql,prepare"/>
 
     <target name="clean" description="Cleanup build artifacts">
-        <delete dir="${basedir}/app/cache"/>
-    </target>
-
-    <target name="composer" description="Install deps using Composer">
-        <exec executable="composer">
-            <arg value="install"/>
-            <arg value="--no-interaction"/>
-            <arg value="--no-progress"/>
-        </exec>
+        <delete dir="${basedir}/var/cache"/>
     </target>
 
     <target name="prepare" description="Prepare for build">
         <exec executable="php">
-            <arg value="${basedir}/app/console"/>
+            <arg value="${basedir}/bin/console"/>
             <arg value="doctrine:database:drop"/>
             <arg value="--force"/>
             <arg value="--env=test"/>
         </exec>
         <exec executable="php">
-            <arg value="${basedir}/app/console"/>
+            <arg value="${basedir}/bin/console"/>
             <arg value="doctrine:database:create"/>
             <arg value="--env=test"/>
         </exec>
         <exec executable="php">
-            <arg value="${basedir}/app/console"/>
+            <arg value="${basedir}/bin/console"/>
             <arg value="doctrine:schema:create"/>
             <arg value="--env=test"/>
         </exec>
         <exec executable="php">
-            <arg value="${basedir}/app/console"/>
+            <arg value="${basedir}/bin/console"/>
             <arg value="cache:clear"/>
             <arg value="--env=test"/>
         </exec>
         <exec executable="php">
-            <arg value="${basedir}/app/console"/>
+            <arg value="${basedir}/bin/console"/>
             <arg value="doctrine:fixtures:load"/>
             <arg value="--no-interaction"/>
             <arg value="--env=test"/>
@@ -55,7 +47,7 @@
         </exec>
 
         <exec executable="php">
-            <arg value="${basedir}/app/console"/>
+            <arg value="${basedir}/bin/console"/>
             <arg value="cache:clear"/>
             <arg value="--env=test"/>
         </exec>
@@ -69,7 +61,7 @@
         </exec>
 
         <exec executable="php">
-            <arg value="${basedir}/app/console"/>
+            <arg value="${basedir}/bin/console"/>
             <arg value="cache:clear"/>
             <arg value="--env=test"/>
         </exec>
@@ -83,7 +75,7 @@
         </exec>
 
         <exec executable="php">
-            <arg value="${basedir}/app/console"/>
+            <arg value="${basedir}/bin/console"/>
             <arg value="cache:clear"/>
             <arg value="--env=test"/>
         </exec>

composer.json

@@ -28,74 +28,91 @@
         "issues": "https://github.com/wallabag/wallabag/issues"
     },
     "require": {
-        "php": ">=5.5.0",
-        "symfony/symfony": "~2.7.0",
-        "doctrine/orm": "~2.3",
-        "doctrine/doctrine-bundle": "1.5.2",
+        "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",
+        "doctrine/doctrine-cache-bundle": "^1.2",
         "twig/extensions": "~1.0",
         "symfony/assetic-bundle": "~2.3",
-        "symfony/swiftmailer-bundle": "~2.3",
-        "symfony/monolog-bundle": "~2.4",
-        "sensio/distribution-bundle": "~3.0.12",
-        "sensio/framework-extra-bundle": "~3.0",
-        "incenteev/composer-parameter-handler": "~2.0",
+        "symfony/swiftmailer-bundle": "^2.3",
+        "symfony/monolog-bundle": "^2.8",
+        "sensio/distribution-bundle": "^5.0",
+        "sensio/framework-extra-bundle": "^3.0.2",
+        "incenteev/composer-parameter-handler": "^2.0",
         "nelmio/cors-bundle": "~1.4.0",
         "friendsofsymfony/rest-bundle": "~1.4",
-        "jms/serializer-bundle": "~0.13",
+        "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",
-        "willdurand/hateoas-bundle": "~0.5.0",
+        "willdurand/hateoas-bundle": "~1.0",
         "htmlawed/htmlawed": "~1.1.19",
-        "liip/theme-bundle": "~1.1.3",
+        "liip/theme-bundle": "~1.1",
         "pagerfanta/pagerfanta": "~1.0.3",
-        "lexik/form-filter-bundle": "~4.0",
+        "lexik/form-filter-bundle": "~5.0",
         "j0k3r/graby": "~1.0",
-        "friendsofsymfony/user-bundle": "dev-master",
-        "friendsofsymfony/oauth-server-bundle": "^1.4@dev",
+        "friendsofsymfony/user-bundle": "~2.0@dev",
+        "friendsofsymfony/oauth-server-bundle": "^1.5",
         "stof/doctrine-extensions-bundle": "^1.2@dev",
-        "scheb/two-factor-bundle": "~1.4.0",
+        "scheb/two-factor-bundle": "~2.0",
         "grandt/phpepub": "~4.0",
         "wallabag/php-mobi": "~1.0.0",
         "kphoen/rulerz-bundle": "~0.10",
-        "guzzlehttp/guzzle": "^5.2.0"
+        "guzzlehttp/guzzle": "^5.2.0",
+        "doctrine/doctrine-migrations-bundle": "^1.0",
+        "paragonie/random_compat": "~1.0",
+        "craue/config-bundle": "~1.4",
+        "mnapoli/piwik-twig-extension": "^1.0",
+        "lexik/maintenance-bundle": "~2.1"
     },
     "require-dev": {
-        "doctrine/doctrine-fixtures-bundle": "~2.2.0",
-        "sensio/generator-bundle": "~2.5",
+        "doctrine/doctrine-fixtures-bundle": "~2.2",
+        "sensio/generator-bundle": "^3.0",
         "phpunit/phpunit": "~4.4",
-        "symfony/phpunit-bridge": "~2.7.0"
+        "symfony/phpunit-bridge": "^2.7"
     },
-    "repositories": [
-        {
-            "type": "vcs",
-            "url": "https://github.com/wallabag/phpMobi"
-        }
-    ],
     "scripts": {
-        "post-install-cmd": [
-            "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
-        ],
-        "post-update-cmd": [
-            "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile"
-        ],
         "build-parameters": [
             "Incenteev\\ParameterHandler\\ScriptHandler::buildParameters"
+        ],
+        "post-cmd": [
+            "@build-parameters",
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap",
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::clearCache",
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installAssets",
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::installRequirementsFile",
+            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::prepareDeploymentTarget"
+        ],
+        "post-install-cmd": [
+            "@post-cmd"
+        ],
+        "post-update-cmd": [
+            "@post-cmd"
         ]
     },
     "extra": {
         "symfony-app-dir": "app",
+        "symfony-bin-dir": "bin",
+        "symfony-var-dir": "var",
         "symfony-web-dir": "web",
+        "symfony-tests-dir": "tests",
         "symfony-assets-install": "relative",
         "incenteev-parameters": {
             "file": "app/config/parameters.yml",
@@ -108,7 +125,8 @@
         }
     },
     "autoload": {
-        "psr-0": { "": "src/" }
+        "psr-4": { "Wallabag\\": "src/Wallabag/" },
+        "classmap": [ "app/AppKernel.php", "app/AppCache.php" ]
     },
     "config": {
         "bin-dir": "bin"

config/deploy/production.rb

@@ -1,61 +0,0 @@
-# server-based syntax
-# ======================
-# Defines a single server with a list of roles and multiple properties.
-# You can define all roles on a single server, or split them:
-
-# server 'example.com', user: 'deploy', roles: %w{app db web}, my_property: :my_value
-# server 'example.com', user: 'deploy', roles: %w{app web}, other_property: :other_value
-# server 'db.example.com', user: 'deploy', roles: %w{db}
-
-
-
-# role-based syntax
-# ==================
-
-# Defines a role with one or multiple servers. The primary server in each
-# group is considered to be the first unless any  hosts have the primary
-# property set. Specify the username and a domain or IP for the server.
-# Don't use `:all`, it's a meta role.
-
-# role :app, %w{deploy@example.com}, my_property: :my_value
-# role :web, %w{user1@primary.com user2@additional.com}, other_property: :other_value
-# role :db,  %w{deploy@example.com}
-
-
-
-# Configuration
-# =============
-# You can set any configuration variable like in config/deploy.rb
-# These variables are then only loaded and set in this stage.
-# For available Capistrano configuration variables see the documentation page.
-# http://capistranorb.com/documentation/getting-started/configuration/
-# Feel free to add new variables to customise your setup.
-
-
-
-# Custom SSH Options
-# ==================
-# You may pass any option but keep in mind that net/ssh understands a
-# limited set of options, consult the Net::SSH documentation.
-# http://net-ssh.github.io/net-ssh/classes/Net/SSH.html#method-c-start
-#
-# Global options
-# --------------
-#  set :ssh_options, {
-#    keys: %w(/home/rlisowski/.ssh/id_rsa),
-#    forward_agent: false,
-#    auth_methods: %w(password)
-#  }
-#
-# The server-based syntax can be used to override options:
-# ------------------------------------
-# server 'example.com',
-#   user: 'user_name',
-#   roles: %w{web app},
-#   ssh_options: {
-#     user: 'user_name', # overrides user setting above
-#     keys: %w(/home/user_name/.ssh/id_rsa),
-#     forward_agent: false,
-#     auth_methods: %w(publickey password)
-#     # password: 'please use keys'
-#   }

docker-compose.yml

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

docker/mariadb/env

@@ -0,0 +1,10 @@
+MYSQL_ROOT_PASSWORD=wallaroot
+MYSQL_USER=wallabag
+MYSQL_PASSWORD=wallapass
+MYSQL_DATABASE=wallabag
+SYMFONY__ENV__DATABASE_DRIVER=pdo_mysql
+SYMFONY__ENV__DATABASE_HOST=rdbms
+SYMFONY__ENV__DATABASE_PORT=3306
+SYMFONY__ENV__DATABASE_NAME=wallabag
+SYMFONY__ENV__DATABASE_USER=wallabag
+SYMFONY__ENV__DATABASE_PASSWORD=wallapass

docker/nginx/nginx.conf

@@ -0,0 +1,89 @@
+user  nginx;
+worker_processes  1;
+pid        /var/run/nginx.pid;
+
+events {
+    worker_connections  2048;
+    multi_accept on;
+    use epoll;
+}
+
+http {
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    server_tokens off;
+    sendfile on;
+    tcp_nopush on;
+    tcp_nodelay on;
+    keepalive_timeout 15;
+    types_hash_max_size 2048;
+    include /etc/nginx/mime.types;
+    default_type application/octet-stream;
+    access_log off;
+    error_log off;
+    gzip on;
+    gzip_disable "msie6";
+    open_file_cache max=100;
+
+
+    upstream php-upstream {
+        server php:9000;
+    }
+
+    server {
+        #server_name domain.tld www.domain.tld;
+        root /var/www/html/web;
+
+        location / {
+            # try to serve file directly, fallback to app.php
+            try_files $uri /app.php$is_args$args;
+        }
+        # DEV
+        # This rule should only be placed on your development environment
+        # In production, don't include this and don't deploy app_dev.php or config.php
+        location ~ ^/(app_dev|config)\.php(/|$) {
+            fastcgi_pass php-upstream;
+            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;
+        }
+        # PROD
+        location ~ ^/app\.php(/|$) {
+            fastcgi_pass php-upstream;
+            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/project_error.log;
+        access_log /var/log/nginx/project_access.log;
+    }
+
+}
+
+daemon off;

docker/php/Dockerfile

@@ -0,0 +1,10 @@
+FROM php:fpm
+
+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 usermod -u 1000 www-data
+
+CMD ["php-fpm"]

docker/php/env

@@ -0,0 +1,6 @@
+SYMFONY__ENV__DATABASE_DRIVER=pdo_sqlite
+SYMFONY__ENV__DATABASE_HOST=127.0.0.1
+SYMFONY__ENV__DATABASE_PORT=~
+SYMFONY__ENV__DATABASE_NAME=symfony
+SYMFONY__ENV__DATABASE_USER=root
+SYMFONY__ENV__DATABASE_PASSWORD=~

docker/postgres/env

@@ -0,0 +1,9 @@
+POSTGRES_USER=wallabag
+POSTGRES_PASSWORD=wallapass
+POSTGRES_DB=wallabag
+export SYMFONY__ENV__DATABASE_DRIVER=pdo_pgsql
+export SYMFONY__ENV__DATABASE_HOST=rdbms
+export SYMFONY__ENV__DATABASE_PORT=5432
+export SYMFONY__ENV__DATABASE_NAME=wallabag
+export SYMFONY__ENV__DATABASE_USER=wallabag
+export SYMFONY__ENV__DATABASE_PASSWORD=wallapass

docs/en/Administrator/hidden_options.rst

@@ -1,85 +0,0 @@
-Hidden options
-==============
-
-Caution
--------
-
-**Be careful**, this section is destined to advanced users. We are going
-to modify an important wallabag configuration file,
-``inc/poche/config.inc.php``. It is therefore advised to do a backup of
-this file before you proceed. **Any error occuring during the
-modification of a wallabag file could lead to malfunctions**.
-
-This file is created when you install wallabag. Install wallabag, do a
-backup copy of the file, then open it in your favorite text editor.
-
-In this file, there are some options that are not, as of now, available
-in the **config** page of wallabag.
-
-Modification of advanced options
---------------------------------
-
-Each option is defined this way:
-
-::
-
-    @define ('OPTION_NAME', 'Value');
-
-For each line, you can only modify the ``Value`` field.
-
-Here is the list of each option you can change:
-
--  ``HTTP_PORT`` (default: ``80``) : the HTTP port of your web server.
-   You may need to change it if your server is behind a proxy. Accepted
-   values: number
--  ``SSL_PORT`` (default: ``443``) : the HTTP port of your web server.
-   You may need to change it if your server use SSLH. Accepted values:
-   number
--  ``MODE_DEMO`` (default : ``FALSE)``: If you ever wanted to set up a
-   demonstration server… Accepted values: ``TRUE`` or ``FALSE``.
--  ``DEBUG_POCHE`` (default: ``FALSE``) : if you encounter some problems
-   with wallabag, we may ask you to active Debug mode. Accepted values:
-   ``TRUE`` or ``FALSE``. Check the logs in cache/log.txt after
-   activating that.
--  ``ERROR_REPORTING`` (default : ``E_ALL & ~E_NOTICE``) : Set to
-   ``E_ALL`` if needed to look for eventual PHP errors.
--  ``DOWNLOAD_PICTURES`` (default: ``FALSE``) : Allows wallabag to fetch
-   images from the articles you save on your server, instead of fetching
-   only the text. We prefer to let you activate this option yourself.
-   Accepted values: ``TRUE`` or ``FALSE``.
--  ``REGENERATE_PICTURES_QUALITY`` (default : ``75``) : In order to
-   avoid security problems, pictures are regenerated if you activate the
-   download of pictures. This is the percentage of quality at which they
-   are saved. Increase that numbler if you want better quality, lower if
-   you need better performances.
--  ``SHARE_TWITTER`` (default: ``TRUE``) : enables Twitter sharing.
-   Accepted values: ``TRUE`` or ``FALSE``.
--  ``SHARE_MAIL`` (default: ``TRUE``) : enables mail sharing. Accepted
-   values: ``TRUE`` or ``FALSE``.
--  ``SHARE_EVERNOTE``\ (default : ``FALSE``) : enables sharing with your
-   Evernote account. Accepted values: ``TRUE`` or ``FALSE``.
--  ``SHARE_DIASPORA`` (default : ``FALSE``) : enables to share an
-   article on your Diaspora account.
--  ``DIASPORA_URL`` (default : ``http://diasporapod.com``) : The URL of
-   your Diaspora\* pod
--  ``CARROT`` (default : ``FALSE``) : Like Flattr, it’s a service to
-   give small amounts of money to a web page. See http://carrot.org/
--  ``SHARE_SHAARLI`` (default: ``FALSE``) : enables sharing via your
-   Shaarli installation (Shaarli is an open-source bookmark manager).
-   Accepted values: ``TRUE`` or ``FALSE``.
--  ``SHAARLI_URL`` (default: ``'http://myshaarliurl.com'``) : defines
-   your Shaarli installation URL. Accepted values: an URL.
--  ``FLATTR`` (default: ``TRUE``) : enables the possibility to Flattr an
-   article (`Flattr is a microdonation platform`_). If an article is
-   Flattr-able, an icon will be displayed, allowing you to send a
-   microdonation to the author. Accepted values: ``TRUE`` or ``FALSE``.
--  ``SHOW_PRINTLINK`` (default: ``'1'``) : enables the Print button for
-   articles. Accepted values: ``'1'`` to enable or ``'0'`` to disable.
--  ``SHOW_READPERCENT`` (default: ``'1'``) : enables the reading
-   progress on articles (working on the ``default``, ``dark``,
-   ``dmagenta``, ``solarized``, ``solarized-dark`` themes). Accepted
-   values: ``'1'`` to enable or ``'0'`` to disable.
--  ``PAGINATION`` (default: ``'12'``) : defines the number of articles
-   that are displayed on a list. Accepted values: number.
-
-.. _Flattr is a microdonation platform: http://en.wikipedia.org/wiki/Flattr

docs/en/Administrator/install.rst

@@ -1,200 +0,0 @@
-Download and install wallabag
-=============================
-
-I don’t want to install wallabag
---------------------------------
-
-If you can’t or don’t want to install Wallabag on your server, we
-suggest you create a free account on `Framabag`_ which uses our
-software (see :ref:`Framabag account creation`).
-
-I want to install wallabag
---------------------------
-
-I want to download wallabag manually
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-`Download the latest wallabag version`_ and unpack it:
-
-::
-
-    wget http://wllbg.org/latest
-    unzip latest
-    mv wallabag-version-number wallabag
-
-Copy the files on your web server. For Ubuntu/Debian, it is the
-directory /var/www/html/ :
-
-::
-
-    sudo mv wallabag /var/www/html/
-
-Then, jump off to next section.
-
-I want to download wallabag via composer
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-You need to install composer:
-
-::
-
-    curl -s http://getcomposer.org/installer | php
-
-Next, on your web server, run this command:
-
-::
-
-    composer create-project wallabag/wallabag . dev-master
-
-All is downloaded into the current folder.
-
-Prerequisites for your web server
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Wallabag requires that several components to be installed on your web
-server. To make sure your server has all the prerequisites, open in your
-browser the page ``http://monserveur.com/wallabag/install/index.php``.
-
-The components are:
-
--  `PHP 5.3.3 or above`_ **with `PDO`_ support**
--  `XML for PHP`_
--  `PCRE`_
--  `ZLib`_ (otherwise, the processing of compressed pages will be
-   affected)
--  `mbstring`_ anb/or `iconv`_ (otherwise some pages will not be read -
-   even in English)
--  The `DOM/XML`_ extension
--  `Data filtering`_
--  `GD`_ (otherwise, pictures will not be saved)
--  `Tidy for PHP`_ (otherwise, you may encounter problems with some
-   pages)
--  `cURL`_ with ``Parallel URL fetching`` (optionnal)
--  `Parse ini file`_
--  `allow\_url\_fopen`_ (optionnal if cURL is installed)
--  `gettext`_ (required for multi-language support)
-
-Install the missing components before to proceed. For example, to
-install Tidy on Ubuntu/Debian:
-
-::
-
-    sudo apt-get install php5-tidy
-    sudo service apache2 reload
-
-Note : if you’re using IIS as a webserver, you have to disable
-*Anonymous Authentication* and `enable *Basic Authentication*`_ in order
-to be able to login.
-
-Twig installation
-^^^^^^^^^^^^^^^^^
-
-wallabag is build with Twig, a template library. You have to download it
-for wallabag to work. If you cannot install ``composer`` (for example in
-the case of shared hosting), we offer you to download a file which
-includes ``Twig``. This file can be downloaed from the page
-``http://myservur.com/wallabag/install/index.php`` (section TWIG
-INSTALLATION) or directly at http://wllbg.org/vendor. Uncompress it in
-your wallabag directory.
-
-Otherwise, you can use Composer to install ``Twig`` by launching
-``composer`` from your wallabag directory (in the case of Ubuntu/Debian
-too: /var/www/html/wallabag/) by following the commands written on
-screen:
-
-::
-
-    curl -s http://getcomposer.org/installer | php
-    php composer.phar install
-
-Creation of the database.
-^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Wallabag can be installed on different types of databases:
-
--  `SQLite`_. The easiest system of all. No extra configuration needed.
--  `MySQL`_. A well known database system, which is in most cases more
-   efficient than SQLite.
--  `PostgreSQL`_. Some people found it better than MySQL.
-
-We advice you to use MySQL because it is more efficient. In this case,
-you should create a new database (for example ``wallabag``), a new user
-(for example ``wallabag``) and a password (here ``YourPassWord``). To do
-this, you can use ``phpMyAdmin``, or launch the following commands:
-
-::
-
-    mysql -p -u root
-    mysql> CREATE DATABASE wallabag;
-    mysql> GRANT ALL PRIVILEGES ON `wallabag`.* TO 'wallabag'@'localhost' IDENTIFIED BY 'VotreMotdePasse';
-    mysql> exit
-
-*Note:* If you’re using MySQL or Postgresql, you have to **fill all the
-fields**, otherwise the installation will not work and an error message
-will tell you what’s wrong. You must create the database that you will
-use for wallabag manually with a tool like PHPMyAdmin or the console.
-
-Permissions
-~~~~~~~~~~~
-
-Your web server needs a writing access to the ``assets``, ``cache`` and
-``db`` directories. Otherwise, a message will report that the
-installation is impossible:
-
-::
-
-    sudo chown -R www-data:www-data /var/www/html/wallabag
-
-Installation of wallabag. At last.
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Access to wallabag from your web browser:
-``http://votreserveur.com/wallabag``. If your server is correctly
-configured, you directly reach the setup screen.
-
-Select the type of database (``sqlite``, ``mysql`` or ``postgresql``)
-and fill the information about your database. In the case of the databse
-MySQL created before, the standard configuration will be:
-
-::
-
-    Database engine:    MySQL
-    Server:             localhost
-    Database:           wallabag
-    Username:           wallabag
-    Password:           YourPassWord
-
-Finally, Create your first user and his/her password (different from the
-database user).
-
-Wallabag is now installed.
-
-Login
------
-
-From your web browser, you reach the login screen: fill your username
-and your password to connect to your account.
-
-Enjoy!
-
-.. _SQLite: http://php.net/manual/fr/book.sqlite.php
-.. _MySQL: http://php.net/manual/fr/book.mysql.php
-.. _PostgreSQL: http://php.net/manual/fr/book.pgsql.php
-.. _Framabag: https://framabag.org/
-.. _Download the latest wallabag version: http://wllbg.org/latest
-.. _PHP 5.3.3 or above: http://php.net/manual/fr/install.php
-.. _PDO: http://php.net/manual/en/book.pdo.php
-.. _XML for PHP: http://php.net/fr/xml
-.. _PCRE: http://php.net/fr/pcre
-.. _ZLib: http://php.net/en/zlib
-.. _mbstring: http://php.net/en/mbstring
-.. _iconv: http://php.net/en/iconv
-.. _DOM/XML: http://php.net/manual/en/book.dom.php
-.. _Data filtering: http://php.net/manual/fr/book.filter.php
-.. _GD: http://php.net/manual/en/book.image.php
-.. _Tidy for PHP: http://php.net/fr/tidy
-.. _cURL: http://php.net/fr/curl
-.. _Parse ini file: http://uk.php.net/manual/en/function.parse-ini-file.php
-.. _allow\_url\_fopen: http://www.php.net/manual/fr/filesystem.configuration.php#ini.allow-url-fopen
-.. _gettext: http://php.net/manual/fr/book.gettext.php
-.. _enable *Basic Authentication*: https://technet.microsoft.com/en-us/library/cc772009%28v=ws.10%29.aspx

docs/en/Administrator/multiusers.rst

@@ -1,47 +0,0 @@
-.. _`Multi users`:
-
-Multi users
-===========
-
-Create a new account
---------------------
-
-Administrator mode
-------------------
-
-If you want to use wallabag with several persons, you can create new
-accounts from the configuration page.
-
-At the bottom of this page there is a form where you should input a user
-name and a password.
-
-It is now possible to login to this account from the login page of
-wallabag.
-
-No information are shared among the accounts.
-
-Open registration mode
-----------------------
-
-Starting from version 1.9, the administrator can let users register by
-themselves. This is done by changing the following lines in the
-configuration file:
-
-::
-
-    // registration
-    @define ('ALLOW_REGISTER', FALSE);
-    @define ('SEND_CONFIRMATION_EMAIL', FALSE);
-
-Then, a user will be able to enter his/her user name and password to
-create his/her own account. Depending on the configuration, a
-confimation email can be sent to users who gave an email address.
-
-Remove an account
------------------
-
-It is possible to remove your own account from the configuration page.
-You simply have to enter your password and to ask for the removal.
-
-Of course, when there is only one account, it is impossible to remove
-it.

docs/en/Administrator/sessions.rst

@@ -1,26 +0,0 @@
-Session issues
-==============
-
-If you end up disconnected even while checking the *Stay signed in
-checkbox*, please run the following commands as root (or with sudo) :
-
-::
-
-    mkdir /var/lib/wallabag-sessions
-    chown www-data:www-data /var/lib/wallabag-sessions
-
-*NOTE : The www-data user and group may not exist, you may use
-``chown http:http /var/lib/wallabag-sessions`` instead*
-
-Then, using apache add:
-``php_admin_value session.save_path /var/lib/wallabag-sessions`` to your
-apache vhost, for instance ``wallabag-apache.conf`` Finally, restart
-apache, for instance like this : ``/etc/init.d/apache2 restart``
-
-If you’re using nginx, add
-``php_admin_value[session.save_path] = /var/lib/wallabag-sessions`` in
-your nginx configuration file. Then, restart nginx :
-``/etc/init.d/nginx restart``
-
-*NOTE : If you’re using systemd, you should do
-``systemctl restart apache2`` (or nginx).*

docs/en/Administrator/update.rst

@@ -1,30 +0,0 @@
-Update wallabag
-===============
-
-Update an existing wallabag installation
-----------------------------------------
-
-In order to update your installation, download and unzip the archive
-into your installation folder. For example on Ubuntu/Debian:
-
-::
-
-    wget http://wllbg.org/latest
-    unzip latest
-    rsync -ur wallabag-version-number/* /var/www/html/wallabag/ # could be another location such as /srv/html, /usr/share/nginx/html
-
-After that, just access wallabag in your browser and follow the
-instructions to finish the update.
-
-You can verify at the bottom of the configuration page that you’re
-running the last version.
-
-**If it fails**, just delete the ``install`` folder and clear the cache:
-
-::
-
-    cd /var/www/html/wallabag/
-    rm -r cache/* install/
-
-Clearing the cache is also possible in the configuration page, clicking
-on the link ``Delete Cache``.

docs/en/Developer/create_new_theme.rst

@@ -1,4 +0,0 @@
-Create new theme
-================
-
-TODO

docs/en/Developer/git_repo.rst

@@ -1,29 +0,0 @@
-Git repository
-==============
-
-If you wish to contribute to the project by suggesting new features or
-by fixing some bugs, please follow the recommendations below regarding
-the git repository available at https://github.com/wallabag/wallabag.
-
-Current state
--------------
-
-To manage the different versions of wallabag, we use Git.
-
-There are multiple branches for the source code of wallabag web app:
-
--  ``master`` branch : this is the stable branch, downloaded by those
-   who wish to install wallabag for their own use.
--  ``dev`` branch : before being added on ``master`` branch, all bug
-   fixes and new features must go on that branch. This branch is not
-   recommended for production use.
--  ``v2`` branch : this is the branch for a revamp of wallabag.
-   A whole chapter is to be focused on it.
-
-Workflow
---------
-
-All the rules for contributing to the git repository are in the
-`CONTRIBUTING.md file of
-wallabag <https://github.com/wallabag/wallabag/blob/master/CONTRIBUTING.md>`__.
-Please read carefully this file before you make any change.

docs/en/Developer/write_config_files.rst

@@ -1,52 +0,0 @@
-Write config files
-==================
-
-wallabag can use specific site config files to parse website articles.
-These files are stored in the
-```inc/3rdparty/site_config/standard`` <https://github.com/wallabag/wallabag/tree/master/inc/3rdparty/site_config/standard>`__
-folder.
-
-The format used for these files is
-`XPath <http://www.w3.org/TR/xpath20/>`__. Look at some examples in the
-folder.
-
-Automatic config files generation
----------------------------------
-
-Fivefilters has created a `very useful
-tool <http://siteconfig.fivefilters.org/>`__ to create config files. You
-just type in the adress of the article to work on with, and you select
-the area containing the content you want.
-
-.. figure:: https://lut.im/RNaO7gGe/l9vRnO1b
-   :alt: siteconfig
-
-   siteconfig
-| You should confirm this area by trying with other articles.
-| When you got the right area, just click on *Download Full-Text RSS
-site config* to download your file.
-
-Manual config file generation
------------------------------
-
-If Fivefilters tool doesn't work correctly, take a look at the source
-(Ctrl + U on Firefox and Chromium). Search for your content and get the
-``class`` or the ``id`` attribute of the area containing what you want.
-
-Once you've got the id or class, you can write for example one or
-another of these lines:
-
-::
-
-    body: //div[@class='myclass']
-    body: //div[@id='myid']
-
-Then, test you file. If you got the right content but you want to strip
-unnecessary parts, do:
-
-::
-
-    strip: //div[@class='hidden']
-
-You can look at other options for siteconfig files
-`here <http://help.fivefilters.org/customer/portal/articles/223153-site-patterns>`__.

docs/en/User/configure_wallabag.rst

@@ -1,118 +0,0 @@
-.. _`Configure wallabag`:
-
-Configure wallabag
-==================
-
-From the configuration menu, you can change some of wallabag's options.
-
-Some parts won't be detailed here, as they have a dedicated chapter in
-the documentation (:ref:`RSS feeds`, :ref:`Import / Export`, :ref:`ePub conversion` and :ref:`Multi users`).
-
-Saving articles
----------------
-
-You'll find help about the different ways to save articles to your
-wallabag here.
-
-Save article field
-~~~~~~~~~~~~~~~~~~
-
-Enter a link in the field and click “bag it!” to save.
-
-Browser extensions
-~~~~~~~~~~~~~~~~~~
-
-Links to download extensions for your favourite browser, Firefox or
-Chrome.
-
-Mobile apps
-~~~~~~~~~~~
-
-Links to download mobile apps, Android, iOS or Windows Phone.
-
-For Android, you have the choice to download either from Google's Play
-Store of from the Free and Open Source market
-`F-Droid <https://f-droid.org>`__
-
-Bookmarklet
-~~~~~~~~~~~
-
-Lastly, you can use the bookmarklet. A bookmarklet is a simple link you
-can drag to your browser's bookmarks. Once it's in your bookmarks,
-simply clicking on it will save the webpage you're currently viewing to
-your wallabag.
-
-Feeds
------
-
-Plese refer to `RSS feeds <rss_feed.html>`__ for more details.
-
-.. _`Howto change theme`:
-
-Theme
------
-
-As they say, “all tastes and colors are found in nature”. That's why
-wallabag allows you to change its appearance through the use of themes,
-in order to please everyone.
-
-Select the theme of your choice from the drop down list and confirm by
-clicking on **Update**.
-
-Language
---------
-
-Select the language of your choice in the drop down list and confirm by
-clicking on **Update**.
-
-Import
-------
-
-Please refer to `Import/Export <import_export.html>`__ for more details.
-
-Export
-------
-
-Please refer to `Import/Export <import_export.html>`__ for more details.
-
-Clear the cache
----------------
-
-The cache allows wallabag perform certain functions faster.
-
-After updating wallabag, it is advised to clear the cache.
-
-Click on “delete cache” to do so (no confirmation will be asked).
-
-Password
---------
-
-Fill in your new password in the two dedicated fields and confirm by
-clicking on **Update**.
-
-You will be disconnected and will have to enter your new password to
-access your wallabag.
-
-User
-----
-
-Add a user here by entering their name, password and (optionnaly) email
-in the corresponding fields.
-
-You may not be able to add a user if don't have the rights to do so.
-
-Remind newly created users to change their password the first time they
-connect to wallabag!
-
-Delete
-------
-
-Delete your user account on wallabag here.
-
-If there is only one account, you won't be able to delete the account.
-
-Upgrade
--------
-
-Wallabag will check its curent version and if there is a new version
-available and display this information here.

docs/en/User/epub_conversion.rst

@@ -1,32 +0,0 @@
-.. _`ePub conversion`:
-
-ePub conversion
-===============
-
-To enable you to read your articles on a e-reader, wallabag can convert
-them to the ePub format, and hence create an eBook for your long winter
-evenings.
-
-A word of caution
------------------
-
-Be careful, the creation of ePub files can be very resource demanding
-for the server on which wallabag is installed. It depends on the number
-of articles and on their length. Do not create a really big eBook if
-this is not necessary.
-
-Where to convert the articles
------------------------------
-
-You can convert your articles at various places in wallabag:
-
--  on the reading page of an article: the ePub link will convert this
-   article only
--  from the list of articles (unread, favorite or archived articles,
-   articles with a tag): a link at the bottom of the page allows you to
-   convert all the article of this category
--  from a search: the link is at the bottom of the page
--  from the configuration page: you can convert all your articles,
-   whatever the category to which they belong
-
-TODO talk about calibre

docs/en/User/framabag_account_creation.rst

@@ -1,49 +0,0 @@
-.. _`Framabag account creation`:
-
-Framabag account creation
-=========================
-
-If you do not want to install and update wallabag, or if you do not have
-the know-how to install it, it is possible to create an account for free
-at `Framabag.org <https://www.framabag.org>`__.
-
-Account creation
-----------------
-
-Click on the button **Créez votre compte / Create your account**.
-
-You have to input some information: your username, your password and
-your email address. Your address is used only to validate your account,
-except if you check the box to subscribe the newsletter (3 to 4 messages
-per year).
-
-Once this form validated, you will receive an email with the
-confirmation link. Click on it to create your account.
-
-You will receive a last email with the address of your Framabag account,
-which will look like ``https://www.framabag.org/u/Your-username``.
-
-Information storage
--------------------
-
-Framabag use one database per user. We do not and will not use your
-stored data.
-
-You have forgotten your password
---------------------------------
-
-| If you have forgotten your password to get connected to Framabag, a
-form is available `on the main page of the
-service <https://www.framabag.org>`__.
-| Fill it, and a confirmation will be sent to you and will allow you to
-input a new password.
-
-Account deletion
-----------------
-
-If you wish to delete your account, contact us by email:
-hello@wallabag.org using the address your created your account with, and
-state your username.
-
-We will answer you after your account has been deleted: then, no
-information about you will be stored by Framabag.

docs/en/User/import_export.rst

@@ -1,107 +0,0 @@
-.. _`Import / Export`:
-
-Import and export data
-======================
-
-Import
-------
-
-To import data in wallabag, go to the page **Configuration**.
-
-Caution
-~~~~~~~
-
-Data import can be a **demanding process** for your server. Hence, it is
-done in two steps:
-
--  Insertion of the URL in the wallabag database
--  in the second step, the retrieval, for each article, of its full
-   content.
-
-These two steps cannot be done concurrently, because it let us the
-possibility to import thousands of links, but today, wallabag does not
-have sufficient technical capabilities to do this task automatically.
-
-From Pocket
-~~~~~~~~~~~
-
-Export your data from Pocket
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-From your Pocket account, go to the options. TODO
-
-Import your Pocket data
-^^^^^^^^^^^^^^^^^^^^^^^
-
-From the configuration page of wallabag, section **Import**, select the
-file ``ril_export.html`` generated by Pocket, then click on **Import**.
-Wallabag only insert these links in the database. Now, you have to get
-the content of each article.
-
-For this, click on ``Click to finish import``: wallabag will fetch the
-content of 10 articles at a time.
-
-TODO
-
-TODO new ticket: why when a click is done, this does not load in a loop?
-I believe this was doing this ping @mariroz
-
-From Instapaper
-~~~~~~~~~~~~~~~
-
-Export your data from Instapaper
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-TODO
-
-Import your Instapaper data
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-TODO
-
-From Readability
-~~~~~~~~~~~~~~~~
-
-Export your data from Readability
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-TODO
-
-Import your Readability data
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-TODO
-
-From wallabag
-~~~~~~~~~~~~~
-
-Since you can export your data from wallabag (see below), it is of
-course possible to re-import them.
-
-In the import form, select your wallabag-exported file (format JSON).
-Start the import, et voilà.
-
-Unlike the above imports, this process is shorter because all the data
-(title and content of the articles) are already included in the file.
-Hence wallabag does not have to access each URL. However, the import
-file is necessarily bigger.
-
-From a HTML or JSON file
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-TODO
-
-Export
-------
-
-It is possible to export your data from the page **Configuration** of
-wallabag. Several reasons to do this:
-
--  re-install of wallabag
--  leave the Framabag service to install your own wallabag
--  a user with an account on a multi-user wallabag want to have his/her
-   own wallabag installation
--  ...
-
-This will lead you to download a file `at the JSON
-format <http://en.wikipedia.org/wiki/JavaScript_Object_Notation>`__. As detailed above, you can import this file in wallabag.

docs/en/User/issue_with_article.rst

@@ -1,36 +0,0 @@
-.. _`Article is not displayed properly`:
-
-My article is not displayed properly in wallabag
-================================================
-
-If you think wallabag do not copy well the content of an article (empty
-or incomplete text), here are some suggestions.
-
-Ask for help
-------------
-
-Via an email or a ticket, do not forget to give some information that
-are important for us to better solve the problem:
-
--  The URL of the article
--  What wallabag displays
--  What you were expecting
--  The wallabag version of if you use Framabag
-
-Open a ticket on github
-~~~~~~~~~~~~~~~~~~~~~~~
-
-To open a new ticket, you should `go to
-github <https://github.com/wallabag/wallabag/issues/new>`__. An account
-is required. Do not forget to send us the information listed above.
-
-Send us an email
-~~~~~~~~~~~~~~~~
-
-Send us the link in a email to the address
-`hello@wallabag.org <mailto:hello@wallabag.org?subject=Wrong%20display%20in%20wallabag>`__. Do not forget to send us the information listed above.
-
-Solve this display problem
---------------------------
-
-TODO

docs/en/User/organize_articles.rst

@@ -1,109 +0,0 @@
-.. _`Organize articles`:
-
-Organize articles
-=================
-
-To be able to find more easily your articles, several methods are
-available.
-
-Tags
-----
-
-Assign a tag
-~~~~~~~~~~~~
-
-When saving an article
-^^^^^^^^^^^^^^^^^^^^^^
-
-To tag an article when saving it, just click on the tag icon next to the
-URL field before hitting the Save button. At the moment, it is possible
-only to do this from the web interface, but it could come to some apps
-or extensions.
-
-From the article
-^^^^^^^^^^^^^^^^
-
-To tag an already-saved article, go to the reading page of the article.
-There is a part ``tags`` followed with a pencil. Click on the pencil.
-
-Input in the box the tags you want to assign. Add as many tags as you
-want. They need to be separated by commas and not spaces.
-Auto-completion is available here: when you type the first letters of an
-existing tag, it is not necessary to type the whole word. Select it in
-the drop-down list. Once all your tags are inputted, click on the button
-**Tag**.
-
-Then, you can go back to your article and read it.
-
-From the search
-^^^^^^^^^^^^^^^
-
-A full chapter on search is available. Here, we will describe only how
-to assign a tag from your search.
-
-When your search displays results, there is a link
-``Apply the tag ABCD to this search`` at the bottom of the page. Click
-on it: a tad depending on your search (here ``ABCD``) will be assigned
-to all the articles found.
-
-Find all the articles with a given tag
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-In the wallabag menu, click on **Tags**. Then, all the tags you have
-created are displayed, sorted by the number of articles for each tag.
-Click on one of these tags to find all the articles with this tag.
-
-Preferred articles
-------------------
-
-When you wish to set aside an article, you can mark it as preferred.
-
-Set an article as favorite
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-From the reading page of an article, or from a list of articles (such as
-the list of unread articles), you can set an article as favorite simply
-by a click on the star which is displayed. Click again on the star will
-remove the **favorite** status of this article.
-
-Find all the favorite articles
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-In the wallabag menu, click on **Favorites** to display the list of all
-the articles that you have set as favorite.
-
-Archived articles
------------------
-
-When you have read an article, you can archive it: hence it will not be
-displayed in your list of unread articles.
-
-Archiving an article does not remove it from wallabag.
-
-Archive an article
-~~~~~~~~~~~~~~~~~~
-
-| From the reading page of an article, or from a list of articles (such
-as the list of unread articles), you can archive an article simply by
-clicking on the icon ✓.
-| Click again on this icon will set back the **unread** status of the
-article.
-
-Find all the archived articles
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-In the wallabag menu, click on **Archive** to find all the articles that
-you have archived.
-
-Delete an article
------------------
-
-Be cautious: the deletion of an article is **definitive**. It is deleted
-from the wallabag database.
-
-To delete an article, a trash icon is displayed on the page of an
-article or of a list of articles (unread articles, favorites or
-archived, for example).
-
-We trust you: that is why there is no confirmation message during the
-deletion.

docs/en/User/read_an_article.rst

@@ -1,63 +0,0 @@
-Read an article
-===============
-
-Reading an article is not difficult in wallabag: you only have to click on the title of the article for it to be displayed.
-
-Back to where you left the article
-----------------------------------
-
-If you stop reading an article halfway through, the next time wallabag will open it right where you left off.
-
-This feature only works with web applications and not with smartphone applications.
-
-Possible actions in an article
-------------------------------
-
-The following actions can be performed through the icons displayed at the top of the page. We assume here that you are using the Baggy theme (see the section on :ref:`Howto change theme`). Icons in other themes are very similar.
-
-Here are the actions, in the order of appearance of the icons.
-
-Read the original article
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Open the article on its original location.
-
-Mark the article as read
-~~~~~~~~~~~~~~~~~~~~~~~~
-
-Archive the article, which will be placed into the **Archive** category of the wallabag menu. Clicking again on this button will move the article back to the **unread** category.
-
-Mark the article as favorite
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Mark the article as favorite, and it will be placed into the **Favorites** category of the wallabag menu. Clicking again on this button will remove the favorite status.
-
-Delete the article
-~~~~~~~~~~~~~~~~~~
-
-Delete the article from wallabag permanently. It cannot be restored. Be careful: no confirmation message is displayed.
-
-Share through twitter
-~~~~~~~~~~~~~~~~~~~~~
-
-Share the title and the original link of the article on twitter.
-
-Share via email
-~~~~~~~~~~~~~~~
-
-Share the title and the original link of the article via e-mail.
-
-Print the article
-~~~~~~~~~~~~~~~~~
-
-Open the print window of the browser.
-
-Convert into ePub
-~~~~~~~~~~~~~~~~~
-
-Convert the article into ePub format: see the section on :ref:`ePub conversion`.
-
-Notify us that the article appears wrong
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Notify the wallabag developers that an article is not displayed as expected (see the section on :ref:`Article is not displayed properly`).

docs/en/User/rss_feed.rst

@@ -1,41 +0,0 @@
-.. _`RSS feeds`:
-
-RSS feeds
-=========
-
-The RSS feeds allow you to:
-
--  read your articles from your favorite RSS feed reader.
--  to activate the reading features for smartphone softwares
-
-| First, you must activate the RSS feature by generating a feed token.
-| Go to **config** in wallabag and generate a token in the section
-**Feeds**. You can generate a new token at any time.
-
-Read articles
--------------
-
-Once the token created, you have access to three RSS feeds:
-
--  the one of the unread articles
--  the one of the favorites articles
--  the one of the archived articles
-
-Add the feed you want to your RSS feed reader. Be careful: when you will
-be reading an article from your feed reader, this will not set it as
-read in wallabag.
-
-Share your readings
-~~~~~~~~~~~~~~~~~~~
-
-If you wish to share your readings with somebody, send him for example
-the RSS feed of your favorite articles. Hence, as soon as an article
-will be set as favorite in wallabag, this person will be able to read it
-too.
-
-Activate the features for smartphones
--------------------------------------
-
-You ave created an RSS feed token. It will also be useful to you to
-configure your smartphone software. For more information about
-smartphone sofwares, you can read :ref:`Save your first article`.

docs/en/User/save_your_first_article.rst

@@ -1,226 +0,0 @@
-.. _`Save your first article`:
-
-Save your first article
-=======================
-
-Once connected on wallabag, you have many ways to save an article.
-
-From the web application
-------------------------
-
-Let’s see first how to do from the web application. In the menu, you
-have a link **save a link**. Clicking on it, a form shows up: you simply
-have to type the web adress of the article you want to save.
-
-Confirm to store the content of the article.
-
-By default, only the text is saved. If you want to store a copy of the
-images on your server, you have to enable the setting
-*DOWNLOAD\_PICTURES*. Read the chapter on hidden options for more
-information.
-
-From the bookmarklet
---------------------
-
-From `Wikipedia’s definition`_
-
-    A bookmarklet is a `bookmark`_ stored in a `web browser`_ that
-    contains `JavaScript`_\ commands to extend the browser’s
-    functionality.
-
-    Bookmarklets are unobtrusive scripts stored as the URL of a bookmark
-    in a web browser or as a hyperlink on a web page.
-
-    When clicked, a bookmarklet performs some function, one of a wide
-    variety such as a search query or data extraction. Bookmarklets are
-    usually `JavaScript programs`_.
-
-From the wallabag’s menu, click on **settings**. On the first part of
-this page, we have listed all the ways to save an article. You’ll find
-the bookmarklet (it’s the ``Bag it!`` link) to drag and drop in the
-bookmarks bar of your web browser. From now on, when you want to save
-the article you are browsing, you just have to click on this bookmarklet
-and the article will be automatically saved.
-
-From your smartphone
---------------------
-
-Above all else
-~~~~~~~~~~~~~~
-
-To use a smartphone application, you have to enable RSS feeds from the
-settings panel of wallabag. Then some information will be displayed,
-like your security token. Read the chapter on RSS feeds for more
-information.
-
-Android
-~~~~~~~
-
-Installation and configuration
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-You can download the android application from the `Google Play Store`_
-and from `F-droid`_. It’s the exact same application on those two
-stores.
-
-Once installed, start the application, go to the **settings** part et
-fill in the **URL (complete address of your wallabag installation or
-your Framabag account)** and **User ID (in most cases, you’ll have to
-put 1)** fields. If you have created multiple accounts from wallabag,
-you will have to to fill the user account you want to connect to your
-application and your security **Token** (enter properly all the token’s
-letters as seen in the settings part of wallabag).
-
-Saving of an article
-^^^^^^^^^^^^^^^^^^^^
-
-Now that everything is correctly set up, as soon as you browse on your
-smartphone’s web browser, you can share an article in wallabag at any
-time from the **Share** menu: you’ll find a **Bag it!** entry which will
-add your article in wallabag.
-
-Reading
-^^^^^^^
-
-When you open the application, click on Synchronize: your recently saved
-articles will be downloaded on your smartphone.
-
-You don’t need an internet connection anymore: click on **List
-articles** to start your reading.
-
-At the end of each article, a **Mark as read** button allows you to
-archive the article.
-
-To date, the synchronisation occurs in one direction (from wallabag to
-the application), thus preventing mark as read an article on wallabag
-from your smartphone.
-
-iOS
-~~~
-
-Installation and configuration
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-You can download the iOS application from the `AppStore`_.
-
-Once installed, configure the app by filling following fields inside the
-settings: the **URL (complete address of your wallabag installation or
-your Framabag account)** and **User ID (in most cases, you’ll have to
-put 1)** field. If you have created multiple accounts from wallabag, you
-will have to to fill the user account you want to connect to your
-application and your security **Token** (enter properly all the token’s
-letters as seen in the settings part of wallabag).
-
-Usage
-^^^^^
-
-If the app is configured correctly, the app will automatically download
-the articles from your wallabag (use **pull-to-refresh** to trigger this
-update manually). Once an article is downloaded, it’ll be available
-offline from your app.
-
-Unfortunately you can only locally mark an article as read (it will not
-synchronise to your online wallabag).
-
-Saving articles
-~~~~~~~~~~~~~~~
-
-If you’re browsing a website and want to add the current article to your
-wallabag, simply tap the **Share**-button and select **Bag it!** (if you
-don’t find the wallabag icon, have a look in the **more**-menu). If
-everything is set up correctly, your article will be saved (you may have
-to login from time to time).
-
-Windows Phone
-~~~~~~~~~~~~~
-
-Installation and configuration
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-You can download the Windows Phone application from the `Windows Store`_
-or directly from your smartphone’s Store.
-
-Once installed, the application will show you a notification on the
-first launch, asking the configuration of your wallabag server. Go to
-the **Settings** part of the application by pressing the three dots menu
-at the bottom of the screen, then fill in the **URL (complete address of
-your wallabag installation or your Framabag account)** and **User ID (in
-most cases, you’ll have to put 1)** fields.
-
-If you have created multiple accounts from wallabag, you will have to to
-fill the user account you want to connect to your application and your
-security **Token** (enter properly all the token’s letters as seen in
-the setting part of wallabag).
-
-From your web browser
----------------------
-
-Firefox Classic Add-on
-~~~~~~~~~~~~~~~~~~~~~~
-
-Download the Firefox add-on at `addons.mozilla.org`_ and install it like
-any other Firefox add-on.
-
-In the add-on’s settings, fill the complete URL of your installation of
-wallabag or your Framabag account.
-
-Personalize the Firefox toolbar to add wallabag (**W** icon). When you
-find an article you want to save, click on this icon: a new window will
-open to add the article and will close itself automatically.
-
-Firefox Social API Service
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-*Available from wallabag v1.9.1 only*
-
-You will need an https connection to use this. It’s a Firefox
-`requirement`_, sorry.
-
-With Firefox 29+ versions, your browser comes with an integrated
-interface to share things to multiple social services directly from your
-browser. In the Firefox interface, it is shown a paper plane-like icon
-that you will use to share a page, which means here, save an article.
-You can add the service by going into the Config page of wallabag, then
-click on Mozilla Services Social API Extension. You must also accept to
-use Firefox Services.
-
-Chrome
-~~~~~~
-
-Download the Chrome add-on `on the dedicated website`_ and install it
-like any other Chrome add-on.
-
-In the add-on’s settings, fill the complete URL of your installation of
-wallabag or your Framabag account.
-
-During the addon’s installation, a new icon appear in Chrome toolbar (a
-**W** icon). When you find an article you want to save, click on this
-icon: a popup will appear to confirm that your article has been saved.
-
-Opera
-~~~~~
-
-The recent versions of Opera (15+) allow to install add-ons compatible
-with Chrome.
-
-First, install the add-on named `Download Chrome Extensions`_ which will
-allow you to install add-ons from the Chrome Web Store. Then, go `to to
-Google site`_ and get the Chrome add-on by clicking on *Add to Opera*. A
-message will invite you to confirm this action because this add-on is
-not coming from a certified source. The behavior will be the same as for
-Chrome (see above).
-
-.. _Wikipedia’s definition: http://fr.wikipedia.org/wiki/Bookmarklet
-.. _bookmark: http://en.wikipedia.org/wiki/Internet_bookmark
-.. _web browser: http://en.wikipedia.org/wiki/Web_browser
-.. _JavaScript: http://en.wikipedia.org/wiki/JavaScript
-.. _JavaScript programs: http://en.wikipedia.org/wiki/Computer_program
-.. _Google Play Store: https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche
-.. _F-droid: https://f-droid.org/app/fr.gaulupeau.apps.InThePoche
-.. _AppStore: https://itunes.apple.com/app/id828331015
-.. _Windows Store: https://www.microsoft.com/en-us/store/apps/wallabag/9nblggh11646
-.. _addons.mozilla.org: https://addons.mozilla.org/firefox/addon/wallabag/
-.. _requirement: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/Social_API/Manifest#Manifest_Contents
-.. _on the dedicated website: https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj
-.. _Download Chrome Extensions: https://addons.opera.com/en/extensions/details/download-chrome-extension-9/
-.. _to to Google site: https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj

docs/en/User/search.rst

@@ -1,21 +0,0 @@
-Search content in wallabag
-==========================
-
-To enable you to find an article quickly, we set up a full search
-engine.
-
-Click on **Search** in the wallabag menu. Then, enter your search terms.
-
-Wallabag will go through all your articles, and lists the ones
-containing the search terms in their title, their content or their URL.
-
-Convert this search into ePub format
-------------------------------------
-
-You can convert the listed articles to the ePub format, so that you can
-read them in your e-reader, for example. Look at :ref:`ePub conversion` for more about this.
-
-Assign a tag to your search results
------------------------------------
-
-You can create a tag based on your search criteria. Loot at :ref:`Organize articles` for more about this.

docs/en/conf.py

@@ -11,7 +11,7 @@ templates_path = ['_templates']
 source_suffix = '.rst'
 master_doc = 'index'
 project = u'wallabag'
-copyright = u'2013-2015, Nicolas Lœuillet - MIT Licence'
+copyright = u'2013-2016, Nicolas Lœuillet - MIT Licence'
 version = '2.0.0'
 release = version
 exclude_patterns = ['_build']
@@ -35,7 +35,7 @@ man_pages = [
 
 texinfo_documents = [
   ('index', 'wallabag', u'wallabag Documentation',
-   u'Nicolas Lœuillet', 'wallabag', 'One line description of project.',
+   u'Nicolas Lœuillet', 'wallabag', 'wallabag is an opensource read-it-later.',
    'Miscellaneous'),
 ]
 
@@ -53,35 +53,3 @@ html_sidebars = {
 
 # Register the theme as an extension to generate a sitemap.xml
 extensions.append("guzzle_sphinx_theme")
-
-# Guzzle theme options (see theme.conf for more information)
-html_theme_options = {
-
-    # Set the path to a special layout to include for the homepage
-    # "index_template": "homepage.html",
-
-    # Allow a separate homepage from the master_doc
-    # homepage = index
-
-    # Set the name of the project to appear in the nav menu
-    # "project_nav_name": "Guzzle",
-
-    # Set your Disqus short name to enable comments
-    # "disqus_comments_shortname": "my_disqus_comments_short_name",
-
-    # Set you GA account ID to enable tracking
-    # "google_analytics_account": "my_ga_account",
-
-    # Path to a touch icon
-    # "touch_icon": "",
-
-    # Specify a base_url used to generate sitemap.xml links. If not
-    # specified, then no sitemap will be built.
-    #"base_url": "http://guzzlephp.org"
-
-    # Allow the "Table of Contents" page to be defined separately from "master_doc"
-    # tocpage = Contents
-
-    # Allow the project link to be overriden to a custom URL.
-    # projectlink = http://myproject.url
-}

docs/en/developer/docker.rst

@@ -0,0 +1,51 @@
+Run wallabag in docker-compose
+==============================
+
+In order to run your own development instance of wallabag, you may
+want to use the pre-configured docker compose files.
+
+Requirements
+------------
+
+Make sure to have `Docker
+<https://docs.docker.com/installation/ubuntulinux/>`__ and `Docker
+Compose <https://docs.docker.com/compose/install/>`__ availables on
+your system and up to date.
+
+Switch DBMS
+-----------
+
+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:
+
+- the container definition (``postgres`` or ``mariadb`` root level
+  block)
+- the container link in the ``php`` container
+- 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:
+
+- 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
+------------
+
+#. Fork and clone the project
+#. Edit ``app/config/parameters.yml`` to replace ``database_*``
+   properties with commented ones (with values prefixed by ``env.``)
+#. ``composer install`` the project dependencies
+#. ``php app/console wallabag:install`` to create the schema
+#. ``docker-compose up`` to run the containers
+#. Finally, browse to http://localhost:8080/ to find your freshly
+   installed wallabag.
+
+At various step, you'll probably run into UNIX permission problems,
+bad paths in generated cache, etc…
+Operations like removing cache files or changing files owners might
+be frequently required, so don't be afraid !

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/v2/src/Wallabag/CoreBundle/Resources/translations.
+
+You have to create ``messages.CODE.yml`` and ``validators.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/v2/app/Resources/CraueConfigBundle/translations.
+- https://github.com/wallabag/wallabag/tree/v2/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/v2/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/v2/docs
+
+You need to respect the ``en`` folder structure when you create your own translation.

docs/en/index.rst

@@ -8,51 +8,39 @@ 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.
 
-The main documentation for the site is organized into a couple sections:
+.. 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`
-* :ref:`admin-docs`
 * :ref:`dev-docs`
 
 .. _user-docs:
 
 .. toctree::
    :maxdepth: 2
-   :caption: User Documentation
+   :caption: User documentation
 
+   user/installation
    user/create_account
    user/login
    user/configuration
    user/first_article
+   user/errors_during_fetching
+   user/annotations
    user/import
-
-user/organize
-user/filters
-User/read_an_article
-User/search
-User/epub_conversion
-User/issue_with_article
-User/rss_feed
-User/import_export
-
-.. _admin-docs:
-
-.. toctree::
-   :maxdepth: 2
-   :caption: Admin Documentation
-
-   Administrator/install
-   Administrator/update
-   Administrator/hidden_options
-   Administrator/multiusers
-   Administrator/sessions
+   user/download_articles
+   user/filters
+   user/tags
 
 .. _dev-docs:
 
 .. toctree::
    :maxdepth: 2
-   :caption: Developer Documentation
+   :caption: Developer documentation
 
-   Developer/write_config_files
-   Developer/create_new_theme
-   Developer/git_repo
+   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 four tabs: ``Settings``, ``RSS``, ``User information`` and ``Password``.
+Click on ``Config`` menu. You have five tabs: ``Settings``, ``RSS``,
+``User information``, ``Password`` and ``Tagging rules``.
 
 Settings
 --------
@@ -11,7 +12,9 @@ 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
 ~~~~~~~~~~~~~~
@@ -21,7 +24,8 @@ You can change the number of articles displayed on each page.
 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,19 +47,65 @@ 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.
+
+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.
+
+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.
+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 »*.
+
+Which variables and operators can I use to write rules?
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+The following variables and operators can be used to create tagging rules:
+
+===========  ==============================================  ========  ==========
+Variable     Meaning                                         Operator  Meaning
+-----------  ----------------------------------------------  --------  ----------
+title        Title of the entry                              <=        Less than…
+url          URL of the entry                                <         Strictly less than…
+isArchived   Whether the entry is archived or not            =>        Greater than…
+isStared     Whether the entry is starred or not             >         Strictly greater than…
+content      The entry's content                             =         Equal to…
+language     The entry's language                            !=        Not equal to…
+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

@@ -0,0 +1,17 @@
+Download articles
+=================
+
+You can download each article in several formats: ePUB, MOBI, PDF, XML, JSON, CSV.
+
+On the article view, click on this icon, in the sidebar:
+
+.. image:: ../../img/user/download_article.png
+   :alt: download article
+   :align: center
+
+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

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

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

docs/en/user/first_article.rst

@@ -3,23 +3,31 @@ Save your first article
 
 The main purpose of wallabag is to save web articles. You have many ways to do it.
 
+.. note::
+
+    A quickstart will be displayed in the application until you save your first article.
+
 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
 -------------------------
@@ -27,53 +35,32 @@ By using a browser add-on
 Firefox
 ~~~~~~~
 
-Firefox Classic Add-on
-^^^^^^^^^^^^^^^^^^^^^^
-
-Download the Firefox add-on at `addons.mozilla.org`_ and install it like
-any other Firefox add-on.
-
-In the add-on’s settings, fill the complete URL of your installation of
-wallabag or your Framabag account.
-
-Personalize the Firefox toolbar to add wallabag (**W** icon). When you
-find an article you want to save, click on this icon: a new window will
-open to add the article and will close itself automatically.
-
-Firefox Social API Service
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-*Available from wallabag v1.9.1 only*
-
-You will need an https connection to use this. It’s a Firefox
-`requirement`_, sorry.
-
-With Firefox 29+ versions, your browser comes with an integrated
-interface to share things to multiple social services directly from your
-browser. In the Firefox interface, it is shown a paper plane-like icon
-that you will use to share a page, which means here, save an article.
-You can add the service by going into the Config page of wallabag, then
-click on Mozilla Services Social API Extension. You must also accept to
-use Firefox Services.
+*This addon is not yet available for wallabag v2*.
 
 Chrome
 ~~~~~~
 
+*This addon is not yet available for wallabag v2*.
+
 By using your smarphone application
 -----------------------------------
 
 Android
 ~~~~~~~
 
+*This application is not yet available for wallabag v2*.
+
 Firefox OS
 ~~~~~~~~~~
 
+*This application is not yet available for wallabag v2*.
+
 Windows Phone
 ~~~~~~~~~~~~~
 
+*This application is not yet available for wallabag v2*.
+
 iOS
 ~~~
 
-
-.. _addons.mozilla.org: https://addons.mozilla.org/firefox/addon/wallabag/
-.. _requirement: https://developer.mozilla.org/en-US/docs/Mozilla/Projects/Social_API/Manifest#Manifest_Contents
+*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,25 +15,69 @@ 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 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.
+
+* 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
+
+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``.
+
+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
 ---------------
 
+*Feature not yet implemented in wallabag v2.*
+
 From Readability
 ----------------
 
+*Feature not yet implemented in wallabag v2.*
+
 From HTML or JSON file
 ----------------------
+
+*Feature not yet implemented in wallabag v2.*

docs/en/user/installation.rst

@@ -0,0 +1,145 @@
+Install wallabag
+================
+
+Requirements
+------------
+
+wallabag is compatible with php >= 5.5
+
+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
+- pĥp-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:
+
+- php-pdo_mysql
+- php-pdo_sqlite
+- php-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:
+
+::
+
+    SYMFONY_ENV=prod composer create-project wallabag/wallabag wallabag "2.0.0-beta.1" --no-dev
+    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
+
+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.

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/tags.rst

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

docs/fr/Administrateur/MAJ_wallabag.md

@@ -1,22 +0,0 @@
----
-language: Français
-currentMenu: upgrade
-subTitle: Mettre à jour wallabag
----
-
-# Mettre à jour wallabag
-
- Pour mettre à jour votre installation, téléchargez et décompressez l’archive dans votre installation (ici `/var/www/html/wallabag/`) :
-
-    wget http://wllbg.org/latest
-    unzip latest
-    rsync -ur wallabag-version-number/* /var/www/html/wallabag/
-
-Supprimez le répertoire `install` et videz le cache :
-
-    cd /var/www/html/wallabag/
-    rm -r cache/* install/
-
-Pour vider le cache, il est également possible d'aller dans la page de configuration et de cliquer sur le lien pour supprimer le cache.
-
-Vérifiez dans le bas de la page de configuration que la dernière version est bien installée.

docs/fr/Administrateur/Multi-utilisateurs.md

@@ -1,35 +0,0 @@
----
-language: Français
-currentMenu: multiusers
-subTitle: wallabag multi-utilisateurs
----
-
-# wallabag multi-utilisateurs
-
-## Créer un nouveau compte
-
-### Mode administrateur
-
-Si vous souhaitez utiliser wallabag pour plusieurs personnes, il est possible de créer de nouveaux comptes depuis la page de configuration.
-
-En bas de cette page se trouve un formulaire où vous devez saisir un nom d'utilisateur et un mot de passe.
-
-Il est maintenant possible de se connecter avec ce compte depuis la page d'identification de wallabag.
-
-Aucune information n'est partagée entre les différents comptes.
-
-### Mode libre
-
-A partir de la version 1.9, l'administrateur peut laisser libre la création de nouveaux comptes. Il doit pour cela l'autoriser en modifiant les lignes suivantes dans le fichier de configuration :
-
-    // registration
-    @define ('ALLOW_REGISTER', FALSE);
-    @define ('SEND_CONFIRMATION_EMAIL', FALSE);
-
-Ensuite, l'utilisateur rentrera lui-même son nom d'utilisateur et son mot de passe pour se créer un compte. Selon la configuration, un courriel de confirmation peut être envoyé aux utilisateurs ayant fourni une adresse électronique.
-
-## Supprimer un compte
-
-Il est possible de supprimer son propre compte, depuis la page de configuration. Il suffit de saisir son mot de passe et de demander la suppression.
-
-Bien évidemment, lorsqu'il ne reste plus qu'un seul compte, il est impossible de le supprimer.

docs/fr/Administrateur/Options_cachees.md

@@ -1,40 +0,0 @@
----
-language: Français
-currentMenu: hidden
-subTitle: Options cachées
----
-
-# Options cachées
-
-## Mise en garde
-
-**Attention**, cette partie concerne les utilisateurs avancés. Nous allons modifier un fichier important de wallabag, `inc/poche/config.inc.php`, il est donc conseillé de faire une sauvegarde de celui-ci avant toute modification.  
-**Toute erreur lors d'une modification d'un fichier de wallabag pourra entrainer des dysfonctionnements**.
-
-Ce fichier est créé lorsque vous installez wallabag.  
-Installez donc d'abord wallabag, faites une copie du fichier et ouvrez-le avec ~~Sublime Text~~ votre éditeur de texte préféré.
-
-Dans ce fichier sont définis des paramètres qui ne sont, aujourd'hui, pas encore disponibles dans la page **Configuration** de wallabag.
-
-## Modification des options avancées
-
-Chaque paramètre est défini de cette façon :
-
-    @define ('NOM_DU_PARAMETRE', 'Valeur du paramètre');
-
-Pour chaque ligne, vous ne pouvez modifier que la partie `Valeur du paramètre`.
-
-Listons maintenant les différents paramètres que vous pouvez changer :
-
-* `HTTP_PORT` (par défaut, `80`) : correspond au port HTTP de votre serveur web. À changer si votre serveur web est derrière un proxy. Valeur attendue : un nombre.
-* `SSL_PORT` (par défaut, `443`) : correspond au port SSL de votre serveur web. À changer si votre serveur web utilises SSLH. Valeur attendue : un nombre.
-* `DEBUG_POCHE` (par défaut, `FALSE`) : si vous rencontrez des problèmes avec wallabag, nous vous demanderons peut-être d'activer le mode Debug. Valeurs attendues : `TRUE` ou `FALSE`.
-* `DOWNLOAD_PICTURES` (par défaut, `FALSE`) : permet de télécharger sur votre serveur les images des articles. Ce paramètre est désactivé par défaut pour ne pas surcharger votre serveur web. Nous préférons vous laisser activer vous-même ce paramètre. Valeurs attendues : `TRUE` ou `FALSE`.
-* `SHARE_TWITTER` (par défaut, `TRUE`) : permet d'activer le partage vers twitter. Valeurs attendues : `TRUE` ou `FALSE`.
-* `SHARE_MAIL` (par défaut, `TRUE`) : permet d'activer le partage par email. Valeurs attendues : `TRUE` ou `FALSE`.
-* `SHARE_SHAARLI` (par défaut, `FALSE`) : permet d'activer le partage vers votre installation de Shaarli (gestionnaire de favoris). Valeurs attendues : `TRUE` ou `FALSE`.
-* `SHAARLI_URL` (par défaut, `'http://myshaarliurl.com'`) : définit l'URL de votre installation de Shaarli. Valeur attendue : une URL.
-* `FLATTR` (par défaut, `TRUE`) : permet d'activer la possibilité de flattrer un article ([Flattr est une plateforme de micro-dons](http://fr.wikipedia.org/wiki/Flattr)). Si un article est flattrable, une icône s'affichera et vous permet d'envoyer un micro-don à l'auteur de l'article. Valeurs attendues : `TRUE` ou `FALSE`.
-* `SHOW_PRINTLINK` (par défaut, `'1'`) : permet d'afficher le lien pour imprimer un article. Valeurs attendues : `'0'` pour désactiver ou `'1'` pour activer.
-* `SHOW_READPERCENT` (par défaut, `'1'`) : permet d'afficher (sur les thèmes `default`, `dark`, `dmagenta`, `solarized`, `solarized-dark`) le pourcentage de lecture de l'article. Valeurs attendues : `'0'` pour désactiver ou `'1'` pour activer.
-* `PAGINATION` (par défaut, `'12'`) : définit le nombre d'articles affichés sur une liste. Valeur attendue : un nombre.

docs/fr/Administrateur/Telechargement_et_installation.md

@@ -1,121 +0,0 @@
----
-language: Français
-currentMenu: install
-subTitle: Télécharger et installer wallabag
----
-
-# Télécharger et installer wallabag
-
-## Je ne souhaite pas installer wallabag
-
-Puisque vous ne voulez pas ou ne pouvez pas installer wallabag, nous vous proposons de créer un compte gratuit sur [Framabag](https://framabag.org/), lequel utilise notre logiciel. [Lisez la documentation complète](../Utilisateur/Framabag.md).
-
-## Je souhaite installer wallabag
-
-### Je souhaite télécharger wallabag manuellement
-
-[Télécharger la dernière version de wallabag](http://wllbg.org/latest) et décompresser-là :
-
-    wget http://wllbg.org/latest
-    unzip latest
-    mv wallabag-version-number wallabag
-
-Copiez les fichiers sur votre serveur web. Dans le cas d'Ubuntu/Debian, il s'agit de /var/www/html/ :
-
-    sudo mv wallabag /var/www/html/
-
-Puis sautez le paragraphe suivant.
-
-### Je souhaite télécharger wallabag via composer
-
-Vous devez installer composer : 
-
-    curl -s http://getcomposer.org/installer | php
-
-Ensuite, sur votre serveur web, exécutez cette commande : 
-
-    composer create-project wallabag/wallabag . dev-master
-
-Tout est téléchargé dans le répertoire courant.
-
-#### Pré-requis pour votre serveur web
-
-Wallabag nécessite qu'un certain nombre de composants soient installées sur votre serveur web.
-Pour être sûr que votre serveur possède tous les pré-requis, ouvrez dans votre navigateur la page `http://monserveur.com/wallabag/install/index.php`.
-
-Les composants sont :   
- 
-* [PHP 5.3.3 ou plus](http://php.net/manual/fr/install.php) **avec support [PDO](http://php.net/manual/en/book.pdo.php)**
-* [XML pour PHP](http://php.net/fr/xml)
-* [PCRE](http://php.net/fr/pcre)
-* [ZLib](http://php.net/en/zlib) (son absence affectera le traitement des pages compressées)
-* [mbstring](http://php.net/en/mbstring) et/ou [iconv](http://php.net/en/iconv) (sinon, certaines pages ne pourront pas être lues - même en anglais)
-* L'extension [DOM/XML](http://php.net/manual/en/book.dom.php)
-* [Filtrage des données](http://php.net/manual/fr/book.filter.php)
-* [GD](http://php.net/manual/en/book.image.php) (son absence empèchera la sauvegarde des images)
-* [Tidy pour PHP](http://php.net/fr/tidy) (son absence peut poser problème avec certaines pages)
-* [cURL](http://php.net/fr/curl) avec `Parallel URL fetching` (optionel)
-* [Parse ini file](http://uk.php.net/manual/en/function.parse-ini-file.php) 
-* [allow_url_fopen](http://www.php.net/manual/fr/filesystem.configuration.php#ini.allow-url-fopen) (optionel si cURL présent)
-* [gettext](http://php.net/manual/fr/book.gettext.php) (nécessaire pour le support multilingues)
-
-Installez les composants manquants avant de poursuivre. Par exemple pour installer Tidy sur Ubuntu/Debian :
-
-    sudo apt-get install php5-tidy
-    sudo service apache2 reload
-    
-Note : si voux utilisez IIS comme serveur web, vous devez interdire l'*Authentification Anonyme* et [permettre L'*Authentification de base*](https://technet.microsoft.com/fr-fr/library/cc772009%28v=ws.10%29.aspx) pour autoriser la connexion.
-
-#### Twig installation
-
-Pour pouvoir fonctionner, wallabag a besoin de `Twig`, une bibliothèque de modèles.
-Si vous ne pouvez pas installer `composer` (dans le cas d'hébergement mutualisé par exemple), nous vous proposons un fichier
-incluant `Twig`. Ce fichier peut être télécharger depuis la page `http://monserveur.com/wallabag/install/index.php` (section INSTALLATION TWIG) ou directement ici [http://wllbg.org/vendor](http://wllbg.org/vendor). Décompressez-le dans votre répertoire wallabag.
-
-Alternativement, vous pouvez installer `Twig` en lançant `composer` depuis votre dossier wallabag (toujours dans le cas d'Ubuntu/Debian : <code>/var/www/html/wallabag/</code>) en exécutant les commandes :
-
-    curl -s http://getcomposer.org/installer | php
-    php composer.phar install
-
-### Création de la base de données
-
-Wallabag peut s'installer sur différents types de bases de données :
-
-* [SQLite](http://php.net/manual/fr/book.sqlite.php). Le plus simple de tous. Rien de particulier à configurer.
-* [MySQL](http://php.net/manual/fr/book.mysql.php). Un système de base de données bien connu, qui est dans la plupart des cas plus efficace que SQLite.
-* [PostgreSQL](http://php.net/manual/fr/book.pgsql.php). Certaines personnes l'ont trouvé mieux que MySQL.
-
-Nous vous conseillons d'utiliser MySQL, plus performante. Il est alors nécessaire de créer une nouvelle base (par exemple `wallabag`), un nouvel utilisateur (par exemple  `wallabag`) et un mot de passe (ici `VotreMotdePasse`). Vous pouvez pour cela utiliser `phpMyAdmin`, ou exécuter les commandes suivantes :
-
-    mysql -p -u root
-    mysql> CREATE DATABASE wallabag;
-    mysql> GRANT ALL PRIVILEGES ON `wallabag`.* TO 'wallabag'@'localhost' IDENTIFIED BY 'VotreMotdePasse';
-    mysql> exit
-    
-*Note :* Si vous utilisez MySQL ou Postgresql, vous devrez **remplir tous les champs**, sinon l'installation ne fonctionera pas et un message d'erreur vous dira ce qui ne va pas. Vous devez créer manuellement la base de données qui sera utilisée par wallabag avec un outil comme PHPMyAdmin ou en ligne de commande.
-
-### Permissions
-
-Le serveur web doit avoir accès en écriture aux répertoires `assets`, `cache` et `db`. Sans cela, un message vous indiquera que l'installation est impossible :
-
-    sudo chown -R www-data:www-data /var/www/html/wallabag
-
-### Installation de wallabag. Enfin.
-
-Accédez à wallabag depuis votre navigateur : `http://votreserveur.com/wallabag`. Si votre serveur est bien configuré, vous arrivez sur l'écran d'installation.
-
-Renseignez le type de votre base de données (`sqlite`, `mysql` ou `postgresql`) et les informations de votre base de données. Dans le cas de la base MySQL créée plus haut, la configuration standard sera :
-
-    Database engine:    MySQL
-    Server:             localhost
-    Database: 	        wallabag
-    Username:	        wallabag
-    Password:	        VotreMotdePasse
-
-Créez enfin votre premier utilisateur et son mot de passe (différents de l'utilisateur de la base de données).
-
-wallabag est maintenant installé.
-
-### Connexion
-
-Depuis votre navigateur, vous arrivez sur l'écran d'identification : saisissez votre identifiant et votre mot de passe et vous voici connecté.

docs/fr/Administrateur/sessions.md

@@ -1,26 +0,0 @@
----
-language: Français
-currentMenu: sessions
-subTitle: Problème de sessions
----
-
-Si vous vous retrouvez à être déconnecté même après avoir valider le *Stay signed in checkbox*,
-lancez les commandes suivantes comme administrateur (ou avec sudo) :
-
-```
-mkdir /var/lib/wallabag-sessions
-chown www-data:www-data /var/lib/wallabag-sessions
-```
-
-*NOTE : L'utilisateur et le groupe www-data pourrait ne pas exister.
-Vous pouvez alors utiliser ```chown http:http /var/lib/wallabag-sessions``` à la place.*
-
-Ensuite, en utilisant apache, ajoutez : `php_admin_value session.save_path /var/lib/wallabag-sessions` 
-à votre vhost apache, tel que `wallabag-apache.conf`.
-Enfin, redémarrez apache, en lançant par exemple : ```/etc/init.d/apache2 restart``` 
-
-Si vous utilisez nginx, ajoutez  `php_admin_value[session.save_path] = /var/lib/wallabag-sessions`
-à votre fichier de configuration de nginx.
-Ensuite, redémarrez nginx : ```/etc/init.d/nginx restart```
-
-*NOTE : si vous utilisez systemd, vous devriez faire  `systemctl restart apache2` (ou nginx).*