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"
+    }
+}

.editorconfig

@@ -0,0 +1,10 @@
+; top-most EditorConfig file
+root = true
+
+; Unix-style newlines
+[*]
+end_of_line = LF
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+insert_final_newline = true

.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 dedicaced)
-  * in case of a dedicaced server, the server and OS used
+  * 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,9 +1,40 @@
-.DS_Store
-assets/*
-cache/*
-vendor
-composer.phar
-db/poche.sqlite
-inc/poche/config.inc.php
-inc/3rdparty/htmlpurifier/HTMLPurifier/DefinitionCache/Serializer/
-.vagrant
+# Cache, logs & sessions
+/var/*
+!/var/cache
+/var/cache/*
+!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
+
+# Managed by Composer
+/vendor/
+
+# Assets and user uploads
+/web/bundles/
+/web/uploads/
+
+# Build
+/app/build
+/build
+
+# Composer PHAR
+/composer.phar
+
+# 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

@@ -0,0 +1,28 @@
+filter:
+    paths:
+        - src/*
+    excluded_paths:
+        - 'vendor/*'
+        - 'app/*'
+        - 'var/*'
+        - 'web/*'
+        - 'src/Wallabag/*Bundle/Tests/*'
+        - '*Test.php'
+
+tools:
+    php_cs_fixer: true
+    php_analyzer: true
+    php_mess_detector: true
+    php_changetracking: true
+    php_code_sniffer: true
+    php_pdepend: true
+    sensiolabs_security_checker: true
+    #external_code_coverage:
+    #    timeout: 3600
+    php_code_coverage: true
+    php_sim: false
+    php_cpd: false
+
+checks:
+    php:
+        code_rating: true

.travis.yml

@@ -0,0 +1,55 @@
+language: php
+
+# faster builds on docker-container setup
+sudo: false
+
+# used for HHVM
+addons:
+  apt:
+    packages:
+      - tidy
+
+# cache vendor dirs
+cache:
+    directories:
+        - vendor
+        - $HOME/.composer/cache
+
+php:
+    - 5.5
+    - 5.6
+    - 7.0
+    - hhvm
+
+env:
+  - DB=mysql
+  - DB=pgsql
+  - DB=sqlite
+
+matrix:
+    fast_finish: true
+    exclude:
+        - php: hhvm
+          env: DB=pgsql  # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency
+    allow_failures:
+        - php: hhvm
+
+# exclude v1 branches
+branches:
+    except:
+        - master
+        - dev
+
+before_script:
+    - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
+    - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then phpenv config-rm xdebug.ini; fi;
+    - composer self-update --no-progress
+    - if [[ "$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
+    - bin/phpunit -v

COPYING.md

@@ -1,19 +1,19 @@
-Copyright (c) 2013-2014 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,17 +1,3 @@
-wallabag is based on :
-* PHP Readability https://bitbucket.org/fivefilters/php-readability
-* Full Text RSS http://code.fivefilters.org/full-text-rss/src
-* logo by Maylis Agniel https://github.com/wallabag/logo
-* icons http://icomoon.io
-* PHP Simple HTML DOM Parser (for Pocket import) http://simplehtmldom.sourceforge.net/
-* Session https://github.com/tontof/kriss_feed/blob/master/src/class/Session.php
-* Twig http://twig.sensiolabs.org
-* Flash messages https://github.com/plasticbrain/PHP-Flash-Messages
-* Pagination https://github.com/daveismyname/pagination
-* PHPePub https://github.com/Grandt/PHPePub/
+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.
 
-wallabag is mainly developed by Nicolas Lœuillet under the MIT License
-
-Thank you so much to @tcitworld and @mariroz.
-
-Contributors : https://github.com/wallabag/wallabag/graphs/contributors
+Thank you [to others contributors](https://github.com/wallabag/wallabag/graphs/contributors).

Capfile

@@ -0,0 +1,13 @@
+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'
+
+# Include default deployment tasks
+require 'capistrano/deploy'
+
+require 'capistrano/symfony'
+
+# 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

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

Gemfile.lock

@@ -0,0 +1,36 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    capistrano (3.4.0)
+      i18n
+      rake (>= 10.0.0)
+      sshkit (~> 1.3)
+    capistrano-composer (0.0.6)
+      capistrano (>= 3.0.0.pre)
+    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)
+      net-ssh (>= 2.6.5)
+    net-ssh (2.9.2)
+    rake (10.4.2)
+    sshkit (1.7.1)
+      colorize (>= 0.7.0)
+      net-scp (>= 1.1.2)
+      net-ssh (>= 2.8.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  capistrano (~> 3.4)
+  capistrano-composer (~> 0.0.3)
+  capistrano-symfony (~> 1.0.0.rc1)
+
+BUNDLED WITH
+   1.11.2

README.md

@@ -1,9 +1,25 @@
-# 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.
+[![Build Status](https://travis-ci.org/wallabag/wallabag.svg?branch=v2)](https://travis-ci.org/wallabag/wallabag)
+[![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)
 
-More informations on our website: [wallabag.org](http://wallabag.org)
+# What is wallabag?
+wallabag is a self hostable application allowing you to not miss any content anymore.
+Click, save and read it when you can. It extracts content so that you can read it when you have time.
+
+More informations on our website: [wallabag.org](https://wallabag.org)
+
+# Want to test the v2?
+Keep in mind it's an **unstable** branch, everything can be broken :)
+
+If you don't have it yet, please [install composer](https://getcomposer.org/download/). Then you can install wallabag by executing the following commands:
+
+```
+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-2014 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/.htaccess

@@ -0,0 +1,7 @@
+<IfModule mod_authz_core.c>
+    Require all denied
+</IfModule>
+<IfModule !mod_authz_core.c>
+    Order deny,allow
+    Deny from all
+</IfModule>

app/AppCache.php

@@ -0,0 +1,7 @@
+<?php
+
+use Symfony\Bundle\FrameworkBundle\HttpCache\HttpCache;
+
+class AppCache extends HttpCache
+{
+}

app/AppKernel.php

@@ -0,0 +1,71 @@
+<?php
+
+use Symfony\Component\HttpKernel\Kernel;
+use Symfony\Component\Config\Loader\LoaderInterface;
+
+class AppKernel extends Kernel
+{
+    public function registerBundles()
+    {
+        $bundles = [
+            new Symfony\Bundle\FrameworkBundle\FrameworkBundle(),
+            new Symfony\Bundle\SecurityBundle\SecurityBundle(),
+            new Symfony\Bundle\TwigBundle\TwigBundle(),
+            new Symfony\Bundle\MonologBundle\MonologBundle(),
+            new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
+            new Symfony\Bundle\AsseticBundle\AsseticBundle(),
+            new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
+            new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
+            new FOS\RestBundle\FOSRestBundle(),
+            new FOS\UserBundle\FOSUserBundle(),
+            new JMS\SerializerBundle\JMSSerializerBundle(),
+            new Nelmio\ApiDocBundle\NelmioApiDocBundle(),
+            new Nelmio\CorsBundle\NelmioCorsBundle(),
+            new Liip\ThemeBundle\LiipThemeBundle(),
+            new Wallabag\CoreBundle\WallabagCoreBundle(),
+            new Wallabag\ApiBundle\WallabagApiBundle(),
+            new Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle(),
+            new Lexik\Bundle\FormFilterBundle\LexikFormFilterBundle(),
+            new FOS\OAuthServerBundle\FOSOAuthServerBundle(),
+            new Wallabag\UserBundle\WallabagUserBundle(),
+            new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
+            new Scheb\TwoFactorBundle\SchebTwoFactorBundle(),
+            new KPhoen\RulerZBundle\KPhoenRulerZBundle(),
+            new Wallabag\ImportBundle\WallabagImportBundle(),
+            new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(),
+            new Craue\ConfigBundle\CraueConfigBundle(),
+            new Lexik\Bundle\MaintenanceBundle\LexikMaintenanceBundle(),
+            new Wallabag\AnnotationBundle\WallabagAnnotationBundle(),
+        ];
+
+        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();
+            $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
+            $bundles[] = new Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle();
+        }
+
+        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($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

@@ -0,0 +1,13 @@
+<?php
+
+use Doctrine\Common\Annotations\AnnotationRegistry;
+use Composer\Autoload\ClassLoader;
+
+/**
+ * @var ClassLoader $loader
+ */
+$loader = require __DIR__.'/../vendor/autoload.php';
+
+AnnotationRegistry::registerLoader([$loader, 'loadClass']);
+
+return $loader;

app/config/capistrano/deploy.rb

@@ -0,0 +1,26 @@
+# 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'
+
+set :ssh_user, 'framasoft_bag'
+server '78.46.248.87', user: fetch(:ssh_user), roles: %w{web app db}
+
+set :scm, :git
+
+set :format, :pretty
+set :log_level, :info
+# set :log_level, :debug
+
+set :composer_install_flags, '--no-dev --prefer-dist --no-interaction --optimize-autoloader'
+
+set :linked_files, %w{app/config/parameters.yml}
+set :linked_dirs, [fetch(:log_path), "var/sessions", "web/uploads", "data"]
+set :keep_releases, 3
+
+after 'deploy:finishing', 'deploy:cleanup'

app/config/capistrano/deploy/staging.rb

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

app/config/config.yml

@@ -0,0 +1,213 @@
+imports:
+    - { resource: parameters.yml }
+    - { resource: security.yml }
+    - { resource: services.yml }
+
+framework:
+    #esi:             ~
+    translator:      { fallback: "%locale%" }
+    secret:          "%secret%"
+    router:
+        resource: "%kernel.root_dir%/config/routing.yml"
+        strict_requirements: ~
+    form:            ~
+    csrf_protection: ~
+    validation:      { enable_annotations: true }
+    templating:
+        engines: ['twig']
+        #assets_version: SomeVersionScheme
+    default_locale:  "%locale%"
+    trusted_hosts:   ~
+    trusted_proxies: ~
+    session:
+        # handler_id set to null will use default session handler from php.ini
+        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']
+    resource_dir: "%kernel.root_dir%/../web/uploads/import"
+
+# Twig Configuration
+twig:
+    debug:            "%kernel.debug%"
+    strict_variables: "%kernel.debug%"
+    form_themes:
+        - "LexikFormFilterBundle:Form:form_div_layout.html.twig"
+
+# Assetic Configuration
+assetic:
+    debug:          "%kernel.debug%"
+    use_controller: false
+    bundles:        [ ]
+    #java: /usr/bin/java
+    filters:
+        cssrewrite: ~
+        #closure:
+        #    jar: "%kernel.root_dir%/Resources/java/compiler.jar"
+        #yui_css:
+        #    jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar"
+
+# Doctrine Configuration
+doctrine:
+    dbal:
+        driver:   "%database_driver%"
+        host: "%database_host%"
+        port: "%database_port%"
+        dbname: "%database_name%"
+        user: "%database_user%"
+        password: "%database_password%"
+        charset:  UTF8
+        path:     "%database_path%"
+
+    orm:
+        auto_generate_proxy_classes: "%kernel.debug%"
+        entity_managers:
+            default:
+                auto_mapping: true
+
+stof_doctrine_extensions:
+    default_locale: "%locale%"
+    translation_fallback: true
+    orm:
+        default:
+            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%"
+    host:      "%mailer_host%"
+    username:  "%mailer_user%"
+    password:  "%mailer_password%"
+    spool:     { type: memory }
+
+fos_rest:
+    param_fetcher_listener: true
+    body_listener: true
+    format_listener: true
+    view:
+        view_response_listener: 'force'
+        formats:
+            xml: true
+            json : true
+        templating_formats:
+            html: true
+        force_redirects:
+            html: true
+        failed_validation: HTTP_BAD_REQUEST
+        default_engine: twig
+    routing_loader:
+        default_format: json
+
+nelmio_api_doc:
+    sandbox:
+        enabled: false
+    name: wallabag API documentation
+
+nelmio_cors:
+    defaults:
+        allow_credentials: false
+        allow_origin: []
+        allow_headers: []
+        allow_methods: []
+        expose_headers: []
+        max_age: 0
+        hosts: []
+        #origin_regex: false
+    paths:
+        '^/api/':
+            allow_origin: ['*']
+            allow_headers: ['X-Custom-Auth']
+            allow_methods: ['POST', 'PUT', 'GET', 'DELETE']
+            max_age: 3600
+        '^/':
+            #origin_regex: true
+            allow_origin: ['^http://localhost:[0-9]+']
+            allow_headers: ['X-Custom-Auth']
+            allow_methods: ['POST', 'PUT', 'GET', 'DELETE']
+            max_age: 3600
+            hosts: ['^api\.']
+
+liip_theme:
+    load_controllers: false
+    themes:
+        - baggy
+        - material
+    autodetect_theme: wallabag_core.helper.detect_active_theme
+
+    path_patterns:
+        bundle_resource:
+            - %%bundle_path%%/Resources/views/themes/%%current_theme%%/%%template%%
+
+fos_user:
+    db_driver: orm
+    firewall_name: main
+    user_class: Wallabag\UserBundle\Entity\User
+    registration:
+        confirmation:
+            enabled: %fosuser_confirmation%
+    from_email:
+        address:        %from_email%
+        sender_name:    wallabag
+fos_oauth_server:
+    db_driver:           orm
+    client_class:        Wallabag\ApiBundle\Entity\Client
+    access_token_class:  Wallabag\ApiBundle\Entity\AccessToken
+    refresh_token_class: Wallabag\ApiBundle\Entity\RefreshToken
+    auth_code_class:     Wallabag\ApiBundle\Entity\AuthCode
+    service:
+        user_provider: fos_user.user_manager
+
+scheb_two_factor:
+    trusted_computer:
+        enabled: true
+        cookie_name: wllbg_trusted_computer
+        cookie_lifetime: 2592000
+
+    email:
+        enabled: %twofactor_auth%
+        sender_email: %twofactor_sender%
+        digits: 6
+        template: WallabagUserBundle:Authentication:form.html.twig
+        mailer: wallabag_user.auth_code_mailer
+
+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

@@ -0,0 +1,44 @@
+imports:
+    - { resource: config.yml }
+
+framework:
+    router:
+        resource: "%kernel.root_dir%/config/routing_dev.yml"
+        strict_requirements: true
+    profiler: { only_exceptions: false }
+
+web_profiler:
+    toolbar: true
+    intercept_redirects: false
+
+monolog:
+    handlers:
+        main:
+            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: [!event, !doctrine]
+        console_very_verbose:
+            type:   console
+            bubble: false
+            verbosity_levels:
+                VERBOSITY_VERBOSE: NOTICE
+                VERBOSITY_VERY_VERBOSE: NOTICE
+                VERBOSITY_DEBUG: DEBUG
+            channels: [doctrine]
+
+assetic:
+    use_controller: true
+
+swiftmailer:
+    # see http://mailcatcher.me/
+    transport: smtp
+    host: 'localhost'
+    port: 1025

app/config/config_prod.yml

@@ -0,0 +1,25 @@
+imports:
+    - { resource: config.yml }
+
+#framework:
+#    validation:
+#        cache: apc
+
+#doctrine:
+#    orm:
+#        metadata_cache_driver: apc
+#        result_cache_driver: apc
+#        query_cache_driver: apc
+
+monolog:
+    handlers:
+        main:
+            type:         fingers_crossed
+            action_level: error
+            handler:      nested
+        nested:
+            type:  stream
+            path:  "%kernel.logs_dir%/%kernel.environment%.log"
+            level: debug
+        console:
+            type:  console

app/config/config_test.yml

@@ -0,0 +1,36 @@
+imports:
+    - { resource: config_dev.yml }
+
+framework:
+    test: ~
+    session:
+        storage_id: session.storage.mock_file
+    profiler:
+        collect: false
+
+web_profiler:
+    toolbar: false
+    intercept_redirects: false
+
+swiftmailer:
+    # to be able to read emails sent
+    spool:
+        type: file
+
+doctrine:
+    dbal:
+        driver: "%test_database_driver%"
+        host: "%test_database_host%"
+        port: "%test_database_port%"
+        dbname: "%test_database_name%"
+        user: "%test_database_user%"
+        password: "%test_database_password%"
+        charset: UTF8
+        path: "%test_database_path%"
+    orm:
+        metadata_cache_driver:
+            type: service
+            id: filesystem_cache
+        query_cache_driver:
+            type: service
+            id: filesystem_cache

app/config/parameters.yml.dist

@@ -0,0 +1,47 @@
+# 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: ~
+    database_name: symfony
+    database_user: root
+    database_password: ~
+    database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
+    database_table_prefix: wallabag_
+
+    test_database_driver: pdo_sqlite
+    test_database_host: 127.0.0.1
+    test_database_port: ~
+    test_database_name: ~
+    test_database_user: ~
+    test_database_password: ~
+    test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite"
+
+    mailer_transport:  smtp
+    mailer_host:       127.0.0.1
+    mailer_user:       ~
+    mailer_password:   ~
+
+    locale:            en
+
+    # A secret key that's used to generate certain security-related tokens
+    secret:            ovmpmAWXRCabNlMgzlzFXDYmCFfzGv
+
+    # two factor stuff
+    twofactor_auth: true
+    twofactor_sender: no-reply@wallabag.org
+
+    # fosuser stuff
+    fosuser_confirmation: true
+
+    from_email: no-reply@wallabag.org

app/config/routing.yml

@@ -0,0 +1,44 @@
+wallabag_annotation:
+  type : rest
+  resource: "@WallabagAnnotationBundle/Resources/config/routing_annotations.yml"
+
+wallabag_import:
+    resource: "@WallabagImportBundle/Controller/"
+    type:     annotation
+    prefix:   /import
+
+wallabag_api:
+    resource: "@WallabagApiBundle/Resources/config/routing.yml"
+    prefix: /
+
+app:
+    resource: "@WallabagCoreBundle/Controller/"
+    type: annotation
+
+doc-api:
+    resource: "@NelmioApiDocBundle/Resources/config/routing.yml"
+    prefix: /api/doc
+
+rest :
+    type : rest
+    resource : "routing_rest.yml"
+    prefix : /api
+
+homepage:
+    path: "/{page}"
+    defaults:
+        _controller: WallabagCoreBundle:Entry:showUnread
+        page : 1
+    requirements:
+        page: \d+
+
+fos_user:
+    resource: "@FOSUserBundle/Resources/config/routing/all.xml"
+
+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

