Jeremy Benoist
|
68003139e1
|
Merge remote-tracking branch 'origin/master' into 2.2
# 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
|
2016-11-19 15:30:49 +01:00 |
|
Julian Oster
|
2bc5b74c73
|
Reordered documentation for German.
|
2016-11-17 19:22:21 +01:00 |
|
Nicolas Lœuillet
|
540a9bc4a2
|
Added help on config screen
|
2016-11-17 09:22:39 +01:00 |
|
Strubbl
|
5d52cc411b
|
update German configuration.rst
|
2016-11-16 23:07:34 +01:00 |
|
Nicolas Lœuillet
|
a42f38d9fb
|
Added a configuration to define the redirection after archiving an entry
Fix #496
|
2016-11-16 23:07:34 +01:00 |
|
Sven Fischer
|
f878902e6a
|
docs/de/user/configuration.rst: German fix for tagging rules docu
|
2016-10-14 23:48:50 +02:00 |
|
Sven Fischer
|
2752053f99
|
docs/de/user/configuration.rst: German fix for tagging rules docu
|
2016-10-14 23:47:37 +02:00 |
|
Nicolas Lœuillet
|
8edb250caa
|
Added information about tagging rules in documentation
Fix #2060
|
2016-10-14 14:45:32 +02:00 |
|
Sven Fischer
|
3247b90776
|
translate documentation to German
|
2016-06-23 09:15:50 +02:00 |
|