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
|
2e389b0b90
|
Reordered documentation
|
2016-11-17 19:22:15 +01:00 |
|
Nicolas Lœuillet
|
540a9bc4a2
|
Added help on config screen
|
2016-11-17 09:22:39 +01:00 |
|
Jeremy Benoist
|
31151d70f2
|
Add doc
|
2016-11-06 21:23:38 +01:00 |
|
Nicolas Lœuillet
|
c15f083896
|
Fixed links on import page
|
2016-10-10 15:38:42 +02:00 |
|
Jeremy Benoist
|
a7dda1f2bf
|
Add Instapaper docs
|
2016-09-27 20:27:08 +02:00 |
|
Nicolas Lœuillet
|
dc9d76b490
|
Added documentation for Readability migration
|
2016-09-01 13:40:00 +02:00 |
|
Nicolas Lœuillet
|
e0f4f25fd6
|
Change documentation about Pocket import
Fix wallabag/docker#8
|
2016-05-05 13:55:39 +02:00 |
|
Nicolas Lœuillet
|
fa04bddd01
|
Move some parts in FAQ
|
2016-05-03 20:51:23 +02:00 |
|
Nicolas Lœuillet
|
8b197f27d8
|
import and first article french translations
|
2016-02-20 09:45:05 +01:00 |
|
Nicolas Lœuillet
|
f4243aa75f
|
Update import.rst
|
2016-02-01 14:22:19 +01:00 |
|
Nicolas Lœuillet
|
6785f4aa74
|
[#1590] Add JSON import from wallabag v2
|
2016-01-20 14:37:01 +01:00 |
|
Nicolas Lœuillet
|
a42938f42c
|
documentation cleaning
|
2016-01-09 13:50:45 +01:00 |
|
Nicolas Lœuillet
|
10b40f85d6
|
add docs for Import feature
|
2016-01-02 23:24:17 +01:00 |
|