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 |
|
Nicolas Lœuillet
|
bb624c0269
|
Reordered 🇫🇷 documentation
|
2016-11-17 19:22:16 +01:00 |
|
Nicolas Lœuillet
|
540a9bc4a2
|
Added help on config screen
|
2016-11-17 09:22:39 +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 |
|
Jeremy Benoist
|
64a8781e45
|
Merge remote-tracking branch 'origin/master' into 2.2
|
2016-10-24 12:03:17 +02:00 |
|
Nicolas Lœuillet
|
8edb250caa
|
Added information about tagging rules in documentation
Fix #2060
|
2016-10-14 14:45:32 +02:00 |
|
Nicolas Lœuillet
|
bb0c78f4a6
|
Added check if there is only one user
Added translations and documentation
|
2016-10-08 13:27:18 +02:00 |
|
Sven Fischer
|
3247b90776
|
translate documentation to German
|
2016-06-23 09:15:50 +02:00 |
|
Nicolas Lœuillet
|
78becd5401
|
Fix documentation and add help message in Baggy
|
2016-03-18 12:36:52 +01:00 |
|
Nicolas Lœuillet
|
37b371726b
|
Translation and documentation
|
2016-03-14 13:01:32 +01:00 |
|
Nicolas Lœuillet
|
3495f78d77
|
French translation for documentation
|
2016-02-20 08:39:08 +01:00 |
|
Nicolas Lœuillet
|
a42938f42c
|
documentation cleaning
|
2016-01-09 13:50:45 +01:00 |
|
Nicolas Lœuillet
|
59e91bc893
|
add docs
|
2015-10-21 14:14:51 +02:00 |
|