@@ -0,0 +1,14 @@
+_wdt:
+    resource: "@WebProfilerBundle/Resources/config/routing/wdt.xml"
+    prefix:   /_wdt
+
+_profiler:
+    resource: "@WebProfilerBundle/Resources/config/routing/profiler.xml"
+    prefix:   /_profiler
+
+_errors:
+    resource: "@TwigBundle/Resources/config/routing/errors.xml"
+    prefix:   /_error
+
+_main:
+    resource: routing.yml

app/config/routing_rest.yml

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

app/config/security.yml

@@ -0,0 +1,62 @@
+security:
+    encoders:
+        FOS\UserBundle\Model\UserInterface: sha512
+
+    role_hierarchy:
+        ROLE_ADMIN:       ROLE_USER
+        ROLE_SUPER_ADMIN: [ ROLE_USER, ROLE_ADMIN, ROLE_ALLOWED_TO_SWITCH ]
+
+    providers:
+        administrators:
+            entity: { class: WallabagUserBundle:User, property: username }
+        fos_userbundle:
+            id: fos_user.user_provider.username
+
+    # 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
+
+        api:
+            pattern: /api/.*
+            fos_oauth: true
+            stateless: true
+            anonymous: true
+
+        login_firewall:
+            pattern:    ^/login$
+            anonymous:  ~
+
+        secured_area:
+            pattern: ^/
+            form_login:
+                provider: fos_userbundle
+                csrf_token_generator: security.csrf.token_manager
+
+            anonymous:    true
+            remember_me:
+                secret:   "%secret%"
+                lifetime: 31536000
+                path:     /
+                domain:   ~
+
+            logout:
+                path:   /logout
+                target: /
+
+    access_control:
+        - { path: ^/api/doc, roles: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: /(unread|starred|archive).xml$, roles: IS_AUTHENTICATED_ANONYMOUSLY }
+        - { path: ^/settings, roles: ROLE_SUPER_ADMIN }
+        - { path: ^/annotations, roles: ROLE_USER }
+        - { path: ^/, roles: ROLE_USER }

app/config/services.yml

@@ -0,0 +1,38 @@
+parameters:
+    lexik_form_filter.get_filter.doctrine_orm.class: Wallabag\CoreBundle\Event\Subscriber\CustomDoctrineORMSubscriber
+
+services:
+    # used for tests
+    filesystem_cache:
+        class: Doctrine\Common\Cache\FilesystemCache
+        arguments:
+            - %kernel.cache_dir%/doctrine/metadata
+
+    twig.extension.text:
+        class: Twig_Extensions_Extension_Text
+        tags:
+            - { name: twig.extension }
+
+    wallabag.twig_extension:
+        class: Wallabag\CoreBundle\Twig\WallabagExtension
+        public: false
+        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%"]
+        tags:
+            - { name: kernel.event_subscriber }
+
+    wallabag.user_locale_listener:
+        class: Wallabag\CoreBundle\EventListener\UserLocaleListener
+        arguments: ["@session"]
+        tags:
+            - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin }

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

@@ -0,0 +1,37 @@
+# This file is a "template" of what your parameters.yml file should look like
+parameters:
+    database_driver: pdo_sqlite
+    database_host: 127.0.0.1
+    database_port: ~
+    database_name: symfony
+    database_user: root
+    database_password: ~
+    database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
+    database_table_prefix: wallabag_
+
+    test_database_driver: pdo_mysql
+    test_database_host: localhost
+    test_database_port: 3306
+    test_database_name: wallabag_test
+    test_database_user: root
+    test_database_password: ~
+    test_database_path: ~
+
+    mailer_transport:  smtp
+    mailer_host:       127.0.0.1
+    mailer_user:       ~
+    mailer_password:   ~
+
+    locale:            en
+
+    # A secret key that's used to generate certain security-related tokens
+    secret:            ThisTokenIsNotSoSecretChangeIt
+
+    # two factor stuff
+    twofactor_auth: true
+    twofactor_sender: no-reply@wallabag.org
+
+    # fosuser stuff
+    fosuser_confirmation: true
+
+    from_email: no-reply@wallabag.org

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

@@ -0,0 +1,37 @@
+# This file is a "template" of what your parameters.yml file should look like
+parameters:
+    database_driver: pdo_sqlite
+    database_host: 127.0.0.1
+    database_port: ~
+    database_name: symfony
+    database_user: root
+    database_password: ~
+    database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
+    database_table_prefix: wallabag_
+
+    test_database_driver: pdo_pgsql
+    test_database_host: localhost
+    test_database_port:
+    test_database_name: wallabag_test
+    test_database_user: travis
+    test_database_password: ~
+    test_database_path: ~
+
+    mailer_transport:  smtp
+    mailer_host:       127.0.0.1
+    mailer_user:       ~
+    mailer_password:   ~
+
+    locale:            en
+
+    # A secret key that's used to generate certain security-related tokens
+    secret:            ThisTokenIsNotSoSecretChangeIt
+
+    # two factor stuff
+    twofactor_auth: true
+    twofactor_sender: no-reply@wallabag.org
+
+    # fosuser stuff
+    fosuser_confirmation: true
+
+    from_email: no-reply@wallabag.org

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

@@ -0,0 +1,37 @@
+# This file is a "template" of what your parameters.yml file should look like
+parameters:
+    database_driver: pdo_sqlite
+    database_host: 127.0.0.1
+    database_port: ~
+    database_name: symfony
+    database_user: root
+    database_password: ~
+    database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite"
+    database_table_prefix: wallabag_
+
+    test_database_driver: pdo_sqlite
+    test_database_host: localhost
+    test_database_port:
+    test_database_name: ~
+    test_database_user: ~
+    test_database_password: ~
+    test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite"
+
+    mailer_transport:  smtp
+    mailer_host:       127.0.0.1
+    mailer_user:       ~
+    mailer_password:   ~
+
+    locale:            en
+
+    # A secret key that's used to generate certain security-related tokens
+    secret:            ThisTokenIsNotSoSecretChangeIt
+
+    # two factor stuff
+    twofactor_auth: true
+    twofactor_sender: no-reply@wallabag.org
+
+    # fosuser stuff
+    fosuser_confirmation: true
+
+    from_email: no-reply@wallabag.org

bin/console

@@ -0,0 +1,29 @@
+#!/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);
+
+/**
+ * @var Composer\Autoload\ClassLoader $loader
+ */
+$loader = require __DIR__.'/../app/autoload.php';
+
+$input = new ArgvInput();
+$env = $input->getParameterOption(['--env', '-e'], getenv('SYMFONY_ENV') ?: 'dev');
+$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(['--no-debug', '']) && $env !== 'prod';
+
+if ($debug) {
+    Debug::enable();
+}
+
+$kernel = new AppKernel($env, $debug);
+$application = new Application($kernel);
+$application->run($input);

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/phpunit

@@ -0,0 +1 @@
+../vendor/phpunit/phpunit/phpunit

bin/security-checker

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

bin/symfony_requirements

@@ -0,0 +1,143 @@
+#!/usr/bin/env php
+<?php
+
+require_once dirname(__FILE__).'/../var/SymfonyRequirements.php';
+
+$lineSize = 70;
+$symfonyRequirements = new SymfonyRequirements();
+$iniPath = $symfonyRequirements->getPhpIniConfigPath();
+
+echo_title('Symfony Requirements Checker');
+
+echo '> PHP is using the following php.ini file:'.PHP_EOL;
+if ($iniPath) {
+    echo_style('green', '  '.$iniPath);
+} else {
+    echo_style('warning', '  WARNING: No configuration file (php.ini) used by PHP!');
+}
+
+echo PHP_EOL.PHP_EOL;
+
+echo '> Checking Symfony requirements:'.PHP_EOL.'  ';
+
+$messages = array();
+foreach ($symfonyRequirements->getRequirements() as $req) {
+    /** @var $req Requirement */
+    if ($helpText = get_error_message($req, $lineSize)) {
+        echo_style('red', 'E');
+        $messages['error'][] = $helpText;
+    } else {
+        echo_style('green', '.');
+    }
+}
+
+$checkPassed = empty($messages['error']);
+
+foreach ($symfonyRequirements->getRecommendations() as $req) {
+    if ($helpText = get_error_message($req, $lineSize)) {
+        echo_style('yellow', 'W');
+        $messages['warning'][] = $helpText;
+    } else {
+        echo_style('green', '.');
+    }
+}
+
+if ($checkPassed) {
+    echo_block('success', 'OK', 'Your system is ready to run Symfony projects');
+} else {
+    echo_block('error', 'ERROR', 'Your system is not ready to run Symfony projects');
+
+    echo_title('Fix the following mandatory requirements', 'red');
+
+    foreach ($messages['error'] as $helpText) {
+        echo ' * '.$helpText.PHP_EOL;
+    }
+}
+
+if (!empty($messages['warning'])) {
+    echo_title('Optional recommendations to improve your setup', 'yellow');
+
+    foreach ($messages['warning'] as $helpText) {
+        echo ' * '.$helpText.PHP_EOL;
+    }
+}
+
+echo PHP_EOL;
+echo_style('title', 'Note');
+echo '  The command console could use a different php.ini file'.PHP_EOL;
+echo_style('title', '~~~~');
+echo '  than the one used with your web server. To be on the'.PHP_EOL;
+echo '      safe side, please check the requirements from your web'.PHP_EOL;
+echo '      server using the ';
+echo_style('yellow', 'web/config.php');
+echo ' script.'.PHP_EOL;
+echo PHP_EOL;
+
+exit($checkPassed ? 0 : 1);
+
+function get_error_message(Requirement $requirement, $lineSize)
+{
+    if ($requirement->isFulfilled()) {
+        return;
+    }
+
+    $errorMessage = wordwrap($requirement->getTestMessage(), $lineSize - 3, PHP_EOL.'   ').PHP_EOL;
+    $errorMessage .= '   > '.wordwrap($requirement->getHelpText(), $lineSize - 5, PHP_EOL.'   > ').PHP_EOL;
+
+    return $errorMessage;
+}
+
+function echo_title($title, $style = null)
+{
+    $style = $style ?: 'title';
+
+    echo PHP_EOL;
+    echo_style($style, $title.PHP_EOL);
+    echo_style($style, str_repeat('~', strlen($title)).PHP_EOL);
+    echo PHP_EOL;
+}
+
+function echo_style($style, $message)
+{
+    // ANSI color codes
+    $styles = array(
+        'reset' => "\033[0m",
+        'red' => "\033[31m",
+        'green' => "\033[32m",
+        'yellow' => "\033[33m",
+        'error' => "\033[37;41m",
+        'success' => "\033[37;42m",
+        'title' => "\033[34m",
+    );
+    $supports = has_color_support();
+
+    echo($supports ? $styles[$style] : '').$message.($supports ? $styles['reset'] : '');
+}
+
+function echo_block($style, $title, $message)
+{
+    $message = ' '.trim($message).' ';
+    $width = strlen($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_repeat(' ', $width).PHP_EOL);
+}
+
+function has_color_support()
+{
+    static $support;
+
+    if (null === $support) {
+        if (DIRECTORY_SEPARATOR == '\\') {
+            $support = false !== getenv('ANSICON') || 'ON' === getenv('ConEmuANSI');
+        } else {
+            $support = function_exists('posix_isatty') && @posix_isatty(STDOUT);
+        }
+    }
+
+    return $support;
+}

build.xml

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="wallabag" default="build">
+    <target name="build" depends="clean,prepare,phpunit"/>
+    <target name="prepare-mysql" depends="clean,db_mysql,prepare"/>
+    <target name="prepare-sqlite" depends="clean,db_sqlite,prepare"/>
+    <target name="prepare-pgsql" depends="clean,db_pgsql,prepare"/>
+
+    <target name="clean" description="Cleanup build artifacts">
+        <delete dir="${basedir}/var/cache"/>
+    </target>
+
+    <target name="prepare" description="Prepare for build">
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:database:drop"/>
+            <arg value="--force"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:database:create"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:schema:create"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="cache:clear"/>
+            <arg value="--env=test"/>
+        </exec>
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="doctrine:fixtures:load"/>
+            <arg value="--no-interaction"/>
+            <arg value="--env=test"/>
+        </exec>
+    </target>
+
+    <target name="db_mysql" description="Run test for MySQL">
+        <delete dir="${basedir}/app/config/parameters.yml"/>
+        <exec executable="cp">
+            <arg value="${basedir}/app/config/tests/parameters.yml.dist.mysql"/>
+            <arg value="${basedir}/app/config/parameters.yml"/>
+        </exec>
+
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="cache:clear"/>
+            <arg value="--env=test"/>
+        </exec>
+    </target>
+
+    <target name="db_sqlite" description="Run test for SQLite">
+        <delete dir="${basedir}/app/config/parameters.yml"/>
+        <exec executable="cp">
+            <arg value="${basedir}/app/config/tests/parameters.yml.dist.sqlite"/>
+            <arg value="${basedir}/app/config/parameters.yml"/>
+        </exec>
+
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="cache:clear"/>
+            <arg value="--env=test"/>
+        </exec>
+    </target>
+
+    <target name="db_pgsql" description="Run test for PostgreSQL">
+        <delete dir="${basedir}/app/config/parameters.yml"/>
+        <exec executable="cp">
+            <arg value="${basedir}/app/config/tests/parameters.yml.dist.pgsql"/>
+            <arg value="${basedir}/app/config/parameters.yml"/>
+        </exec>
+
+        <exec executable="php">
+            <arg value="${basedir}/bin/console"/>
+            <arg value="cache:clear"/>
+            <arg value="--env=test"/>
+        </exec>
+    </target>
+
+    <target name="phpunit" description="Run unit tests with PHPUnit + HTML Coverage">
+        <exec executable="phpunit" failonerror="true">
+            <arg value="--coverage-html"/>
+            <arg value="build/coverage"/>
+        </exec>
+    </target>
+</project>

cache/.gitignore

@@ -1 +0,0 @@
-!.htaccess

cache/.htaccess

@@ -1,2 +0,0 @@
-Order deny,allow
-Deny from all

check_essentials.php

@@ -1,14 +0,0 @@
-<?php
-
-// PHP 5.3 minimum
-if (version_compare(PHP_VERSION, '5.3.3', '<')) {
-    die('This software require PHP 5.3.3 minimum');
-}
-
-// Short tags must be enabled for PHP < 5.4
-if (version_compare(PHP_VERSION, '5.4.0', '<')) {
-
-    if (! ini_get('short_open_tag')) {
-        die('This software require to have short tags enabled, check your php.ini => "short_open_tag = On"');
-    }
-}

check_setup.php

@@ -1,12 +0,0 @@
-<?php
-
-// Check if /cache is writeable
-if (! is_writable('cache')) {
-    die('The directory "cache" must be writeable by your web server user');
-}
-
-// install folder still present, need to install wallabag
-if (is_dir('install')) {
-    require('install/index.php');
-    exit;
-}

composer.json

@@ -16,6 +16,11 @@
             "name": "Thomas Citharel",
             "homepage": "http://tcit.fr",
             "role": "Developer"
+        },
+        {
+            "name": "Jérémy Benoist",
+            "homepage": "http://www.j0k3r.net",
+            "role": "Developer"
         }
     ],
     "support": {
@@ -23,8 +28,109 @@
         "issues": "https://github.com/wallabag/wallabag/issues"
     },
     "require": {
-        "twig/twig": "1.*",
-        "twig/extensions": "1.0.*",
-        "umpirsky/twig-gettext-extractor": "1.1.*"
-    }
-}
+        "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.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": "~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": "~1.0",
+        "htmlawed/htmlawed": "~1.1.19",
+        "liip/theme-bundle": "~1.1",
+        "pagerfanta/pagerfanta": "~1.0.3",
+        "lexik/form-filter-bundle": "~5.0",
+        "j0k3r/graby": "~1.0",
+        "friendsofsymfony/user-bundle": "~2.0@dev",
+        "friendsofsymfony/oauth-server-bundle": "^1.5",
+        "stof/doctrine-extensions-bundle": "^1.2@dev",
+        "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",
+        "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",
+        "sensio/generator-bundle": "^3.0",
+        "phpunit/phpunit": "~4.4",
+        "symfony/phpunit-bridge": "^2.7"
+    },
+    "scripts": {
+        "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",
+            "env-map": {
+                "mailer_host": "WALLABAG_MAILER_HOST",
+                "mailer_user": "WALLABAG_MAILER_USER",
+                "mailer_password": "WALLABAG_MAILER_PASSWORD",
+                "secret": "WALLABAG_SECRET"
+            }
+        }
+    },
+    "autoload": {
+        "psr-4": { "Wallabag\\": "src/Wallabag/" },
+        "classmap": [ "app/AppKernel.php", "app/AppCache.php" ]
+    },
+    "config": {
+        "bin-dir": "bin"
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
+}

db/.htaccess

@@ -1,2 +0,0 @@
-Order deny,allow
-Deny from all

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/de/Anwenderdokumentation/Artikel_lesen.html

