aboutsummaryrefslogtreecommitdiffhomepage
path: root/docs/fr/user/import.rst
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into 2.2Jeremy Benoist2016-11-191-10/+80
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 :fr: documentationNicolas Lœuillet2016-11-171-11/+81
| |
| * Added help on config screenNicolas Lœuillet2016-11-171-1/+1
| |
* | Add docJeremy Benoist2016-11-061-0/+16
|/
* Fixed links on import pageNicolas Lœuillet2016-10-101-2/+2
|
* Add Instapaper docsJeremy Benoist2016-09-271-3/+14
|
* Added documentation for Readability migrationNicolas Lœuillet2016-09-011-4/+16
|
* Change documentation about Pocket importNicolas Lœuillet2016-05-051-1/+1
| | | | Fix wallabag/docker#8
* Move some parts in FAQNicolas Lœuillet2016-05-031-39/+2
|
* Documentation about filters (and some fixes in french documentationNicolas Lœuillet2016-03-031-3/+3
|
* import and first article french translationsNicolas Lœuillet2016-02-201-0/+83