Wallabag - A self hostable application for saving web pages: Save and classify articles. Read them later. Freely.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add documentation about RSS paging	Jeremy Benoist	2016-11-20	1	-0/+3
\|
*	Merge remote-tracking branch 'origin/master' into 2.2	Jeremy Benoist	2016-11-19	1	-6/+4
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # .editorconfig # docs/de/index.rst # docs/de/user/import.rst # docs/en/index.rst # docs/en/user/configuration.rst # docs/en/user/import.rst # docs/fr/index.rst # docs/fr/user/import.rst # src/Wallabag/CoreBundle/Command/InstallCommand.php # src/Wallabag/CoreBundle/Resources/translations/messages.da.yml # src/Wallabag/CoreBundle/Resources/translations/messages.de.yml # src/Wallabag/CoreBundle/Resources/translations/messages.en.yml # src/Wallabag/CoreBundle/Resources/translations/messages.es.yml # src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml # src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml # src/Wallabag/CoreBundle/Resources/translations/messages.it.yml # src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml # src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml # src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml # src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml # src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml # src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig # web/bundles/wallabagcore/themes/baggy/css/style.min.css # web/bundles/wallabagcore/themes/baggy/js/baggy.min.js # web/bundles/wallabagcore/themes/material/css/style.min.css # web/bundles/wallabagcore/themes/material/js/material.min.js
\| *	Reordered documentation for German.	Julian Oster	2016-11-17	1	-2/+2
\| \|
\| *	Added help on config screen	Nicolas Lœuillet	2016-11-17	1	-4/+2
\| \|
* \|	update German configuration.rst	Strubbl	2016-11-16	1	-5/+4
\| \|
* \|	Added a configuration to define the redirection after archiving an entry	Nicolas Lœuillet	2016-11-16	1	-0/+9
\|/ \| \| \|	Fix #496
*	docs/de/user/configuration.rst: German fix for tagging rules docu	Sven Fischer	2016-10-14	1	-1/+1
\|
*	docs/de/user/configuration.rst: German fix for tagging rules docu	Sven Fischer	2016-10-14	1	-1/+1
\|
*	Added information about tagging rules in documentation	Nicolas Lœuillet	2016-10-14	1	-1/+1
\| \| \| \|	Fix #2060
*	translate documentation to German	Sven Fischer	2016-06-23	1	-0/+119