@@ -1,119 +0,0 @@
-<!DOCTYPE html>
-<!--[if lt IE 7]>       <html class="no-js ie6 oldie" lang="en"> <![endif]-->
-<!--[if IE 7]>          <html class="no-js ie7 oldie" lang="en"> <![endif]-->
-<!--[if IE 8]>          <html class="no-js ie8 oldie" lang="en"> <![endif]-->
-<!--[if gt IE 8]><!-->  <html class="no-js" lang="en"> <!--<![endif]-->
-<head>
-    <title>Artikel lesen</title>
-    <meta charset="utf-8">
-    <meta name="description" content="Documentation for wallabag" />
-    <meta name="author" content="Nicolas Lœuillet">
-    <link rel="icon" href="../../templates/default/themes/daux-blue/img/favicon-blue.png" type="image/x-icon">
-    <!-- Mobile -->
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <!-- Font -->
-    
-    <!-- CSS -->
-    <link href='../../templates/default/themes/daux-blue/css/daux-blue.css' rel='stylesheet' type='text/css'>
-</head>
-<body>
-            <!-- Docs -->
-                <div class="container-fluid fluid-height wrapper">
-            <div class="navbar navbar-fixed-top hidden-print">
-                <div class="container-fluid">
-                    <a class="brand navbar-brand pull-left" href="../../index.html">wallabag</a>
-                    <p class="navbar-text pull-right">Generated by <a href="http://daux.io">Daux.io</a></p>
-                </div>
-            </div>
-            <div class="row columns content">
-                <div class="left-column article-tree col-sm-3 hidden-print">
-                    <!-- For Mobile -->
-                    <div class="responsive-collapse">
-                        <button type="button" class="btn btn-sidebar" id="menu-spinner-button">
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                        </button>
-                    </div>
-                    <div id="sub-nav-collapse" class="sub-nav-collapse">
-                        <!-- Navigation -->
-                        <ul class="nav nav-list"><li><a href="../../de/Einfuehrung.html">Einfuehrung</a></li><li><a href="../../de/wallabag_unterstuetzen.html">wallabag unterstuetzen</a></li><li class="open"><a href="../../de/Anwenderdokumentation/index.html" class="folder">Anwenderdokumentation</a><ul class="nav nav-list"><li><a href="../../de/Anwenderdokumentation/Herunterladen_und_installieren.html">Herunterladen und installieren</a></li><li><a href="../../de/Anwenderdokumentation/Den_ersten_Artikel_speichern.html">Den ersten Artikel speichern</a></li><li class="active"><a href="../../de/Anwenderdokumentation/Artikel_lesen.html">Artikel lesen</a></li><li><a href="../../de/Anwenderdokumentation/wallabag_konfigurieren.html">wallabag konfigurieren</a></li><li><a href="../../de/Anwenderdokumentation/Ein_Artikel_wird_nicht_korrekt_angezeigt.html">Ein Artikel wird nicht korrekt angezeigt</a></li><li><a href="../../de/Anwenderdokumentation/Versteckte_Einstellungen.html">Versteckte Einstellungen</a></li></ul></li></ul>                                                    <div class="well well-sidebar">
-
-                                <!-- Links -->
-                                <a href="https://www.wallabag.org/downloads" target="_blank">Download</a><br><a href="https://github.com/wallabag/wallabag" target="_blank">GitHub Repo</a><br><a href="http://support.wallabag.org" target="_blank">Help</a><br><a href="https://github.com/wallabag/documentation/graphs/contributors" target="_blank">Documentation contributors</a><br>                                
-                                <!-- Twitter -->
-                                                            </div>
-                                            </div>
-                </div>
-                <div class="right-column  content-area col-sm-9">
-                    <div class="content-page">
-                        <article>
-                                                            <div class="page-header sub-header clearfix">
-                                    <h1>Artikel lesen                                                                                <a href="https://github.com/wallabag/documentation/blob/master/de/02_Anwenderdokumentation/04_Artikel_lesen.md" class="btn">Fix this page</a>                                    </h1>
-                                    <span style="float: left; font-size: 10px; color: gray;">
-                                        Thursday, November 20, 2014                                    </span>
-                                    <span style="float: right; font-size: 10px; color: gray;">
-                                        11:43 AM                                    </span>
-                                </div>
-                            
-                            <p>Zum Lesen eines Artikels klicke einfach auf den zugehörigen Link.</p>
-<h2>Weiterlesen von Artikeln</h2>
-<p>Wenn du einen Artikel schließt, merkt sich wallabag die Stelle, an der du aufgehört hast zu lesen. So kannst du dort weiterlesen, wo du aufgehört hast.
-Das funktioniert nur in der Web-Anwendung.</p>
-<h2>Mögliche Aktionen für Artikel</h2>
-<p>Die hier beschriebenen Aktionen können mit Hilfe der am oberen Seitenrand angezeigten Symbole ausgeführt werden.
-Die Beschreibung hier orientiert sich am Theme "Baggy" (<a href="/de/Anwenderdokumentation/wallabag_konfigurieren">Theme ändern</a>), die Symbole in den anderen Themes sind im Wesentlichen gleich.
-Die Aktionen in Reihenfolge der Symbole sind:</p>
-<h3>Den Originalartikel lesen</h3>
-<p>Ein Klick auf dieses Symbol öffnet den Originalartikel.</p>
-<h3>Artikel als gelesen markieren</h3>
-<p>Markiert den Artikel als gelesen und verschiebt ihn ins Archiv (zu erreichen über den Eintrag <em>Archiv</em> im Menü).
-Ein erneuter Klick auf das Symbol setzt den Zustand des Artikels zurück auf "ungelesen".</p>
-<h3>Artikel favorisieren</h3>
-<p>Ein Klick auf dieses Symbol markiert den Artikel als Lieblngsartikel. Eine Liste aller so favorisierten Artikel kann über den Punkt "Favoriten" im wallabag-Menü aufgerufen werden.</p>
-<p>Durch einen erneuten Klick auf das Symbol kann der Favoriten-Status wieder aufgehoben werden</p>
-<h3>Artikel löschen</h3>
-<p>Löscht den Artikel aus deiner wallabag. Diese Aktion kann nicht rückgängig gemacht werden. </p>
-<p><strong>Achtung</strong>: Es wird keine Bestätigung zum Löschen angefordert!</p>
-<h3>Twitter</h3>
-<p>Teile den Titel und Link zum Original-Artikel auf twitter.</p>
-<h3>Per E-Mail</h3>
-<p>Teile den Titel und Link zum Original-Artikel per E-Mail.</p>
-<h3>Artikel drucken</h3>
-<p>Öffnet den Druckdialog des Browsers zum Drucken des Artikels.</p>
-<h3>ePub erstellen</h3>
-<p>Wandelt den Artikel ins ePub-Format um. Eine genauere Beschreibung dazu gibt es im Kapitel (<a href="/de/Anwenderdokumentation/ePub_erstellen">ePub erstellen</a>.</p>
-<h3>Fehlerhafte Anzeige des Artikels melden</h3>
-<p>Hiermit kann gemeldet werden, dass der Artikel nicht wie erwartet angezeigt wird. Eine genauere Beschreibung dazu gibt es im Kapitel <a href="/de/Anwenderdokumentation/Ein_Artikel_wird_nicht_korrekt_angezeigt">Eine vollständige oder Kapitel existieren</a>.</p>                            
-                        </article>
-                    </div>
-                </div>
-            </div>
-        </div>
-    
-        
-
-    <!-- jQuery -->
-            <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-        <script>
-            if (typeof jQuery == 'undefined')
-                document.write(unescape("%3Cscript src='../../js/jquery-1.11.0.min.js' type='text/javascript'%3E%3C/script%3E"));
-        </script>
-    
-    <!-- hightlight.js -->
-    <script src="../../js/highlight.min.js"></script>
-    <script>hljs.initHighlightingOnLoad();</script>
-
-    <!-- JS -->
-    
-    <!-- Front end file editor -->
-        <script src="../../js/custom.js"></script>
-    <!--[if lt IE 9]>
-        <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-</body>
-</html>
-

docs/de/Anwenderdokumentation/Den_ersten_Artikel_speichern.html

@@ -1,129 +0,0 @@
-<!DOCTYPE html>
-<!--[if lt IE 7]>       <html class="no-js ie6 oldie" lang="en"> <![endif]-->
-<!--[if IE 7]>          <html class="no-js ie7 oldie" lang="en"> <![endif]-->
-<!--[if IE 8]>          <html class="no-js ie8 oldie" lang="en"> <![endif]-->
-<!--[if gt IE 8]><!-->  <html class="no-js" lang="en"> <!--<![endif]-->
-<head>
-    <title>Den ersten Artikel speichern</title>
-    <meta charset="utf-8">
-    <meta name="description" content="Documentation for wallabag" />
-    <meta name="author" content="Nicolas Lœuillet">
-    <link rel="icon" href="../../templates/default/themes/daux-blue/img/favicon-blue.png" type="image/x-icon">
-    <!-- Mobile -->
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <!-- Font -->
-    
-    <!-- CSS -->
-    <link href='../../templates/default/themes/daux-blue/css/daux-blue.css' rel='stylesheet' type='text/css'>
-</head>
-<body>
-            <!-- Docs -->
-                <div class="container-fluid fluid-height wrapper">
-            <div class="navbar navbar-fixed-top hidden-print">
-                <div class="container-fluid">
-                    <a class="brand navbar-brand pull-left" href="../../index.html">wallabag</a>
-                    <p class="navbar-text pull-right">Generated by <a href="http://daux.io">Daux.io</a></p>
-                </div>
-            </div>
-            <div class="row columns content">
-                <div class="left-column article-tree col-sm-3 hidden-print">
-                    <!-- For Mobile -->
-                    <div class="responsive-collapse">
-                        <button type="button" class="btn btn-sidebar" id="menu-spinner-button">
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                        </button>
-                    </div>
-                    <div id="sub-nav-collapse" class="sub-nav-collapse">
-                        <!-- Navigation -->
-                        <ul class="nav nav-list"><li><a href="../../de/Einfuehrung.html">Einfuehrung</a></li><li><a href="../../de/wallabag_unterstuetzen.html">wallabag unterstuetzen</a></li><li class="open"><a href="../../de/Anwenderdokumentation/index.html" class="folder">Anwenderdokumentation</a><ul class="nav nav-list"><li><a href="../../de/Anwenderdokumentation/Herunterladen_und_installieren.html">Herunterladen und installieren</a></li><li class="active"><a href="../../de/Anwenderdokumentation/Den_ersten_Artikel_speichern.html">Den ersten Artikel speichern</a></li><li><a href="../../de/Anwenderdokumentation/Artikel_lesen.html">Artikel lesen</a></li><li><a href="../../de/Anwenderdokumentation/wallabag_konfigurieren.html">wallabag konfigurieren</a></li><li><a href="../../de/Anwenderdokumentation/Ein_Artikel_wird_nicht_korrekt_angezeigt.html">Ein Artikel wird nicht korrekt angezeigt</a></li><li><a href="../../de/Anwenderdokumentation/Versteckte_Einstellungen.html">Versteckte Einstellungen</a></li></ul></li></ul>                                                    <div class="well well-sidebar">
-
-                                <!-- Links -->
-                                <a href="https://www.wallabag.org/downloads" target="_blank">Download</a><br><a href="https://github.com/wallabag/wallabag" target="_blank">GitHub Repo</a><br><a href="http://support.wallabag.org" target="_blank">Help</a><br><a href="https://github.com/wallabag/documentation/graphs/contributors" target="_blank">Documentation contributors</a><br>                                
-                                <!-- Twitter -->
-                                                            </div>
-                                            </div>
-                </div>
-                <div class="right-column  content-area col-sm-9">
-                    <div class="content-page">
-                        <article>
-                                                            <div class="page-header sub-header clearfix">
-                                    <h1>Den ersten Artikel speichern                                                                                <a href="https://github.com/wallabag/documentation/blob/master/de/02_Anwenderdokumentation/03_Den_ersten_Artikel_speichern.md" class="btn">Fix this page</a>                                    </h1>
-                                    <span style="float: left; font-size: 10px; color: gray;">
-                                        Sunday, November 16, 2014                                    </span>
-                                    <span style="float: right; font-size: 10px; color: gray;">
-                                        9:22 PM                                    </span>
-                                </div>
-                            
-                            <p>Einmal angemeldet, gibt es viele Möglichkeiten, Artikel zu speichern.</p>
-<h2>In der Webanwendung</h2>
-<p>Klicke in derMenüleiste auf den Eintrag "Speichere einen Link", gib in das erscheinende Popup-Fenster den Link ein und klicke auf "Link speichern!".</p>
-<p>Das Standardverhakten von wallabag ist, nur den Text des Artikels zu speichern. Wenn du möchtest, dass wallabag auch Kopien der im Artikel enthaltenen Bilder auf deinem Server speichert, musst du die Einstellung <em>DOWNLOAD_PICTURES</em> aktivieren. Lies dazu das Kapitel über die versteckten Einstellungen.</p>
-<h2>Mit dem Bookmarklet</h2>
-<p><a href="https://de.wikipedia.org/wiki/Bookmarklet">Aus Wikipedia</a></p>
-<pre><code>Ein Bookmarklet (auch Favelet) ist ein kleines in JavaScript geschriebenes Makro, das als Bookmark abgespeichert wird und dadurch die Funktionen eines Webbrowsers erweitert.</code></pre>
-<h2>Auf deinem Smartphone</h2>
-<h3>Vorbereitung</h3>
-<p>Um Artikel vom Smartphone aus zu lesen, musst du in den wallabag-Einstellungen RSS-Feeds aktivieren. Nach der Aktivierung werden benötigte Informationen wie das Sicherheits-Token angezeigt. Weiterführende Informationen findest du im Kapitel über RSS-Feeds.</p>
-<h3>Android</h3>
-<h4>Installation und Konfiguration</h4>
-<p>Du findest die wallabag-Android-App im <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche">Google Play Store</a> oder bei <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche">F-droid</a>. Es gibt keinen Unterschied zwischen der im Google Play Store und der bei F-Droid angebotenen Version.</p>
-<p>Nach der Installation musst du auf <strong>Einstellungen</strong> tippen, deine wallabag <strong>URL (gesamte Adresse deiner wallabag-Installation oder deines Framabag-Kontos)</strong> und deine <strong>User ID (im Normalfall 1)</strong> in die entsprechenden Felder eingeben. Wenn du mehrere Accounts angelegt hast, musst du den Account angeben, mit dem du die App verbinden willst, sowie das zugehörige Sicherheits-<strong>Token</strong> (achte darauf, alle Buchstaben und Ziffern des Tokens anzugeben, so wie es auf der Konfigurationsseite von wallabag angegeben ist).</p>
-<h4>Einen Artikel speichern</h4>
-<p>Wenn du alles richtig eingestellt hast, kannst du beim Surfen im Webbrowser Artikel ganz einfach speichern. Wähle im <strong>Teilen</strong>-Menü deines Browsers den Eintrag <strong>Bag it!</strong> und der Artikel wir deiner wallabag hinzugefügt.</p>
-<h4>Lesen</h4>
-<p>Um die Liste deiner Artikel zu laden, klicke in der wallabag-App auf <strong>Synchronisieren</strong>. Die Artikel werden nun auf dein Telefon heruntergeladen. Nun brauchst du zum Lesen der Artikel keine Internetverbindung mehr. Klicke auf <strong>Artikelliste</strong>, um einen Artikel zum Lesen auszuwählen.</p>
-<p>Am Ende jedes Artikels wird eine <strong>Als gelesen markieren</strong>-Schaltfläche angezeigt, mit der der Artikel archiviert werden kann.</p>
-<p>Momentan funktioniert die Synchronisation nur in eine Richtung (von wallabag zur Android-App), so dass auf dem Smartphone archivierte Artikel nicht auch in wallabag auf dem Server archiviert werden.</p>
-<h3>iOS</h3>
-<h4>Installation und Konfiguration</h4>
-<p>TODO</p>
-<h4>Anwendung</h4>
-<p>TODO</p>
-<h3>Windows Phone</h3>
-<h4>Installation und Konfiguration</h4>
-<p>Du kannst die Windows Phone-App aus dem <a href="http://www.windowsphone.com/fr-fr/store/app/wallabag/ff890514-348c-4d0b-9b43-153fff3f7450">Windows Store</a> oder direkt aus dem Store deines Smartphones.</p>
-<p>Nach der Installation wirst du über eine Benachrichtigung dazu aufgefordert, die App zu konfigurieren. Öffne den <strong>Einstellungen</strong>-Abschnitt der App, indem du das Drei-Punkte-Menü am unteren Rand des Bildschirms. Gib nun die <strong>URL (gesamte Adresse deiner wallabag-Installation oder deines Framabag-Kontos)</strong> und deine <strong>User ID (im Normalfall 1)</strong> in die entsprechenden Felder ein.</p>
-<p>Wenn du mehrere Accounts angelegt hast, musst du den Account angeben, mit dem du die App verbinden willst, sowie das zugehörige Sicherheits-<strong>Token</strong> (achte darauf, alle Buchstaben und Ziffern des Tokens anzugeben, so wie es auf der Konfigurationsseite von wallabag angegeben ist).</p>
-<h2>Mit dem Browser</h2>
-<h3>Firefox</h3>
-<p>Lade das Firefox-Addon von <a href="https://addons.mozilla.org/firefox/addon/wallabag/">addons.mozilla.org</a> herunter und installiere es.</p>
-<p>Gib die URL deiner wallabag-Installation oder deines Framabag-Kontos ein den Einstellungen des Addons ein.</p>
-<p>Um das Addon zu nutzen, musst du die Werkzeugleiste von Firefox anpassen (Menü>Anpassen) und das wallabag (<strong>W</strong>)-Icon hinzufügen. Um einen Artikel zu speichern, klicke auf dieses wallabag-Icon. Ein neues Fenster wird geöffnet, der Artikel wird deiner wallabag hinzugefügt und das Fenster automatisch wieder geschlossen. Das funktioniert am Besten, wenn du bereits in deiner wallabag angemeldet bist, ansonsten kannst du das in dem gerade geöffneten Fenster nachholen.</p>
-<h3>Chrome</h3>
-<p>Lade das Chrome-Addon aus dem <a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj">Chrome-Webstore</a> herunter und installiere es.</p>
-<p>Gib die URL deiner wallabag-Installation oder deines Framabag-Kontos ein den Einstellungen des Addons ein.</p>
-<p>Während der Installation wird in der Chrome-Werkzeugleiste ein neues <strong>W</strong>-Icon erscheinen. Ein neues Fenster wird geöffnet, der Artikel wird deiner wallabag hinzugefügt und das Fenster automatisch wieder geschlossen. Das funktioniert am Besten, wenn du bereits in deiner wallabag angemeldet bist, ansonsten kannst du das in dem gerade geöffneten Fenster nachholen.</p>                            
-                        </article>
-                    </div>
-                </div>
-            </div>
-        </div>
-    
-        
-
-    <!-- jQuery -->
-            <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-        <script>
-            if (typeof jQuery == 'undefined')
-                document.write(unescape("%3Cscript src='../../js/jquery-1.11.0.min.js' type='text/javascript'%3E%3C/script%3E"));
-        </script>
-    
-    <!-- hightlight.js -->
-    <script src="../../js/highlight.min.js"></script>
-    <script>hljs.initHighlightingOnLoad();</script>
-
-    <!-- JS -->
-    
-    <!-- Front end file editor -->
-        <script src="../../js/custom.js"></script>
-    <!--[if lt IE 9]>
-        <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-</body>
-</html>
-

docs/de/Anwenderdokumentation/Ein_Artikel_wird_nicht_korrekt_angezeigt.html

@@ -1,108 +0,0 @@
-<!DOCTYPE html>
-<!--[if lt IE 7]>       <html class="no-js ie6 oldie" lang="en"> <![endif]-->
-<!--[if IE 7]>          <html class="no-js ie7 oldie" lang="en"> <![endif]-->
-<!--[if IE 8]>          <html class="no-js ie8 oldie" lang="en"> <![endif]-->
-<!--[if gt IE 8]><!-->  <html class="no-js" lang="en"> <!--<![endif]-->
-<head>
-    <title>Ein Artikel wird nicht korrekt angezeigt</title>
-    <meta charset="utf-8">
-    <meta name="description" content="Documentation for wallabag" />
-    <meta name="author" content="Nicolas Lœuillet">
-    <link rel="icon" href="../../templates/default/themes/daux-blue/img/favicon-blue.png" type="image/x-icon">
-    <!-- Mobile -->
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <!-- Font -->
-    
-    <!-- CSS -->
-    <link href='../../templates/default/themes/daux-blue/css/daux-blue.css' rel='stylesheet' type='text/css'>
-</head>
-<body>
-            <!-- Docs -->
-                <div class="container-fluid fluid-height wrapper">
-            <div class="navbar navbar-fixed-top hidden-print">
-                <div class="container-fluid">
-                    <a class="brand navbar-brand pull-left" href="../../index.html">wallabag</a>
-                    <p class="navbar-text pull-right">Generated by <a href="http://daux.io">Daux.io</a></p>
-                </div>
-            </div>
-            <div class="row columns content">
-                <div class="left-column article-tree col-sm-3 hidden-print">
-                    <!-- For Mobile -->
-                    <div class="responsive-collapse">
-                        <button type="button" class="btn btn-sidebar" id="menu-spinner-button">
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                        </button>
-                    </div>
-                    <div id="sub-nav-collapse" class="sub-nav-collapse">
-                        <!-- Navigation -->
-                        <ul class="nav nav-list"><li><a href="../../de/Einfuehrung.html">Einfuehrung</a></li><li><a href="../../de/wallabag_unterstuetzen.html">wallabag unterstuetzen</a></li><li class="open"><a href="../../de/Anwenderdokumentation/index.html" class="folder">Anwenderdokumentation</a><ul class="nav nav-list"><li><a href="../../de/Anwenderdokumentation/Herunterladen_und_installieren.html">Herunterladen und installieren</a></li><li><a href="../../de/Anwenderdokumentation/Den_ersten_Artikel_speichern.html">Den ersten Artikel speichern</a></li><li><a href="../../de/Anwenderdokumentation/Artikel_lesen.html">Artikel lesen</a></li><li><a href="../../de/Anwenderdokumentation/wallabag_konfigurieren.html">wallabag konfigurieren</a></li><li class="active"><a href="../../de/Anwenderdokumentation/Ein_Artikel_wird_nicht_korrekt_angezeigt.html">Ein Artikel wird nicht korrekt angezeigt</a></li><li><a href="../../de/Anwenderdokumentation/Versteckte_Einstellungen.html">Versteckte Einstellungen</a></li></ul></li></ul>                                                    <div class="well well-sidebar">
-
-                                <!-- Links -->
-                                <a href="https://www.wallabag.org/downloads" target="_blank">Download</a><br><a href="https://github.com/wallabag/wallabag" target="_blank">GitHub Repo</a><br><a href="http://support.wallabag.org" target="_blank">Help</a><br><a href="https://github.com/wallabag/documentation/graphs/contributors" target="_blank">Documentation contributors</a><br>                                
-                                <!-- Twitter -->
-                                                            </div>
-                                            </div>
-                </div>
-                <div class="right-column  content-area col-sm-9">
-                    <div class="content-page">
-                        <article>
-                                                            <div class="page-header sub-header clearfix">
-                                    <h1>Ein Artikel wird nicht korrekt angezeigt                                                                                <a href="https://github.com/wallabag/documentation/blob/master/de/02_Anwenderdokumentation/09_Ein_Artikel_wird_nicht_korrekt_angezeigt.md" class="btn">Fix this page</a>                                    </h1>
-                                    <span style="float: left; font-size: 10px; color: gray;">
-                                        Thursday, November 20, 2014                                    </span>
-                                    <span style="float: right; font-size: 10px; color: gray;">
-                                        11:43 AM                                    </span>
-                                </div>
-                            
-                            <p>Wenn du meinst, dass wallabag einen Artikel nicht korrekt anzeigt (z.B. fehlender oder unvollständiger Text, nur eine von mehreren Artikelseiten oder störende Werbung im Text), gibt es mehrere Möglichkeiten, wie du helfen kannst, wallabag besser zu machen.</p>
-<h2>Melden des Anzeigeproblems</h2>
-<p>Egal ob du uns per Mail oder über ein Ticket auf GitHub über die fehlerhatfte Anzeige informierst: folgende Angaben helfen uns, das Problem zu lösen.</p>
-<ul>
-<li>die URL des Artikels</li>
-<li>wie stellt wallabag den Artikel momentan dar?</li>
-<li>was hättest du stattdessen erwartet?</li>
-<li>deine wallabag-Version bzw. ob du Framabag verwendest
-<h3>Variante 1: Ein Ticket auf GitHub eröffnen</h3>
-<p>Um ein <a href="https://github.com/wallabag/wallabag/issues/new">Ticket auf GitHub zu eröffnen</a>, benötigst du dort ein Benutzerkonto. Bitte vergiss nicht, in der Ticketbeschreibung die oben genannten Angaben zu machen.
-Danke!</p></li>
-</ul>
-<h3>Variante 2: E-Mail</h3>
-<p>Sende uns eine E-Mail mit dem Betreff <code>Falsche Anzeige in wallabag</code> an <a href="mailto: hello@wallabag.org">hello@wallabag.org</a>.
-Bitte vergiss nicht, in der E-Mail die oben genannten Angaben zu machen.
-Danke!</p>
-<h2>Lösung des Anzeigeproblems</h2>
-<p>TODO</p>                            
-                        </article>
-                    </div>
-                </div>
-            </div>
-        </div>
-    
-        
-
-    <!-- jQuery -->
-            <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-        <script>
-            if (typeof jQuery == 'undefined')
-                document.write(unescape("%3Cscript src='../../js/jquery-1.11.0.min.js' type='text/javascript'%3E%3C/script%3E"));
-        </script>
-    
-    <!-- hightlight.js -->
-    <script src="../../js/highlight.min.js"></script>
-    <script>hljs.initHighlightingOnLoad();</script>
-
-    <!-- JS -->
-    
-    <!-- Front end file editor -->
-        <script src="../../js/custom.js"></script>
-    <!--[if lt IE 9]>
-        <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-</body>
-</html>
-

docs/de/Anwenderdokumentation/Herunterladen_und_installieren.html

@@ -1,121 +0,0 @@
-<!DOCTYPE html>
-<!--[if lt IE 7]>       <html class="no-js ie6 oldie" lang="en"> <![endif]-->
-<!--[if IE 7]>          <html class="no-js ie7 oldie" lang="en"> <![endif]-->
-<!--[if IE 8]>          <html class="no-js ie8 oldie" lang="en"> <![endif]-->
-<!--[if gt IE 8]><!-->  <html class="no-js" lang="en"> <!--<![endif]-->
-<head>
-    <title>Herunterladen und installieren</title>
-    <meta charset="utf-8">
-    <meta name="description" content="Documentation for wallabag" />
-    <meta name="author" content="Nicolas Lœuillet">
-    <link rel="icon" href="../../templates/default/themes/daux-blue/img/favicon-blue.png" type="image/x-icon">
-    <!-- Mobile -->
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <!-- Font -->
-    
-    <!-- CSS -->
-    <link href='../../templates/default/themes/daux-blue/css/daux-blue.css' rel='stylesheet' type='text/css'>
-</head>
-<body>
-            <!-- Docs -->
-                <div class="container-fluid fluid-height wrapper">
-            <div class="navbar navbar-fixed-top hidden-print">
-                <div class="container-fluid">
-                    <a class="brand navbar-brand pull-left" href="../../index.html">wallabag</a>
-                    <p class="navbar-text pull-right">Generated by <a href="http://daux.io">Daux.io</a></p>
-                </div>
-            </div>
-            <div class="row columns content">
-                <div class="left-column article-tree col-sm-3 hidden-print">
-                    <!-- For Mobile -->
-                    <div class="responsive-collapse">
-                        <button type="button" class="btn btn-sidebar" id="menu-spinner-button">
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                        </button>
-                    </div>
-                    <div id="sub-nav-collapse" class="sub-nav-collapse">
-                        <!-- Navigation -->
-                        <ul class="nav nav-list"><li><a href="../../de/Einfuehrung.html">Einfuehrung</a></li><li><a href="../../de/wallabag_unterstuetzen.html">wallabag unterstuetzen</a></li><li class="open"><a href="../../de/Anwenderdokumentation/index.html" class="folder">Anwenderdokumentation</a><ul class="nav nav-list"><li class="active"><a href="../../de/Anwenderdokumentation/Herunterladen_und_installieren.html">Herunterladen und installieren</a></li><li><a href="../../de/Anwenderdokumentation/Den_ersten_Artikel_speichern.html">Den ersten Artikel speichern</a></li><li><a href="../../de/Anwenderdokumentation/Artikel_lesen.html">Artikel lesen</a></li><li><a href="../../de/Anwenderdokumentation/wallabag_konfigurieren.html">wallabag konfigurieren</a></li><li><a href="../../de/Anwenderdokumentation/Ein_Artikel_wird_nicht_korrekt_angezeigt.html">Ein Artikel wird nicht korrekt angezeigt</a></li><li><a href="../../de/Anwenderdokumentation/Versteckte_Einstellungen.html">Versteckte Einstellungen</a></li></ul></li></ul>                                                    <div class="well well-sidebar">
-
-                                <!-- Links -->
-                                <a href="https://www.wallabag.org/downloads" target="_blank">Download</a><br><a href="https://github.com/wallabag/wallabag" target="_blank">GitHub Repo</a><br><a href="http://support.wallabag.org" target="_blank">Help</a><br><a href="https://github.com/wallabag/documentation/graphs/contributors" target="_blank">Documentation contributors</a><br>                                
-                                <!-- Twitter -->
-                                                            </div>
-                                            </div>
-                </div>
-                <div class="right-column  content-area col-sm-9">
-                    <div class="content-page">
-                        <article>
-                                                            <div class="page-header sub-header clearfix">
-                                    <h1>Herunterladen und installieren                                                                                <a href="https://github.com/wallabag/documentation/blob/master/de/02_Anwenderdokumentation/02_Herunterladen_und_installieren.md" class="btn">Fix this page</a>                                    </h1>
-                                    <span style="float: left; font-size: 10px; color: gray;">
-                                        Sunday, November 16, 2014                                    </span>
-                                    <span style="float: right; font-size: 10px; color: gray;">
-                                        9:22 PM                                    </span>
-                                </div>
-                            
-                            <h2>Ich möchte wallabag nicht installieren</h2>
-<p>Wenn du wallabag nicht auf einem eigenen Server installieren kannst oder möchtest, solltest du ein kostenloses Benutzerkonto auf Framabag erstellen, wo wallabag genutzt wird.</p>
-<h2>Ich möchte wallabag installieren</h2>
-<p><a href="http://www.wallabag.org/download">Lade die neueste Version von wallabag herunter</a> und entpacke sie. Kopiere die entpackten Dateien und Verzeichnisse auf deinen Webserver.</p>
-<h2>Voraussetzungen für den Webserver</h2>
-<ul>
-<li><a href="http://php.net/manual/en/install.php">PHP 5.3.3 oder höher</a></li>
-<li><a href="http://php.net/manual/en/book.sqlite.php">SQLite</a> or <a href="http://php.net/manual/fr/book.mysql.php">MySQL</a> or <a href="http://php.net/manual/en/book.pgsql.php">PostgreSQL</a></li>
-<li><a href="http://php.net/xml">XML for PHP</a></li>
-<li><a href="http://php.net/pcre">PCRE</a></li>
-<li><a href="http://php.net/manual/book.filter.php">Data filtering</a></li>
-<li><a href="http://php.net/tidy">Tidy for PHP</a></li>
-<li><a href="http://php.net/curl">cURL</a></li>
-<li><a href="http://www.php.net/manual/en/filesystem.configuration.php#ini.allow-url-fopen">allow_url_fopen</a></li>
-<li><a href="http://php.net/manual/en/book.gettext.php">gettext</a></li>
-</ul>
-<p>Um zu überprüfen, ob dein Server die Voraussetzungen erfüllt, kannst du <code>wallabag_compatibility_test.php</code> ausführen. Diese Datei liegt im <code>install</code>-Verzeichnis von wallabag.</p>
-<h2>Installation der Abhängigkeiten</h2>
-<p>Damit wallabag ordnungsgemäß funktioniert, müssen einige Abhängigkeiten erfüllt werden. Um diese zu installieren, muss <code>composer</code> verwendet werden. Führe folgende Kommandos in deinem wallabag-Verzeichnis aus:</p>
-<pre><code>curl -s http://getcomposer.org/installer | php
-php composer.phar install</code></pre>
-<p>Falls du <code>composer</code> nicht installieren kannst, kannst du alternativ <a href="http://wllbg.org/vendor">vendor.zip</a> herunterladen und in deinem wallabag-Verzeichnis entpacken. </p>
-<h2>Berechtigungen</h2>
-<p>Dein Webserver braucht Schreibrechte in den Verzeichnissen <code>assets</code>, <code>cache</code>, und <code>db</code>. Bei fehlenden Schreibrechten kann die Installation nicht ausgeführt werden.</p>
-<h2>wallabag installieren. Endlich.</h2>
-<p>Rufe wallabag in deinem Browser auf. Wenn dein Server richtig konfiguriert ist, wird die Setup-Seite angezeigt.</p>
-<p>Gib dort deinen Datenbank-Typ an (<code>sqlite</code>, <code>mysql</code> oder <code>postgresql</code>) und die Angaben für dein Benutzerkonto</p>
-<p>wallabag ist jetzt fertig installiert.</p>
-<h2>Anmelden</h2>
-<p>Rufe wallabag in deinem Webbrowser auf und gib deinen Benutzernamen und dein Passwort ein, um dich anzumelden.</p>
-<p>Viel Spaß!</p>                            
-                        </article>
-                    </div>
-                </div>
-            </div>
-        </div>
-    
-        
-
-    <!-- jQuery -->
-            <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-        <script>
-            if (typeof jQuery == 'undefined')
-                document.write(unescape("%3Cscript src='../../js/jquery-1.11.0.min.js' type='text/javascript'%3E%3C/script%3E"));
-        </script>
-    
-    <!-- hightlight.js -->
-    <script src="../../js/highlight.min.js"></script>
-    <script>hljs.initHighlightingOnLoad();</script>
-
-    <!-- JS -->
-    
-    <!-- Front end file editor -->
-        <script src="../../js/custom.js"></script>
-    <!--[if lt IE 9]>
-        <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-</body>
-</html>
-

docs/de/Anwenderdokumentation/Versteckte_Einstellungen.html

@@ -1,185 +0,0 @@
-<!DOCTYPE html>
-<!--[if lt IE 7]>       <html class="no-js ie6 oldie" lang="en"> <![endif]-->
-<!--[if IE 7]>          <html class="no-js ie7 oldie" lang="en"> <![endif]-->
-<!--[if IE 8]>          <html class="no-js ie8 oldie" lang="en"> <![endif]-->
-<!--[if gt IE 8]><!-->  <html class="no-js" lang="en"> <!--<![endif]-->
-<head>
-    <title>Versteckte Einstellungen</title>
-    <meta charset="utf-8">
-    <meta name="description" content="Documentation for wallabag" />
-    <meta name="author" content="Nicolas Lœuillet">
-    <link rel="icon" href="../../templates/default/themes/daux-blue/img/favicon-blue.png" type="image/x-icon">
-    <!-- Mobile -->
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <!-- Font -->
-    
-    <!-- CSS -->
-    <link href='../../templates/default/themes/daux-blue/css/daux-blue.css' rel='stylesheet' type='text/css'>
-</head>
-<body>
-            <!-- Docs -->
-                <div class="container-fluid fluid-height wrapper">
-            <div class="navbar navbar-fixed-top hidden-print">
-                <div class="container-fluid">
-                    <a class="brand navbar-brand pull-left" href="../../index.html">wallabag</a>
-                    <p class="navbar-text pull-right">Generated by <a href="http://daux.io">Daux.io</a></p>
-                </div>
-            </div>
-            <div class="row columns content">
-                <div class="left-column article-tree col-sm-3 hidden-print">
-                    <!-- For Mobile -->
-                    <div class="responsive-collapse">
-                        <button type="button" class="btn btn-sidebar" id="menu-spinner-button">
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                        </button>
-                    </div>
-                    <div id="sub-nav-collapse" class="sub-nav-collapse">
-                        <!-- Navigation -->
-                        <ul class="nav nav-list"><li><a href="../../de/Einfuehrung.html">Einfuehrung</a></li><li><a href="../../de/wallabag_unterstuetzen.html">wallabag unterstuetzen</a></li><li class="open"><a href="../../de/Anwenderdokumentation/index.html" class="folder">Anwenderdokumentation</a><ul class="nav nav-list"><li><a href="../../de/Anwenderdokumentation/Herunterladen_und_installieren.html">Herunterladen und installieren</a></li><li><a href="../../de/Anwenderdokumentation/Den_ersten_Artikel_speichern.html">Den ersten Artikel speichern</a></li><li><a href="../../de/Anwenderdokumentation/Artikel_lesen.html">Artikel lesen</a></li><li><a href="../../de/Anwenderdokumentation/wallabag_konfigurieren.html">wallabag konfigurieren</a></li><li><a href="../../de/Anwenderdokumentation/Ein_Artikel_wird_nicht_korrekt_angezeigt.html">Ein Artikel wird nicht korrekt angezeigt</a></li><li class="active"><a href="../../de/Anwenderdokumentation/Versteckte_Einstellungen.html">Versteckte Einstellungen</a></li></ul></li></ul>                                                    <div class="well well-sidebar">
-
-                                <!-- Links -->
-                                <a href="https://www.wallabag.org/downloads" target="_blank">Download</a><br><a href="https://github.com/wallabag/wallabag" target="_blank">GitHub Repo</a><br><a href="http://support.wallabag.org" target="_blank">Help</a><br><a href="https://github.com/wallabag/documentation/graphs/contributors" target="_blank">Documentation contributors</a><br>                                
-                                <!-- Twitter -->
-                                                            </div>
-                                            </div>
-                </div>
-                <div class="right-column  content-area col-sm-9">
-                    <div class="content-page">
-                        <article>
-                                                            <div class="page-header sub-header clearfix">
-                                    <h1>Versteckte Einstellungen                                                                                <a href="https://github.com/wallabag/documentation/blob/master/de/02_Anwenderdokumentation/14_Versteckte_Einstellungen.md" class="btn">Fix this page</a>                                    </h1>
-                                    <span style="float: left; font-size: 10px; color: gray;">
-                                        Sunday, November 16, 2014                                    </span>
-                                    <span style="float: right; font-size: 10px; color: gray;">
-                                        9:22 PM                                    </span>
-                                </div>
-                            
-                            <h2>Vorsicht!</h2>
-<p>Dieser Teil ist nur für fortgeschrittene Anwender. 
-<strong>Solltest du beim Bearbeiten einer der Dateien etwas falsch machen, kann es sein, dass wallabag nicht mehr funktioniert.</strong>
-Es muss eine wichtige Datei von wallabag bearbeitet werden, <code>inc/poche/config.inc.php</code>, deshalb mache unbedingt eine Sicherungskopie dieser Datei, bevor du etwas änderst!</p>
-<p>Die Datei wird während der Installation von wallabag erzeugt und mit Standardeinstellungen initialisiert. Durch Anpassen der Datei kann das Verhalten von wallabag in einigen Punkten angepasst werden, die nicht über die nicht über der Konfigurationsseite verfügbar sind.</p>
-<h2>Fortgeschrittene Einstellungen</h2>
-<p>Jeder der in <code>inc/poche/config.inc.php</code> definierten Parameter ist folgendermaßen angegeben:</p>
-<pre><code>@define ('PARAMETER_NAME', 'Parameter-Wert');</code></pre>
-<p>Es darf in jeder Zeile ausschließlich <code>Parameter-Wert</code> geändert werden. 
-Ändere keine anderen in der Datei angegebenen Parameter!</p>
-<p>Änderbare Parameter: </p>
-<table>
-<thead>
-<tr>
-<th>PARAMETER_NAME</th>
-<th>Standardwert</th>
-<th>Beschreibung</th>
-<th align="center">erwarteter Wert</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-<td><code>HTTP_PORT</code></td>
-<td><code>80</code></td>
-<td>entspricht dem HTTP-Port auf deinem Webserver. Nur ändern, wenn sich dein Web-Server hinter einem Proxy befindet.</td>
-<td align="center">ganze Zahl</td>
-</tr>
-<tr>
-<td><code>SSL_PORT</code></td>
-<td><code>443</code></td>
-<td>entspricht dem SSL-Port auf deinem Webserver. Ändern, wenn du sslh verwendest.</td>
-<td align="center">ganze Zahl</td>
-</tr>
-<tr>
-<td><code>DEBUG_POCHE</code></td>
-<td><code>FALSE</code></td>
-<td>Wenn du Probleme mit wallabag hast, kann es bei der Fehlersuche helfen, den Debug-Modus zu aktivieren.</td>
-<td align="center"><code>TRUE</code> / <code>FALSE</code></td>
-</tr>
-<tr>
-<td><code>DOWNLOAD_PICTURES</code></td>
-<td><code>FALSE</code></td>
-<td>Damit kannst du Bilder aus Artikeln herunterladen (zusätzlich zum Artikeltext). Diese Einstellung ist standardmäßig deaktiviert, um eine Überlastung des Webservers zu vermeiden. Wir bevorzugen, dich diese Einstellung selbst aktivieren zu lassen.</td>
-<td align="center"><code>TRUE</code> / <code>FALSE</code></td>
-</tr>
-<tr>
-<td><code>SHARE_TWITTER</code></td>
-<td><code>TRUE</code></td>
-<td>ermöglicht die gemeinsame Nutzung mit Twitter</td>
-<td align="center"><code>TRUE</code> / <code>FALSE</code></td>
-</tr>
-<tr>
-<td><code>SHARE_MAIL</code></td>
-<td><code>TRUE</code></td>
-<td>ermöglicht den Austausch per E-Mail</td>
-<td align="center"><code>TRUE</code> / <code>FALSE</code></td>
-</tr>
-<tr>
-<td><code>SHARE_SHAARLI</code></td>
-<td><code>FALSE</code></td>
-<td>ermöglicht die gemeinsame Nutzung mit einer Shaarli-Installation (ein Lesezeichen-Manager)</td>
-<td align="center"><code>TRUE</code> / <code>FALSE</code></td>
-</tr>
-<tr>
-<td><code>SHAARLI_URL</code></td>
-<td><code>'http://myshaarliurl.com'</code></td>
-<td>Definiert die URL Ihrer Installation Shaarli.</td>
-<td align="center">URL</td>
-</tr>
-<tr>
-<td><code>FLATTR</code></td>
-<td><code>TRUE</code></td>
-<td>Aktiviert die Möglichkeit, einen Artikel zu flattrn ([Flattr ist eine Plattform für Mikrospenden] (<a href="http://de.wikipedia.org/wiki/Flattr">http://de.wikipedia.org/wiki/Flattr</a>)). Wenn ein Artikel flattrbar ist, wird ein Symbol angezeigt und ermöglicht es, eine Mikro-Spende an den Autor des Artikels zu senden.</td>
-<td align="center"><code>TRUE</code> / <code>FALSE</code></td>
-</tr>
-<tr>
-<td><code>SHOW_PRINTLINK</code></td>
-<td><code>'1'</code></td>
-<td>Zeigt eine Link, um einen Artikel zu drucken.</td>
-<td align="center"><code>'0'</code> (deaktiviert), <code>'1'</code> (aktiviert)</td>
-</tr>
-<tr>
-<td><code>SHOW_READPERCENT</code></td>
-<td><code>'1'</code></td>
-<td>Zeige den bereits gelesenen Anteil im Artikel (nur bei den Themes <code>default</code>, <code>dark</code>, <code>dmagenta</code>, <code>solarized</code>, <code>solarized-dark</code>).</td>
-<td align="center"><code>'0'</code> (deaktiviert), <code>'1'</code> (aktiviert)</td>
-</tr>
-<tr>
-<td><code>PAGINATION</code></td>
-<td><code>'12'</code></td>
-<td>Definiert die Anzahl der Einträge, die auf einer Seite dargestellt werden.</td>
-<td align="center">ganze Zahl</td>
-</tr>
-</tbody>
-</table>                            
-                        </article>
-                    </div>
-                </div>
-            </div>
-        </div>
-    
-        
-
-    <!-- jQuery -->
-            <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-        <script>
-            if (typeof jQuery == 'undefined')
-                document.write(unescape("%3Cscript src='../../js/jquery-1.11.0.min.js' type='text/javascript'%3E%3C/script%3E"));
-        </script>
-    
-    <!-- hightlight.js -->
-    <script src="../../js/highlight.min.js"></script>
-    <script>hljs.initHighlightingOnLoad();</script>
-
-    <!-- JS -->
-    
-    <!-- Front end file editor -->
-        <script src="../../js/custom.js"></script>
-    <!--[if lt IE 9]>
-        <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-</body>
-</html>
-

docs/de/Anwenderdokumentation/index.html

@@ -1,92 +0,0 @@
-<!DOCTYPE html>
-<!--[if lt IE 7]>       <html class="no-js ie6 oldie" lang="en"> <![endif]-->
-<!--[if IE 7]>          <html class="no-js ie7 oldie" lang="en"> <![endif]-->
-<!--[if IE 8]>          <html class="no-js ie8 oldie" lang="en"> <![endif]-->
-<!--[if gt IE 8]><!-->  <html class="no-js" lang="en"> <!--<![endif]-->
-<head>
-    <title>Anwenderdokumentation</title>
-    <meta charset="utf-8">
-    <meta name="description" content="Documentation for wallabag" />
-    <meta name="author" content="Nicolas Lœuillet">
-    <link rel="icon" href="../../templates/default/themes/daux-blue/img/favicon-blue.png" type="image/x-icon">
-    <!-- Mobile -->
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <!-- Font -->
-    
-    <!-- CSS -->
-    <link href='../../templates/default/themes/daux-blue/css/daux-blue.css' rel='stylesheet' type='text/css'>
-</head>
-<body>
-            <!-- Docs -->
-                <div class="container-fluid fluid-height wrapper">
-            <div class="navbar navbar-fixed-top hidden-print">
-                <div class="container-fluid">
-                    <a class="brand navbar-brand pull-left" href="../../index.html">wallabag</a>
-                    <p class="navbar-text pull-right">Generated by <a href="http://daux.io">Daux.io</a></p>
-                </div>
-            </div>
-            <div class="row columns content">
-                <div class="left-column article-tree col-sm-3 hidden-print">
-                    <!-- For Mobile -->
-                    <div class="responsive-collapse">
-                        <button type="button" class="btn btn-sidebar" id="menu-spinner-button">
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                        </button>
-                    </div>
-                    <div id="sub-nav-collapse" class="sub-nav-collapse">
-                        <!-- Navigation -->
-                        <ul class="nav nav-list"><li><a href="../../de/Einfuehrung.html">Einfuehrung</a></li><li><a href="../../de/wallabag_unterstuetzen.html">wallabag unterstuetzen</a></li><li class="open"><a href="../../de/Anwenderdokumentation/index.html" class="folder">Anwenderdokumentation</a><ul class="nav nav-list"><li><a href="../../de/Anwenderdokumentation/Herunterladen_und_installieren.html">Herunterladen und installieren</a></li><li><a href="../../de/Anwenderdokumentation/Den_ersten_Artikel_speichern.html">Den ersten Artikel speichern</a></li><li><a href="../../de/Anwenderdokumentation/Artikel_lesen.html">Artikel lesen</a></li><li><a href="../../de/Anwenderdokumentation/wallabag_konfigurieren.html">wallabag konfigurieren</a></li><li><a href="../../de/Anwenderdokumentation/Ein_Artikel_wird_nicht_korrekt_angezeigt.html">Ein Artikel wird nicht korrekt angezeigt</a></li><li><a href="../../de/Anwenderdokumentation/Versteckte_Einstellungen.html">Versteckte Einstellungen</a></li></ul></li></ul>                                                    <div class="well well-sidebar">
-
-                                <!-- Links -->
-                                <a href="https://www.wallabag.org/downloads" target="_blank">Download</a><br><a href="https://github.com/wallabag/wallabag" target="_blank">GitHub Repo</a><br><a href="http://support.wallabag.org" target="_blank">Help</a><br><a href="https://github.com/wallabag/documentation/graphs/contributors" target="_blank">Documentation contributors</a><br>                                
-                                <!-- Twitter -->
-                                                            </div>
-                                            </div>
-                </div>
-                <div class="right-column  content-area col-sm-9">
-                    <div class="content-page">
-                        <article>
-                                                            <div class="page-header sub-header clearfix">
-                                    <h1>Anwenderdokumentation                                                                                <a href="https://github.com/wallabag/documentation/blob/master/de/02_Anwenderdokumentation/index.md" class="btn">Fix this page</a>                                    </h1>
-                                    <span style="float: left; font-size: 10px; color: gray;">
-                                        Sunday, November 16, 2014                                    </span>
-                                    <span style="float: right; font-size: 10px; color: gray;">
-                                        9:22 PM                                    </span>
-                                </div>
-                            
-                            <h2>Anwenderdokumentation</h2>
-<p>Hier findest du alle Informationen, die du zur Nutzung von wallabag benötigst, ohne dass detailliert auf technische Hintergründe eingegangen wird.</p>                            
-                        </article>
-                    </div>
-                </div>
-            </div>
-        </div>
-    
-        
-
-    <!-- jQuery -->
-            <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-        <script>
-            if (typeof jQuery == 'undefined')
-                document.write(unescape("%3Cscript src='../../js/jquery-1.11.0.min.js' type='text/javascript'%3E%3C/script%3E"));
-        </script>
-    
-    <!-- hightlight.js -->
-    <script src="../../js/highlight.min.js"></script>
-    <script>hljs.initHighlightingOnLoad();</script>
-
-    <!-- JS -->
-    
-    <!-- Front end file editor -->
-        <script src="../../js/custom.js"></script>
-    <!--[if lt IE 9]>
-        <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-</body>
-</html>
-

docs/de/Anwenderdokumentation/wallabag_konfigurieren.html

@@ -1,104 +0,0 @@
-<!DOCTYPE html>
-<!--[if lt IE 7]>       <html class="no-js ie6 oldie" lang="en"> <![endif]-->
-<!--[if IE 7]>          <html class="no-js ie7 oldie" lang="en"> <![endif]-->
-<!--[if IE 8]>          <html class="no-js ie8 oldie" lang="en"> <![endif]-->
-<!--[if gt IE 8]><!-->  <html class="no-js" lang="en"> <!--<![endif]-->
-<head>
-    <title>wallabag konfigurieren</title>
-    <meta charset="utf-8">
-    <meta name="description" content="Documentation for wallabag" />
-    <meta name="author" content="Nicolas Lœuillet">
-    <link rel="icon" href="../../templates/default/themes/daux-blue/img/favicon-blue.png" type="image/x-icon">
-    <!-- Mobile -->
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <!-- Font -->
-    
-    <!-- CSS -->
-    <link href='../../templates/default/themes/daux-blue/css/daux-blue.css' rel='stylesheet' type='text/css'>
-</head>
-<body>
-            <!-- Docs -->
-                <div class="container-fluid fluid-height wrapper">
-            <div class="navbar navbar-fixed-top hidden-print">
-                <div class="container-fluid">
-                    <a class="brand navbar-brand pull-left" href="../../index.html">wallabag</a>
-                    <p class="navbar-text pull-right">Generated by <a href="http://daux.io">Daux.io</a></p>
-                </div>
-            </div>
-            <div class="row columns content">
-                <div class="left-column article-tree col-sm-3 hidden-print">
-                    <!-- For Mobile -->
-                    <div class="responsive-collapse">
-                        <button type="button" class="btn btn-sidebar" id="menu-spinner-button">
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                        </button>
-                    </div>
-                    <div id="sub-nav-collapse" class="sub-nav-collapse">
-                        <!-- Navigation -->
-                        <ul class="nav nav-list"><li><a href="../../de/Einfuehrung.html">Einfuehrung</a></li><li><a href="../../de/wallabag_unterstuetzen.html">wallabag unterstuetzen</a></li><li class="open"><a href="../../de/Anwenderdokumentation/index.html" class="folder">Anwenderdokumentation</a><ul class="nav nav-list"><li><a href="../../de/Anwenderdokumentation/Herunterladen_und_installieren.html">Herunterladen und installieren</a></li><li><a href="../../de/Anwenderdokumentation/Den_ersten_Artikel_speichern.html">Den ersten Artikel speichern</a></li><li><a href="../../de/Anwenderdokumentation/Artikel_lesen.html">Artikel lesen</a></li><li class="active"><a href="../../de/Anwenderdokumentation/wallabag_konfigurieren.html">wallabag konfigurieren</a></li><li><a href="../../de/Anwenderdokumentation/Ein_Artikel_wird_nicht_korrekt_angezeigt.html">Ein Artikel wird nicht korrekt angezeigt</a></li><li><a href="../../de/Anwenderdokumentation/Versteckte_Einstellungen.html">Versteckte Einstellungen</a></li></ul></li></ul>                                                    <div class="well well-sidebar">
-
-                                <!-- Links -->
-                                <a href="https://www.wallabag.org/downloads" target="_blank">Download</a><br><a href="https://github.com/wallabag/wallabag" target="_blank">GitHub Repo</a><br><a href="http://support.wallabag.org" target="_blank">Help</a><br><a href="https://github.com/wallabag/documentation/graphs/contributors" target="_blank">Documentation contributors</a><br>                                
-                                <!-- Twitter -->
-                                                            </div>
-                                            </div>
-                </div>
-                <div class="right-column  content-area col-sm-9">
-                    <div class="content-page">
-                        <article>
-                                                            <div class="page-header sub-header clearfix">
-                                    <h1>wallabag konfigurieren                                                                                <a href="https://github.com/wallabag/documentation/blob/master/de/02_Anwenderdokumentation/06_wallabag_konfigurieren.md" class="btn">Fix this page</a>                                    </h1>
-                                    <span style="float: left; font-size: 10px; color: gray;">
-                                        Sunday, November 16, 2014                                    </span>
-                                    <span style="float: right; font-size: 10px; color: gray;">
-                                        9:22 PM                                    </span>
-                                </div>
-                            
-                            <h1>wallabag konfigurieren</h1>
-<p>Auf Konfigurationsseite kannst du wallabags Einstellungen anpassen. </p>
-<p>Einige Punkte der Konfigurationsseite werden hier nicht beschrieben, da für diese eigene Kapitel in der Dokumentation vorgesehen sind (RSS-Feeds, Import von einem Drittanbieter, Datenexport, epub-Konvertierung und Mehrbenutzermodus)</p>
-<h2>Themes</h2>
-<p>Über Geschmack lässt sich nicht streiten. Deshalb lässt dir wallabag die Wahl zwischen verschiedenen Themes, um das Aussahen deinem Geschmack anzupassen.</p>
-<p>Wähle ein Theme aus der Auwahlliste und bestätige die Änderung durch einen Klick auf <strong>Aktualisieren</strong>.</p>
-<h2>Sprache</h2>
-<p>Wähle die Sprache deiner Wahl in der Auswahlliste und bestätige die Änderung durch Klick auf <strong>Aktualisieren</strong>.</p>
-<h2>Passwort</h2>
-<p>Um dein Passwort zu ändern, gib es in die zwei vorgesehenen Felder ein und bestätige die Änderung durch Klick auf <strong>Aktualisieren</strong>.</p>
-<p>Du wirst abgemeldet und musst für eine erneute Anmeldung dein neues Passwort nutzen.</p>
-<h2>Den Cache leeren</h2>
-<p>Mit Hilfe des Caches kann wallabag einige Aufgaben schneller erledigen.</p>
-<p>Nach einem Update von wallabag sollte der Cache geleert werden. Klicke dazu auf den entsprechendenLink.</p>                            
-                        </article>
-                    </div>
-                </div>
-            </div>
-        </div>
-    
-        
-
-    <!-- jQuery -->
-            <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-        <script>
-            if (typeof jQuery == 'undefined')
-                document.write(unescape("%3Cscript src='../../js/jquery-1.11.0.min.js' type='text/javascript'%3E%3C/script%3E"));
-        </script>
-    
-    <!-- hightlight.js -->
-    <script src="../../js/highlight.min.js"></script>
-    <script>hljs.initHighlightingOnLoad();</script>
-
-    <!-- JS -->
-    
-    <!-- Front end file editor -->
-        <script src="../../js/custom.js"></script>
-    <!--[if lt IE 9]>
-        <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-</body>
-</html>
-

docs/de/Einfuehrung.html

@@ -1,106 +0,0 @@
-<!DOCTYPE html>
-<!--[if lt IE 7]>       <html class="no-js ie6 oldie" lang="en"> <![endif]-->
-<!--[if IE 7]>          <html class="no-js ie7 oldie" lang="en"> <![endif]-->
-<!--[if IE 8]>          <html class="no-js ie8 oldie" lang="en"> <![endif]-->
-<!--[if gt IE 8]><!-->  <html class="no-js" lang="en"> <!--<![endif]-->
-<head>
-    <title>Einfuehrung</title>
-    <meta charset="utf-8">
-    <meta name="description" content="Documentation for wallabag" />
-    <meta name="author" content="Nicolas Lœuillet">
-    <link rel="icon" href="../templates/default/themes/daux-blue/img/favicon-blue.png" type="image/x-icon">
-    <!-- Mobile -->
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <!-- Font -->
-    
-    <!-- CSS -->
-    <link href='../templates/default/themes/daux-blue/css/daux-blue.css' rel='stylesheet' type='text/css'>
-</head>
-<body>
-            <!-- Docs -->
-                <div class="container-fluid fluid-height wrapper">
-            <div class="navbar navbar-fixed-top hidden-print">
-                <div class="container-fluid">
-                    <a class="brand navbar-brand pull-left" href="../index.html">wallabag</a>
-                    <p class="navbar-text pull-right">Generated by <a href="http://daux.io">Daux.io</a></p>
-                </div>
-            </div>
-            <div class="row columns content">
-                <div class="left-column article-tree col-sm-3 hidden-print">
-                    <!-- For Mobile -->
-                    <div class="responsive-collapse">
-                        <button type="button" class="btn btn-sidebar" id="menu-spinner-button">
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                        </button>
-                    </div>
-                    <div id="sub-nav-collapse" class="sub-nav-collapse">
-                        <!-- Navigation -->
-                        <ul class="nav nav-list"><li class="active"><a href="../de/Einfuehrung.html">Einfuehrung</a></li><li><a href="../de/wallabag_unterstuetzen.html">wallabag unterstuetzen</a></li><li><a href="../de/Anwenderdokumentation/index.html" class="folder">Anwenderdokumentation</a><ul class="nav nav-list"><li><a href="../de/Anwenderdokumentation/Herunterladen_und_installieren.html">Herunterladen und installieren</a></li><li><a href="../de/Anwenderdokumentation/Den_ersten_Artikel_speichern.html">Den ersten Artikel speichern</a></li><li><a href="../de/Anwenderdokumentation/Artikel_lesen.html">Artikel lesen</a></li><li><a href="../de/Anwenderdokumentation/wallabag_konfigurieren.html">wallabag konfigurieren</a></li><li><a href="../de/Anwenderdokumentation/Ein_Artikel_wird_nicht_korrekt_angezeigt.html">Ein Artikel wird nicht korrekt angezeigt</a></li><li><a href="../de/Anwenderdokumentation/Versteckte_Einstellungen.html">Versteckte Einstellungen</a></li></ul></li></ul>                                                    <div class="well well-sidebar">
-
-                                <!-- Links -->
-                                <a href="https://www.wallabag.org/downloads" target="_blank">Download</a><br><a href="https://github.com/wallabag/wallabag" target="_blank">GitHub Repo</a><br><a href="http://support.wallabag.org" target="_blank">Help</a><br><a href="https://github.com/wallabag/documentation/graphs/contributors" target="_blank">Documentation contributors</a><br>                                
-                                <!-- Twitter -->
-                                                            </div>
-                                            </div>
-                </div>
-                <div class="right-column  content-area col-sm-9">
-                    <div class="content-page">
-                        <article>
-                                                            <div class="page-header sub-header clearfix">
-                                    <h1>Einfuehrung                                                                                <a href="https://github.com/wallabag/documentation/blob/master/de/00_Einfuehrung.md" class="btn">Fix this page</a>                                    </h1>
-                                    <span style="float: left; font-size: 10px; color: gray;">
-                                        Friday, October 31, 2014                                    </span>
-                                    <span style="float: right; font-size: 10px; color: gray;">
-                                        8:34 PM                                    </span>
-                                </div>
-                            
-                            <p><strong>wallabag</strong> ist eine Read-it-later-Anwendung: sie speichert Webseiten, indem sie lediglich die Inhalte behält. Elemente wie Navigations-Links und Werbung werden entfernt.</p>
-<h2>Funktionen</h2>
-<ul>
-<li>Inhalte der Webseiten werden gespeichert: Texte und Bilder </li>
-<li>die Webanwendung passt sich dem benutzten Anzeigegerät (Smartphone, PC, ... ) an</li>
-<li>Artikel können als ePub exportiert werden</li>
-<li>dank Smartphone-Apps können Artikel auch offline gelesen werden</li>
-<li>dank Browser-Addons können neue Links schnell hinzugefügt werden</li>
-<li>viele Templates zur individuellen Anpassung des Erscheinungsbild von wallabag sind verfügbar</li>
-<li>... und viele weitere Funktionen! </li>
-</ul>
-<p>Diese Anwenderdokumentation soll zeigen, wie man wallabag nutzen kann.</p>
-<h2>Demonstration</h2>
-<p>Wenn du alle wallabag-Funktionen ausprobieren möchtest, kannst du diese Demonstrations-Webseite nutzen:  <a href="http://demo.wallabag.org"><a href="http://demo.wallabag.org">http://demo.wallabag.org</a></a></p>
-<h2>Ein Benutzerkonto erstellen</h2>
-<p>Wenn du wallabag nicht selbst installieren möchtest oder kannst, kannst du stattdessen ein kostenloses Benutzerkonto auf <a href="https://www.framabag.org">Framabag.org</a> erstellen. Dazu brauchst du nur eine gültige E-Mail-Adresse.</p>                            
-                        </article>
-                    </div>
-                </div>
-            </div>
-        </div>
-    
-        
-
-    <!-- jQuery -->
-            <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-        <script>
-            if (typeof jQuery == 'undefined')
-                document.write(unescape("%3Cscript src='../js/jquery-1.11.0.min.js' type='text/javascript'%3E%3C/script%3E"));
-        </script>
-    
-    <!-- hightlight.js -->
-    <script src="../js/highlight.min.js"></script>
-    <script>hljs.initHighlightingOnLoad();</script>
-
-    <!-- JS -->
-    
-    <!-- Front end file editor -->
-        <script src="../js/custom.js"></script>
-    <!--[if lt IE 9]>
-        <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-</body>
-</html>
-

docs/de/wallabag_unterstuetzen.html

@@ -1,108 +0,0 @@
-<!DOCTYPE html>
-<!--[if lt IE 7]>       <html class="no-js ie6 oldie" lang="en"> <![endif]-->
-<!--[if IE 7]>          <html class="no-js ie7 oldie" lang="en"> <![endif]-->
-<!--[if IE 8]>          <html class="no-js ie8 oldie" lang="en"> <![endif]-->
-<!--[if gt IE 8]><!-->  <html class="no-js" lang="en"> <!--<![endif]-->
-<head>
-    <title>wallabag unterstuetzen</title>
-    <meta charset="utf-8">
-    <meta name="description" content="Documentation for wallabag" />
-    <meta name="author" content="Nicolas Lœuillet">
-    <link rel="icon" href="../templates/default/themes/daux-blue/img/favicon-blue.png" type="image/x-icon">
-    <!-- Mobile -->
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <!-- Font -->
-    
-    <!-- CSS -->
-    <link href='../templates/default/themes/daux-blue/css/daux-blue.css' rel='stylesheet' type='text/css'>
-</head>
-<body>
-            <!-- Docs -->
-                <div class="container-fluid fluid-height wrapper">
-            <div class="navbar navbar-fixed-top hidden-print">
-                <div class="container-fluid">
-                    <a class="brand navbar-brand pull-left" href="../index.html">wallabag</a>
-                    <p class="navbar-text pull-right">Generated by <a href="http://daux.io">Daux.io</a></p>
-                </div>
-            </div>
-            <div class="row columns content">
-                <div class="left-column article-tree col-sm-3 hidden-print">
-                    <!-- For Mobile -->
-                    <div class="responsive-collapse">
-                        <button type="button" class="btn btn-sidebar" id="menu-spinner-button">
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                        </button>
-                    </div>
-                    <div id="sub-nav-collapse" class="sub-nav-collapse">
-                        <!-- Navigation -->
-                        <ul class="nav nav-list"><li><a href="../de/Einfuehrung.html">Einfuehrung</a></li><li class="active"><a href="../de/wallabag_unterstuetzen.html">wallabag unterstuetzen</a></li><li><a href="../de/Anwenderdokumentation/index.html" class="folder">Anwenderdokumentation</a><ul class="nav nav-list"><li><a href="../de/Anwenderdokumentation/Herunterladen_und_installieren.html">Herunterladen und installieren</a></li><li><a href="../de/Anwenderdokumentation/Den_ersten_Artikel_speichern.html">Den ersten Artikel speichern</a></li><li><a href="../de/Anwenderdokumentation/Artikel_lesen.html">Artikel lesen</a></li><li><a href="../de/Anwenderdokumentation/wallabag_konfigurieren.html">wallabag konfigurieren</a></li><li><a href="../de/Anwenderdokumentation/Ein_Artikel_wird_nicht_korrekt_angezeigt.html">Ein Artikel wird nicht korrekt angezeigt</a></li><li><a href="../de/Anwenderdokumentation/Versteckte_Einstellungen.html">Versteckte Einstellungen</a></li></ul></li></ul>                                                    <div class="well well-sidebar">
-
-                                <!-- Links -->
-                                <a href="https://www.wallabag.org/downloads" target="_blank">Download</a><br><a href="https://github.com/wallabag/wallabag" target="_blank">GitHub Repo</a><br><a href="http://support.wallabag.org" target="_blank">Help</a><br><a href="https://github.com/wallabag/documentation/graphs/contributors" target="_blank">Documentation contributors</a><br>                                
-                                <!-- Twitter -->
-                                                            </div>
-                                            </div>
-                </div>
-                <div class="right-column  content-area col-sm-9">
-                    <div class="content-page">
-                        <article>
-                                                            <div class="page-header sub-header clearfix">
-                                    <h1>wallabag unterstuetzen                                                                                <a href="https://github.com/wallabag/documentation/blob/master/de/01_wallabag_unterstuetzen.md" class="btn">Fix this page</a>                                    </h1>
-                                    <span style="float: left; font-size: 10px; color: gray;">
-                                        Wednesday, November 12, 2014                                    </span>
-                                    <span style="float: right; font-size: 10px; color: gray;">
-                                        9:12 PM                                    </span>
-                                </div>
-                            
-                            <h2>Fehler melden</h2>
-<h3>Den wallabag-Support kontaktieren</h3>
-<p>TODO</p>
-<h3>Einen Fehlerbericht verfassen</h3>
-<p>TODO</p>
-<h2>Die Dokumentation schreiben und verbessern</h2>
-<p>TODO</p>
-<h2>Fehler beheben</h2>
-<p>TODO</p>
-<h2>Weitersagen</h2>
-<p>Es ist gar nicht schwer: sprich einfach über wallabag! Benutze den #wallabag-Hashtag in sozialen Netzwerken: twitter, Facebook, Diaspora*, Google+, etc.</p>
-<p>wallabag in sozialen Netzwerken: </p>
-<ul>
-<li><a href="https://framasphere.org/people/2335ff202f920132196e2a0000053625">Diaspora*</a></li>
-<li><a href="https:/twitter.com/wallabagapp">twitter</a></li>
-<li><a href="https://www.facebook.com/wallabag">Facebook</a></li>
-<li><a href="https://plus.google.com/+WallabagOrg/">Google+</a></li>
-</ul>                            
-                        </article>
-                    </div>
-                </div>
-            </div>
-        </div>
-    
-        
-
-    <!-- jQuery -->
-            <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-        <script>
-            if (typeof jQuery == 'undefined')
-                document.write(unescape("%3Cscript src='../js/jquery-1.11.0.min.js' type='text/javascript'%3E%3C/script%3E"));
-        </script>
-    
-    <!-- hightlight.js -->
-    <script src="../js/highlight.min.js"></script>
-    <script>hljs.initHighlightingOnLoad();</script>
-
-    <!-- JS -->
-    
-    <!-- Front end file editor -->
-        <script src="../js/custom.js"></script>
-    <!--[if lt IE 9]>
-        <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-</body>
-</html>
-

docs/en/Getting_started.html

@@ -1,106 +0,0 @@
-<!DOCTYPE html>
-<!--[if lt IE 7]>       <html class="no-js ie6 oldie" lang="en"> <![endif]-->
-<!--[if IE 7]>          <html class="no-js ie7 oldie" lang="en"> <![endif]-->
-<!--[if IE 8]>          <html class="no-js ie8 oldie" lang="en"> <![endif]-->
-<!--[if gt IE 8]><!-->  <html class="no-js" lang="en"> <!--<![endif]-->
-<head>
-    <title>Getting started</title>
-    <meta charset="utf-8">
-    <meta name="description" content="Documentation for wallabag" />
-    <meta name="author" content="Nicolas Lœuillet">
-    <link rel="icon" href="../templates/default/themes/daux-blue/img/favicon-blue.png" type="image/x-icon">
-    <!-- Mobile -->
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <!-- Font -->
-    
-    <!-- CSS -->
-    <link href='../templates/default/themes/daux-blue/css/daux-blue.css' rel='stylesheet' type='text/css'>
-</head>
-<body>
-            <!-- Docs -->
-                <div class="container-fluid fluid-height wrapper">
-            <div class="navbar navbar-fixed-top hidden-print">
-                <div class="container-fluid">
-                    <a class="brand navbar-brand pull-left" href="../index.html">wallabag</a>
-                    <p class="navbar-text pull-right">Generated by <a href="http://daux.io">Daux.io</a></p>
-                </div>
-            </div>
-            <div class="row columns content">
-                <div class="left-column article-tree col-sm-3 hidden-print">
-                    <!-- For Mobile -->
-                    <div class="responsive-collapse">
-                        <button type="button" class="btn btn-sidebar" id="menu-spinner-button">
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                        </button>
-                    </div>
-                    <div id="sub-nav-collapse" class="sub-nav-collapse">
-                        <!-- Navigation -->
-                        <ul class="nav nav-list"><li class="active"><a href="../en/Getting_started.html">Getting started</a></li><li><a href="../en/Help_wallabag.html">Help wallabag</a></li><li><a href="#" class="aj-nav folder">User documentation</a><ul class="nav nav-list"><li><a href="../en/User_documentation/Download_and_install.html">Download and install</a></li><li><a href="../en/User_documentation/Save_your_first_article.html">Save your first article</a></li><li><a href="../en/User_documentation/Configure_wallabag.html">Configure wallabag</a></li><li><a href="../en/User_documentation/Hidden_options.html">Hidden options</a></li></ul></li></ul>                                                    <div class="well well-sidebar">
-
-                                <!-- Links -->
-                                <a href="https://www.wallabag.org/downloads" target="_blank">Download</a><br><a href="https://github.com/wallabag/wallabag" target="_blank">GitHub Repo</a><br><a href="http://support.wallabag.org" target="_blank">Help</a><br><a href="https://github.com/wallabag/documentation/graphs/contributors" target="_blank">Documentation contributors</a><br>                                
-                                <!-- Twitter -->
-                                                            </div>
-                                            </div>
-                </div>
-                <div class="right-column  content-area col-sm-9">
-                    <div class="content-page">
-                        <article>
-                                                            <div class="page-header sub-header clearfix">
-                                    <h1>Getting started                                                                                <a href="https://github.com/wallabag/documentation/blob/master/en/00_Getting_started.md" class="btn">Fix this page</a>                                    </h1>
-                                    <span style="float: left; font-size: 10px; color: gray;">
-                                        Friday, October 31, 2014                                    </span>
-                                    <span style="float: right; font-size: 10px; color: gray;">
-                                        8:34 PM                                    </span>
-                                </div>
-                            
-                            <p><strong>wallabag</strong> is a read-it-later application: it saves a web page by keeping content only. Elements like navigation or ads are deleted.</p>
-<h2>Features</h2>
-<ul>
-<li>content of the web page is saved: text and pictures. </li>
-<li>the web application is responsive</li>
-<li>you can export articles into ePub</li>
-<li>you can read your articles offline thanks to smartphones applications</li>
-<li>you can easily save a new link thanks to browser addons</li>
-<li>many templates are available to change your wallabag as you wish</li>
-<li>and many others great features ! </li>
-</ul>
-<p>This user documentation is here to learn to you what you can do with wallabag.</p>
-<h2>Demonstration</h2>
-<p>If you want to try all wallabag features, there is a demonstration website: <a href="http://demo.wallabag.org"><a href="http://demo.wallabag.org">http://demo.wallabag.org</a></a></p>
-<h2>Create an account</h2>
-<p>Maybe you don't want to install and update wallabag by yourself, or you can't do it, it's possible to create a free account on <a href="https://www.framabag.org">Framabag.org</a>. Just your email is needed.</p>                            
-                        </article>
-                    </div>
-                </div>
-            </div>
-        </div>
-    
-        
-
-    <!-- jQuery -->
-            <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-        <script>
-            if (typeof jQuery == 'undefined')
-                document.write(unescape("%3Cscript src='../js/jquery-1.11.0.min.js' type='text/javascript'%3E%3C/script%3E"));
-        </script>
-    
-    <!-- hightlight.js -->
-    <script src="../js/highlight.min.js"></script>
-    <script>hljs.initHighlightingOnLoad();</script>
-
-    <!-- JS -->
-    
-    <!-- Front end file editor -->
-        <script src="../js/custom.js"></script>
-    <!--[if lt IE 9]>
-        <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-</body>
-</html>
-

docs/en/Help_wallabag.html

@@ -1,108 +0,0 @@
-<!DOCTYPE html>
-<!--[if lt IE 7]>       <html class="no-js ie6 oldie" lang="en"> <![endif]-->
-<!--[if IE 7]>          <html class="no-js ie7 oldie" lang="en"> <![endif]-->
-<!--[if IE 8]>          <html class="no-js ie8 oldie" lang="en"> <![endif]-->
-<!--[if gt IE 8]><!-->  <html class="no-js" lang="en"> <!--<![endif]-->
-<head>
-    <title>Help wallabag</title>
-    <meta charset="utf-8">
-    <meta name="description" content="Documentation for wallabag" />
-    <meta name="author" content="Nicolas Lœuillet">
-    <link rel="icon" href="../templates/default/themes/daux-blue/img/favicon-blue.png" type="image/x-icon">
-    <!-- Mobile -->
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <!-- Font -->
-    
-    <!-- CSS -->
-    <link href='../templates/default/themes/daux-blue/css/daux-blue.css' rel='stylesheet' type='text/css'>
-</head>
-<body>
-            <!-- Docs -->
-                <div class="container-fluid fluid-height wrapper">
-            <div class="navbar navbar-fixed-top hidden-print">
-                <div class="container-fluid">
-                    <a class="brand navbar-brand pull-left" href="../index.html">wallabag</a>
-                    <p class="navbar-text pull-right">Generated by <a href="http://daux.io">Daux.io</a></p>
-                </div>
-            </div>
-            <div class="row columns content">
-                <div class="left-column article-tree col-sm-3 hidden-print">
-                    <!-- For Mobile -->
-                    <div class="responsive-collapse">
-                        <button type="button" class="btn btn-sidebar" id="menu-spinner-button">
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                        </button>
-                    </div>
-                    <div id="sub-nav-collapse" class="sub-nav-collapse">
-                        <!-- Navigation -->
-                        <ul class="nav nav-list"><li><a href="../en/Getting_started.html">Getting started</a></li><li class="active"><a href="../en/Help_wallabag.html">Help wallabag</a></li><li><a href="#" class="aj-nav folder">User documentation</a><ul class="nav nav-list"><li><a href="../en/User_documentation/Download_and_install.html">Download and install</a></li><li><a href="../en/User_documentation/Save_your_first_article.html">Save your first article</a></li><li><a href="../en/User_documentation/Configure_wallabag.html">Configure wallabag</a></li><li><a href="../en/User_documentation/Hidden_options.html">Hidden options</a></li></ul></li></ul>                                                    <div class="well well-sidebar">
-
-                                <!-- Links -->
-                                <a href="https://www.wallabag.org/downloads" target="_blank">Download</a><br><a href="https://github.com/wallabag/wallabag" target="_blank">GitHub Repo</a><br><a href="http://support.wallabag.org" target="_blank">Help</a><br><a href="https://github.com/wallabag/documentation/graphs/contributors" target="_blank">Documentation contributors</a><br>                                
-                                <!-- Twitter -->
-                                                            </div>
-                                            </div>
-                </div>
-                <div class="right-column  content-area col-sm-9">
-                    <div class="content-page">
-                        <article>
-                                                            <div class="page-header sub-header clearfix">
-                                    <h1>Help wallabag                                                                                <a href="https://github.com/wallabag/documentation/blob/master/en/01_Help_wallabag.md" class="btn">Fix this page</a>                                    </h1>
-                                    <span style="float: left; font-size: 10px; color: gray;">
-                                        Tuesday, November 4, 2014                                    </span>
-                                    <span style="float: right; font-size: 10px; color: gray;">
-                                        8:52 PM                                    </span>
-                                </div>
-                            
-                            <h2>Report bugs</h2>
-<h3>Contact wallabag support</h3>
-<p>TODO</p>
-<h3>Create a new issue</h3>
-<p>TODO</p>
-<h2>Write and fix documentation</h2>
-<p>TODO</p>
-<h2>Fix bugs</h2>
-<p>TODO</p>
-<h2>Spread the word</h2>
-<p>It's not so complicated: just talk about wallabag! Use #wallabag hashtag on all your social networks: twitter, Facebook, Diaspora*, Google+, etc. </p>
-<p>Here are our accounts on social networks: </p>
-<ul>
-<li><a href="https://framasphere.org/people/2335ff202f920132196e2a0000053625">Diaspora*</a></li>
-<li><a href="https:/twitter.com/wallabagapp">twitter</a></li>
-<li><a href="https://www.facebook.com/wallabag">Facebook</a></li>
-<li><a href="https://plus.google.com/+WallabagOrg/">Google+</a></li>
-</ul>                            
-                        </article>
-                    </div>
-                </div>
-            </div>
-        </div>
-    
-        
-
-    <!-- jQuery -->
-            <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-        <script>
-            if (typeof jQuery == 'undefined')
-                document.write(unescape("%3Cscript src='../js/jquery-1.11.0.min.js' type='text/javascript'%3E%3C/script%3E"));
-        </script>
-    
-    <!-- hightlight.js -->
-    <script src="../js/highlight.min.js"></script>
-    <script>hljs.initHighlightingOnLoad();</script>
-
-    <!-- JS -->
-    
-    <!-- Front end file editor -->
-        <script src="../js/custom.js"></script>
-    <!--[if lt IE 9]>
-        <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-</body>
-</html>
-

docs/en/User_documentation/Configure_wallabag.html

@@ -1,106 +0,0 @@
-<!DOCTYPE html>
-<!--[if lt IE 7]>       <html class="no-js ie6 oldie" lang="en"> <![endif]-->
-<!--[if IE 7]>          <html class="no-js ie7 oldie" lang="en"> <![endif]-->
-<!--[if IE 8]>          <html class="no-js ie8 oldie" lang="en"> <![endif]-->
-<!--[if gt IE 8]><!-->  <html class="no-js" lang="en"> <!--<![endif]-->
-<head>
-    <title>Configure wallabag</title>
-    <meta charset="utf-8">
-    <meta name="description" content="Documentation for wallabag" />
-    <meta name="author" content="Nicolas Lœuillet">
-    <link rel="icon" href="../../templates/default/themes/daux-blue/img/favicon-blue.png" type="image/x-icon">
-    <!-- Mobile -->
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <!-- Font -->
-    
-    <!-- CSS -->
-    <link href='../../templates/default/themes/daux-blue/css/daux-blue.css' rel='stylesheet' type='text/css'>
-</head>
-<body>
-            <!-- Docs -->
-                <div class="container-fluid fluid-height wrapper">
-            <div class="navbar navbar-fixed-top hidden-print">
-                <div class="container-fluid">
-                    <a class="brand navbar-brand pull-left" href="../../index.html">wallabag</a>
-                    <p class="navbar-text pull-right">Generated by <a href="http://daux.io">Daux.io</a></p>
-                </div>
-            </div>
-            <div class="row columns content">
-                <div class="left-column article-tree col-sm-3 hidden-print">
-                    <!-- For Mobile -->
-                    <div class="responsive-collapse">
-                        <button type="button" class="btn btn-sidebar" id="menu-spinner-button">
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                        </button>
-                    </div>
-                    <div id="sub-nav-collapse" class="sub-nav-collapse">
-                        <!-- Navigation -->
-                        <ul class="nav nav-list"><li><a href="../../en/Getting_started.html">Getting started</a></li><li><a href="../../en/Help_wallabag.html">Help wallabag</a></li><li class="open"><a href="#" class="aj-nav folder">User documentation</a><ul class="nav nav-list"><li><a href="../../en/User_documentation/Download_and_install.html">Download and install</a></li><li><a href="../../en/User_documentation/Save_your_first_article.html">Save your first article</a></li><li class="active"><a href="../../en/User_documentation/Configure_wallabag.html">Configure wallabag</a></li><li><a href="../../en/User_documentation/Hidden_options.html">Hidden options</a></li></ul></li></ul>                                                    <div class="well well-sidebar">
-
-                                <!-- Links -->
-                                <a href="https://www.wallabag.org/downloads" target="_blank">Download</a><br><a href="https://github.com/wallabag/wallabag" target="_blank">GitHub Repo</a><br><a href="http://support.wallabag.org" target="_blank">Help</a><br><a href="https://github.com/wallabag/documentation/graphs/contributors" target="_blank">Documentation contributors</a><br>                                
-                                <!-- Twitter -->
-                                                            </div>
-                                            </div>
-                </div>
-                <div class="right-column  content-area col-sm-9">
-                    <div class="content-page">
-                        <article>
-                                                            <div class="page-header sub-header clearfix">
-                                    <h1>Configure wallabag                                                                                <a href="https://github.com/wallabag/documentation/blob/master/en/02_User_documentation/06_Configure_wallabag.md" class="btn">Fix this page</a>                                    </h1>
-                                    <span style="float: left; font-size: 10px; color: gray;">
-                                        Sunday, November 16, 2014                                    </span>
-                                    <span style="float: right; font-size: 10px; color: gray;">
-                                        9:22 PM                                    </span>
-                                </div>
-                            
-                            <h1>Configure wallabag</h1>
-<p>From the configuration menu, you can change some wallabag's options. </p>
-<p>Some parts won't be presented here as they have a complete chapter in the documentation (RSS 
-feeds, import from a third party service, export your data, Epub conversion and multi-user mode).</p>
-<h2>Theme</h2>
-<p>Of tastes and colors, we do not discuss. That's why wallabag offers you to change its skin to please everyone.</p>
-<p>Select the theme of your choice from the drop down list and confirm by clicking on <strong>Update</strong>.</p>
-<h2>Language</h2>
-<p>Select the language of your choice in the drop down list and confirm by clicking on <strong>Update</strong>
-.</p>
-<h2>Password</h2>
-<p>Fill in your new password in the two dedicated fields and confirm by clicking on <strong>Update</strong>.</p>
-<p>You will be disconnected and need to enter your new password to access your wallabag.</p>
-<h2>Clear the cache</h2>
-<p>The cache allows wallabag perform certain functions faster.</p>
-<p>After updating wallabag, it is advised to clear the cache. You only have to click to do so.</p>                            
-                        </article>
-                    </div>
-                </div>
-            </div>
-        </div>
-    
-        
-
-    <!-- jQuery -->
-            <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-        <script>
-            if (typeof jQuery == 'undefined')
-                document.write(unescape("%3Cscript src='../../js/jquery-1.11.0.min.js' type='text/javascript'%3E%3C/script%3E"));
-        </script>
-    
-    <!-- hightlight.js -->
-    <script src="../../js/highlight.min.js"></script>
-    <script>hljs.initHighlightingOnLoad();</script>
-
-    <!-- JS -->
-    
-    <!-- Front end file editor -->
-        <script src="../../js/custom.js"></script>
-    <!--[if lt IE 9]>
-        <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-</body>
-</html>
-

docs/en/User_documentation/Download_and_install.html

@@ -1,121 +0,0 @@
-<!DOCTYPE html>
-<!--[if lt IE 7]>       <html class="no-js ie6 oldie" lang="en"> <![endif]-->
-<!--[if IE 7]>          <html class="no-js ie7 oldie" lang="en"> <![endif]-->
-<!--[if IE 8]>          <html class="no-js ie8 oldie" lang="en"> <![endif]-->
-<!--[if gt IE 8]><!-->  <html class="no-js" lang="en"> <!--<![endif]-->
-<head>
-    <title>Download and install</title>
-    <meta charset="utf-8">
-    <meta name="description" content="Documentation for wallabag" />
-    <meta name="author" content="Nicolas Lœuillet">
-    <link rel="icon" href="../../templates/default/themes/daux-blue/img/favicon-blue.png" type="image/x-icon">
-    <!-- Mobile -->
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <!-- Font -->
-    
-    <!-- CSS -->
-    <link href='../../templates/default/themes/daux-blue/css/daux-blue.css' rel='stylesheet' type='text/css'>
-</head>
-<body>
-            <!-- Docs -->
-                <div class="container-fluid fluid-height wrapper">
-            <div class="navbar navbar-fixed-top hidden-print">
-                <div class="container-fluid">
-                    <a class="brand navbar-brand pull-left" href="../../index.html">wallabag</a>
-                    <p class="navbar-text pull-right">Generated by <a href="http://daux.io">Daux.io</a></p>
-                </div>
-            </div>
-            <div class="row columns content">
-                <div class="left-column article-tree col-sm-3 hidden-print">
-                    <!-- For Mobile -->
-                    <div class="responsive-collapse">
-                        <button type="button" class="btn btn-sidebar" id="menu-spinner-button">
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                        </button>
-                    </div>
-                    <div id="sub-nav-collapse" class="sub-nav-collapse">
-                        <!-- Navigation -->
-                        <ul class="nav nav-list"><li><a href="../../en/Getting_started.html">Getting started</a></li><li><a href="../../en/Help_wallabag.html">Help wallabag</a></li><li class="open"><a href="#" class="aj-nav folder">User documentation</a><ul class="nav nav-list"><li class="active"><a href="../../en/User_documentation/Download_and_install.html">Download and install</a></li><li><a href="../../en/User_documentation/Save_your_first_article.html">Save your first article</a></li><li><a href="../../en/User_documentation/Configure_wallabag.html">Configure wallabag</a></li><li><a href="../../en/User_documentation/Hidden_options.html">Hidden options</a></li></ul></li></ul>                                                    <div class="well well-sidebar">
-
-                                <!-- Links -->
-                                <a href="https://www.wallabag.org/downloads" target="_blank">Download</a><br><a href="https://github.com/wallabag/wallabag" target="_blank">GitHub Repo</a><br><a href="http://support.wallabag.org" target="_blank">Help</a><br><a href="https://github.com/wallabag/documentation/graphs/contributors" target="_blank">Documentation contributors</a><br>                                
-                                <!-- Twitter -->
-                                                            </div>
-                                            </div>
-                </div>
-                <div class="right-column  content-area col-sm-9">
-                    <div class="content-page">
-                        <article>
-                                                            <div class="page-header sub-header clearfix">
-                                    <h1>Download and install                                                                                <a href="https://github.com/wallabag/documentation/blob/master/en/02_User_documentation/02_Download_and_install.md" class="btn">Fix this page</a>                                    </h1>
-                                    <span style="float: left; font-size: 10px; color: gray;">
-                                        Sunday, November 16, 2014                                    </span>
-                                    <span style="float: right; font-size: 10px; color: gray;">
-                                        9:22 PM                                    </span>
-                                </div>
-                            
-                            <h2>I don't want to install wallabag</h2>
-<p>If you can't or don't want to install Wallabag on your server, we suggest you create a free account on Framabag wich uses our software: read the complete documentation here (TODO write Create a framabag account).</p>
-<h2>I want to install wallabag</h2>
-<p><a href="http://www.wallabag.org/download">Download the latest wallabag version</a> and unpack it. Copy the files on your web server.</p>
-<h2>Prerequisites for your web server</h2>
-<ul>
-<li><a href="http://php.net/manual/en/install.php">PHP 5.3.3 or more</a></li>
-<li><a href="http://php.net/manual/en/book.sqlite.php">SQLite</a> or <a href="http://php.net/manual/fr/book.mysql.php">MySQL</a> or <a href="http://php.net/manual/en/book.pgsql.php">PostgreSQL</a></li>
-<li><a href="http://php.net/xml">XML for PHP</a></li>
-<li><a href="http://php.net/pcre">PCRE</a></li>
-<li><a href="http://php.net/manual/book.filter.php">Data filtering</a></li>
-<li><a href="http://php.net/tidy">Tidy for PHP</a></li>
-<li><a href="http://php.net/curl">cURL</a></li>
-<li><a href="http://www.php.net/manual/en/filesystem.configuration.php#ini.allow-url-fopen">allow_url_fopen</a></li>
-<li><a href="http://php.net/manual/en/book.gettext.php">gettext</a></li>
-</ul>
-<p>To ensure that your server has all the prerequisites, you can run the file <code>wallabag_compatibility_test.php</code> that is located in the <code>install</code> directory of wallabag.</p>
-<h2>Installation of the dependencies</h2>
-<p>In order to work properly, wallabag needs some dependencies. To install them, you have to use <code>composer</code>. In your wallabag folder, run the following commands:</p>
-<pre><code>curl -s http://getcomposer.org/installer | php
-php composer.phar install</code></pre>
-<p>If you can't install <code>composer</code> (In order to work properly, Wallabag needs some dependencies), we provide you a <a href="http://wllbg.org/vendor">vendor.zip</a> file to unpack in your wallabag directory. </p>
-<h2>Permissions</h2>
-<p>Your web server needs a writing access in <code>assets</code>, <code>cache</code> and <code>db</code> directory. Otherwise, a message will report that the installation is impossible.</p>
-<h2>Installation of wallabag. At last.</h2>
-<p>Access to wallabag from your web browser. If your server is correctly configured, you reach the setup screen.  </p>
-<p>Fill your database type (<code>sqlite</code>, <code>mysql</code> or <code>postgresql</code>) and finally the information for your user account.</p>
-<p>wallabag is now installed. </p>
-<h2>Login</h2>
-<p>From your web browser, you reach the login screen : fill your username and your password to connect to your account.</p>
-<p>Enjoy!</p>                            
-                        </article>
-                    </div>
-                </div>
-            </div>
-        </div>
-    
-        
-
-    <!-- jQuery -->
-            <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-        <script>
-            if (typeof jQuery == 'undefined')
-                document.write(unescape("%3Cscript src='../../js/jquery-1.11.0.min.js' type='text/javascript'%3E%3C/script%3E"));
-        </script>
-    
-    <!-- hightlight.js -->
-    <script src="../../js/highlight.min.js"></script>
-    <script>hljs.initHighlightingOnLoad();</script>
-
-    <!-- JS -->
-    
-    <!-- Front end file editor -->
-        <script src="../../js/custom.js"></script>
-    <!--[if lt IE 9]>
-        <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-</body>
-</html>
-

docs/en/User_documentation/Hidden_options.html

@@ -1,116 +0,0 @@
-<!DOCTYPE html>
-<!--[if lt IE 7]>       <html class="no-js ie6 oldie" lang="en"> <![endif]-->
-<!--[if IE 7]>          <html class="no-js ie7 oldie" lang="en"> <![endif]-->
-<!--[if IE 8]>          <html class="no-js ie8 oldie" lang="en"> <![endif]-->
-<!--[if gt IE 8]><!-->  <html class="no-js" lang="en"> <!--<![endif]-->
-<head>
-    <title>Hidden options</title>
-    <meta charset="utf-8">
-    <meta name="description" content="Documentation for wallabag" />
-    <meta name="author" content="Nicolas Lœuillet">
-    <link rel="icon" href="../../templates/default/themes/daux-blue/img/favicon-blue.png" type="image/x-icon">
-    <!-- Mobile -->
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <!-- Font -->
-    
-    <!-- CSS -->
-    <link href='../../templates/default/themes/daux-blue/css/daux-blue.css' rel='stylesheet' type='text/css'>
-</head>
-<body>
-            <!-- Docs -->
-                <div class="container-fluid fluid-height wrapper">
-            <div class="navbar navbar-fixed-top hidden-print">
-                <div class="container-fluid">
-                    <a class="brand navbar-brand pull-left" href="../../index.html">wallabag</a>
-                    <p class="navbar-text pull-right">Generated by <a href="http://daux.io">Daux.io</a></p>
-                </div>
-            </div>
-            <div class="row columns content">
-                <div class="left-column article-tree col-sm-3 hidden-print">
-                    <!-- For Mobile -->
-                    <div class="responsive-collapse">
-                        <button type="button" class="btn btn-sidebar" id="menu-spinner-button">
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                        </button>
-                    </div>
-                    <div id="sub-nav-collapse" class="sub-nav-collapse">
-                        <!-- Navigation -->
-                        <ul class="nav nav-list"><li><a href="../../en/Getting_started.html">Getting started</a></li><li><a href="../../en/Help_wallabag.html">Help wallabag</a></li><li class="open"><a href="#" class="aj-nav folder">User documentation</a><ul class="nav nav-list"><li><a href="../../en/User_documentation/Download_and_install.html">Download and install</a></li><li><a href="../../en/User_documentation/Save_your_first_article.html">Save your first article</a></li><li><a href="../../en/User_documentation/Configure_wallabag.html">Configure wallabag</a></li><li class="active"><a href="../../en/User_documentation/Hidden_options.html">Hidden options</a></li></ul></li></ul>                                                    <div class="well well-sidebar">
-
-                                <!-- Links -->
-                                <a href="https://www.wallabag.org/downloads" target="_blank">Download</a><br><a href="https://github.com/wallabag/wallabag" target="_blank">GitHub Repo</a><br><a href="http://support.wallabag.org" target="_blank">Help</a><br><a href="https://github.com/wallabag/documentation/graphs/contributors" target="_blank">Documentation contributors</a><br>                                
-                                <!-- Twitter -->
-                                                            </div>
-                                            </div>
-                </div>
-                <div class="right-column  content-area col-sm-9">
-                    <div class="content-page">
-                        <article>
-                                                            <div class="page-header sub-header clearfix">
-                                    <h1>Hidden options                                                                                <a href="https://github.com/wallabag/documentation/blob/master/en/02_User_documentation/14_Hidden_options.md" class="btn">Fix this page</a>                                    </h1>
-                                    <span style="float: left; font-size: 10px; color: gray;">
-                                        Sunday, November 16, 2014                                    </span>
-                                    <span style="float: right; font-size: 10px; color: gray;">
-                                        9:22 PM                                    </span>
-                                </div>
-                            
-                            <h2>Be careful</h2>
-<p><strong>Attention</strong>, this part is for advanced users only. We'll edit an important file of wallabag, <code>inc/poche/config.inc.php</code>, please make a backup of this file before changes.<br />
-<strong>If you make a mistake while editing a wallabag file, your application may be broken.</strong></p>
-<p>This file is created when wallabag is installed.<br />
-Please first install wallabag, make a backup of this file and open it with <del>Sublime Text</del> your favorite editor.</p>
-<p>In this file are defined some parameters that you can't change on the wallabag <strong>configuration</strong> page. </p>
-<h2>Advanced options</h2>
-<p>Each parameter is defined like this:</p>
-<pre><code>@define ('PARAMETER_NAME', 'Parameter value');</code></pre>
-<p>For each line, you can only change <code>Parameter value</code> part. </p>
-<p>TODO explain all the following parameters</p>
-<p>Here are all the parameters you can change: </p>
-<ul>
-<li><code>HTTP_PORT</code> (default value is <code>80</code>): Expected value: a digit.</li>
-<li><code>SSL_PORT</code> (default value is <code>443</code>): Expected value: a digit. </li>
-<li><code>DEBUG_POCHE</code> (default value is <code>FALSE</code>): Expected values: <code>TRUE</code> or <code>FALSE</code>.</li>
-<li><code>DOWNLOAD_PICTURES</code> (default value is <code>FALSE</code>): Expected values: <code>TRUE</code> or <code>FALSE</code>.</li>
-<li><code>SHARE_TWITTER</code> (default value is <code>TRUE</code>): Expected values: <code>TRUE</code> or <code>FALSE</code>.</li>
-<li><code>SHARE_MAIL</code> (par défaut, <code>TRUE</code>): Expected values: <code>TRUE</code> or <code>FALSE</code>.</li>
-<li><code>SHARE_SHAARLI</code> (default value is <code>FALSE</code>): Expected values: <code>TRUE</code> or <code>FALSE</code>.</li>
-<li><code>SHAARLI_URL</code> (default value is <code>'http://myshaarliurl.com'</code>): Expected value: your Shaarli URL. </li>
-<li><code>FLATTR</code> (default value is <code>TRUE</code>): Expected values: <code>TRUE</code> or <code>FALSE</code>.</li>
-<li><code>SHOW_PRINTLINK</code> (default value is <code>'1'</code>): Expected values: <code>'0'</code> to disable, <code>'1'</code> to enable.</li>
-<li><code>SHOW_READPERCENT</code> (default value is <code>'1'</code>): <code>'0'</code> to disable, <code>'1'</code> to enable.</li>
-<li><code>PAGINATION</code> (default value is <code>'12'</code>): Expected value: a digit. </li>
-</ul>                            
-                        </article>
-                    </div>
-                </div>
-            </div>
-        </div>
-    
-        
-
-    <!-- jQuery -->
-            <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-        <script>
-            if (typeof jQuery == 'undefined')
-                document.write(unescape("%3Cscript src='../../js/jquery-1.11.0.min.js' type='text/javascript'%3E%3C/script%3E"));
-        </script>
-    
-    <!-- hightlight.js -->
-    <script src="../../js/highlight.min.js"></script>
-    <script>hljs.initHighlightingOnLoad();</script>
-
-    <!-- JS -->
-    
-    <!-- Front end file editor -->
-        <script src="../../js/custom.js"></script>
-    <!--[if lt IE 9]>
-        <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-</body>
-</html>
-

docs/en/User_documentation/Save_your_first_article.html

@@ -1,138 +0,0 @@
-<!DOCTYPE html>
-<!--[if lt IE 7]>       <html class="no-js ie6 oldie" lang="en"> <![endif]-->
-<!--[if IE 7]>          <html class="no-js ie7 oldie" lang="en"> <![endif]-->
-<!--[if IE 8]>          <html class="no-js ie8 oldie" lang="en"> <![endif]-->
-<!--[if gt IE 8]><!-->  <html class="no-js" lang="en"> <!--<![endif]-->
-<head>
-    <title>Save your first article</title>
-    <meta charset="utf-8">
-    <meta name="description" content="Documentation for wallabag" />
-    <meta name="author" content="Nicolas Lœuillet">
-    <link rel="icon" href="../../templates/default/themes/daux-blue/img/favicon-blue.png" type="image/x-icon">
-    <!-- Mobile -->
-    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-
-    <!-- Font -->
-    
-    <!-- CSS -->
-    <link href='../../templates/default/themes/daux-blue/css/daux-blue.css' rel='stylesheet' type='text/css'>
-</head>
-<body>
-            <!-- Docs -->
-                <div class="container-fluid fluid-height wrapper">
-            <div class="navbar navbar-fixed-top hidden-print">
-                <div class="container-fluid">
-                    <a class="brand navbar-brand pull-left" href="../../index.html">wallabag</a>
-                    <p class="navbar-text pull-right">Generated by <a href="http://daux.io">Daux.io</a></p>
-                </div>
-            </div>
-            <div class="row columns content">
-                <div class="left-column article-tree col-sm-3 hidden-print">
-                    <!-- For Mobile -->
-                    <div class="responsive-collapse">
-                        <button type="button" class="btn btn-sidebar" id="menu-spinner-button">
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                        </button>
-                    </div>
-                    <div id="sub-nav-collapse" class="sub-nav-collapse">
-                        <!-- Navigation -->
-                        <ul class="nav nav-list"><li><a href="../../en/Getting_started.html">Getting started</a></li><li><a href="../../en/Help_wallabag.html">Help wallabag</a></li><li class="open"><a href="#" class="aj-nav folder">User documentation</a><ul class="nav nav-list"><li><a href="../../en/User_documentation/Download_and_install.html">Download and install</a></li><li class="active"><a href="../../en/User_documentation/Save_your_first_article.html">Save your first article</a></li><li><a href="../../en/User_documentation/Configure_wallabag.html">Configure wallabag</a></li><li><a href="../../en/User_documentation/Hidden_options.html">Hidden options</a></li></ul></li></ul>                                                    <div class="well well-sidebar">
-
-                                <!-- Links -->
-                                <a href="https://www.wallabag.org/downloads" target="_blank">Download</a><br><a href="https://github.com/wallabag/wallabag" target="_blank">GitHub Repo</a><br><a href="http://support.wallabag.org" target="_blank">Help</a><br><a href="https://github.com/wallabag/documentation/graphs/contributors" target="_blank">Documentation contributors</a><br>                                
-                                <!-- Twitter -->
-                                                            </div>
-                                            </div>
-                </div>
-                <div class="right-column  content-area col-sm-9">
-                    <div class="content-page">
-                        <article>
-                                                            <div class="page-header sub-header clearfix">
-                                    <h1>Save your first article                                                                                <a href="https://github.com/wallabag/documentation/blob/master/en/02_User_documentation/03_Save_your_first_article.md" class="btn">Fix this page</a>                                    </h1>
-                                    <span style="float: left; font-size: 10px; color: gray;">
-                                        Sunday, November 16, 2014                                    </span>
-                                    <span style="float: right; font-size: 10px; color: gray;">
-                                        9:22 PM                                    </span>
-                                </div>
-                            
-                            <h1>Save your first article</h1>
-<p>Once connected on wallabag, you have many ways to save an article.</p>
-<h2>From the web application</h2>
-<p>Let's see first how to do from the web application. In the menu, you have a link <strong>save a link</strong>. Clicking on it, a form shows up : you simply have to type the web adress of the article you want to save.</p>
-<p>Confirm to store the content of the article.</p>
-<p>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 <em>DOWNLOAD_PICTURES</em>. Read the chapter on hidden options for more information. </p>
-<h2>From the bookmarklet</h2>
-<p>From <a href="http://fr.wikipedia.org/wiki/Bookmarklet">Wikipedia's definition</a></p>
-<blockquote>
-<p>A bookmarklet is a <a href="http://en.wikipedia.org/wiki/Internet_bookmark">bookmark</a> stored in a <a href="http://en.wikipedia.org/wiki/Web_browser">web browser</a> that contains <a href="http://en.wikipedia.org/wiki/JavaScript">JavaScript</a>commands to extend the browser's functionality.</p>
-<p>Bookmarklets are unobtrusive scripts stored as the URL of a bookmark in a web browser or as a hyperlink on a web page.</p>
-<p>When clicked, a bookmarklet performs some function, one of a wide variety such as a search query or data extraction. Bookmarklets are usually <a href="http://en.wikipedia.org/wiki/Computer_program">JavaScript programs</a>.</p>
-</blockquote>
-<p>From the wallabag's menu, click on <strong>settings</strong>. 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.</p>
-<h2>From your smartphone</h2>
-<h3>Above all else</h3>
-<p>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 tokken. Read the chapter on RSS feeds for more information.</p>
-<h3>Android</h3>
-<h4>Installation and configuration</h4>
-<p>You can download the android application from the <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche">Google Play Store</a> and from <a href="https://f-droid.org/app/fr.gaulupeau.apps.InThePoche">F-droid</a>. It's the exact same application on those two stores.</p>
-<p>Once installed, start the application, go to the <strong>settings</strong> part et fill in the <strong>URL (complete address of your wallabag installation or your Framabag account)</strong> and <strong>User ID (in most cases, you'll have to put 1)</strong> 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 <strong>Token</strong> (enter properly all the token's letters as seen in the settings part of wallabag).</p>
-<h4>Saving of an article</h4>
-<p>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 <strong>Share</strong> menu : you'll find a <strong>Bag it !</strong> entry which will add your article in wallabag.</p>
-<h4>Reading</h4>
-<p>When you open the application, click on Synchronize : your recently saved articles will be downloaded on your smartphone.</p>
-<p>You don't need an internet connection anymore : click on <strong>List articles</strong> to start your reading.</p>
-<p>At the end of each article, a <strong>Mark as read</strong> button allows you to archive the article.</p>
-<p>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.</p>
-<h3>iOS</h3>
-<h4>Installation and configuration</h4>
-<p>TODO</p>
-<h4>Utilization</h4>
-<p>TODO</p>
-<h3>Windows Phone</h3>
-<h4>Installation and configuration</h4>
-<p>You can download the Windows Phone application from the <a href="http://www.windowsphone.com/fr-fr/store/app/wallabag/ff890514-348c-4d0b-9b43-153fff3f7450">Windows Store</a> or directly from your smartphone's Store.</p>
-<p>Once installed, the application will show you a notification on the first launch, asking the configuration of your wallabag server. Go to the <strong>Settings</strong> part of the application by pressing the three dots menu at the bottom of the screen, then fill in the <strong>URL (complete address of your wallabag installation or your Framabag account)</strong> and <strong>User ID (in most cases, you'll have to put 1)</strong> fields.</p>
-<p>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 <strong>Token</strong> (enter properly all the token's letters as seen in the setting part of wallabag).</p>
-<h2>From your web browser</h2>
-<h3>Firefox</h3>
-<p>Download the Firefox add-on on <a href="https://addons.mozilla.org/firefox/addon/wallabag/">addons.mozilla.org</a> and install it like any other Firefox add-on.</p>
-<p>In the add-on's settings, fill the complete URL of your installation of wallabag or your Framabag account.</p>
-<p>Personalize the Firefox toolbar to add wallabag (<strong>W</strong> 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.</p>
-<h3>Chrome</h3>
-<p>Download the Chrome add-on <a href="https://chrome.google.com/webstore/detail/wallabag/bepdcjnnkglfjehplaogpoonpffbdcdj">on the dedicated website</a> and install it like any other Chrome add-on.</p>
-<p>In the add-on's settings, fill the complete URL of your installation of wallabag or your Framabag account.</p>
-<p>During the addon's installation, a new icon appear in Chrome toolbar (a <strong>W</strong> 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.</p>                            
-                        </article>
-                    </div>
-                </div>
-            </div>
-        </div>
-    
-        
-
-    <!-- jQuery -->
-            <script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>
-        <script>
-            if (typeof jQuery == 'undefined')
-                document.write(unescape("%3Cscript src='../../js/jquery-1.11.0.min.js' type='text/javascript'%3E%3C/script%3E"));
-        </script>
-    
-    <!-- hightlight.js -->
-    <script src="../../js/highlight.min.js"></script>
-    <script>hljs.initHighlightingOnLoad();</script>
-
-    <!-- JS -->
-    
-    <!-- Front end file editor -->
-        <script src="../../js/custom.js"></script>
-    <!--[if lt IE 9]>
-        <script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-
-</body>
-</html>
-

docs/en/conf.py

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

docs/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

@@ -0,0 +1,46 @@
+wallabag documentation
+======================
+
+.. image:: ../img/wallabag.png
+   :alt: wallabag logo
+   :align: center
+
+**wallabag** is a read-it-later application: it saves a web page by
+keeping content only. Elements like navigation or ads are deleted.
+
+.. note::
+
+    This documentation is about wallabag v2. If you want to read documentation for wallabag v1, `please have a look here <https://github.com/wallabag/documentation>`__.
+
+The main documentation for this application is organized into a couple sections:
+
+* :ref:`user-docs`
+* :ref:`dev-docs`
+
+.. _user-docs:
+
+.. toctree::
+   :maxdepth: 2
+   :caption: User documentation
+
+   user/installation
+   user/create_account
+   user/login
+   user/configuration
+   user/first_article
+   user/errors_during_fetching
+   user/annotations
+   user/import
+   user/download_articles
+   user/filters
+   user/tags
+
+.. _dev-docs:
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Developer documentation
+
+   developer/docker
+   developer/translate
+   developer/maintenance

docs/en/requirements.txt

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

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

@@ -0,0 +1,111 @@
+Configuration
+=============
+
+Now you're logged in, it's time to configure your account as you want.
+
+Click on ``Config`` menu. You have five tabs: ``Settings``, ``RSS``,
+``User information``, ``Password`` and ``Tagging rules``.
+
+Settings
+--------
+
+Theme
+~~~~~
+
+wallabag is customizable. You can choose your prefered theme here. You can also
+create a new one, a chapter will be dedicated for this. The default theme is
+``Material``, it's the theme used in the documentation screenshots.
+
+Items per page
+~~~~~~~~~~~~~~
+
+You can change the number of articles displayed on each page.
+
+Language
+~~~~~~~~
+
+You can change the language of wallabag interface. You need to logout for this change
+to take effect.
+
+RSS
+---
+
+wallabag provides RSS feeds for each article status: unread, starred and archive.
+
+Firstly, you need to create a personal token: click on ``Create your token``.
+It's possible to change your token by clicking on ``Reset your token``.
+
+Now you have three links, one for each status: add them into your favourite RSS reader.
+
+You can also define how many articles you want in each RSS feed (default value: 50).
+
+User information
+----------------
+
+You can change your name, your email address and enable ``Two factor authentication``.
+
+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.
+
+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.
+
+.. image:: ../../img/user/2FA_form.png
+    :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.
+
+Password
+--------
+
+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

@@ -0,0 +1,46 @@
+Create an account
+=================
+
+On the login page, click on ``Register`` button.
+
+.. image:: ../../img/user/registration_form.png
+   :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.
+
+.. 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.
+
+Your account is now activated.
+
+.. image:: ../../img/user/activated_account.png
+   :alt: Welcome on board!
+   :align: center
+
+Frequently asked questions
+--------------------------
+
+I can't valid the registration form
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Make sure that all fields are well filled:
+
+* valid email address
+* 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