Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-11-19 | 64 | -1428/+1709 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 | |||||
| * | Undo translation of 'in english'. | Julian Oster | 2016-11-18 | 1 | -1/+1 | |
| | | ||||||
| * | Reordered documentation for German. | Julian Oster | 2016-11-17 | 19 | -485/+545 | |
| | | ||||||
| * | Update translation of link to german translation. | Julian Oster | 2016-11-17 | 2 | -2/+2 | |
| | | ||||||
| * | Reordered :fr: documentation | Nicolas Lœuillet | 2016-11-17 | 27 | -547/+654 | |
| | | ||||||
| * | Reordered documentation | Nicolas Lœuillet | 2016-11-17 | 18 | -389/+485 | |
| | | ||||||
| * | Added help on config screen | Nicolas Lœuillet | 2016-11-17 | 5 | -14/+8 | |
| | | ||||||
| * | fix #2582 - Nginx config: disable all other PHP file from symphony | Olivier DOSSMANN | 2016-11-14 | 3 | -0/+18 | |
| | | | | | | | | | | | | | | Regarding https://www.nginx.com/resources/wiki/start/topics/recipes/symfony/ we need to limit access to config.php and make_dev.php files from Nginx. That's why we return 404 error page for these files. | |||||
| * | Updated default parameters.yml file in documentation | Nicolas Lœuillet | 2016-11-06 | 3 | -0/+9 | |
| | | ||||||
| * | Update the upgrade documentation | Nicolas Lœuillet | 2016-11-05 | 3 | -18/+3 | |
| | | ||||||
| * | Prepare wallabag 2.1.3 :rocket: | Nicolas Lœuillet | 2016-11-04 | 3 | -6/+6 | |
| | | ||||||
* | | Added http_status in Entry entity | Nicolas Lœuillet | 2016-11-18 | 3 | -0/+15 | |
| | | ||||||
* | | 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 | 3 | -0/+27 | |
| | | | | | | | | Fix #496 | |||||
* | | Merge pull request #2548 from wallabag/pinboard | Jeremy Benoist | 2016-11-08 | 3 | -5/+73 | |
|\ \ | | | | | | | Add Pinboard import | |||||
| * | | docs: update german import.rst | Strubbl | 2016-11-07 | 1 | -21/+18 | |
| | | | ||||||
| * | | Add english doc into german one | Jeremy Benoist | 2016-11-06 | 1 | -5/+44 | |
| | | | ||||||
| * | | Add doc | Jeremy Benoist | 2016-11-06 | 2 | -0/+32 | |
| | | | ||||||
* | | | Removed Maintenance bundle | Nicolas Lœuillet | 2016-11-06 | 6 | -100/+0 | |
|/ / | ||||||
* | | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-11-03 | 12 | -9/+33 | |
|\| | ||||||
| * | Update faq.rst | Jeremy Benoist | 2016-11-02 | 1 | -1/+1 | |
| | | ||||||
| * | update German faq.rst | Strubbl | 2016-11-02 | 1 | -2/+2 | |
| | | ||||||
| * | update German faq.rst | Strubbl | 2016-11-02 | 1 | -4/+4 | |
| | | ||||||
| * | Added more info about Doctrine / PHP bug | Nicolas Lœuillet | 2016-11-02 | 3 | -0/+6 | |
| | | ||||||
| * | Added documentation about failed to load external entity error | Nicolas Lœuillet | 2016-11-02 | 3 | -0/+15 | |
| | | | | | | | | Fix #2529 | |||||
| * | docs: fix link to wallabag-stats project | Sven Fischer | 2016-10-30 | 3 | -3/+3 | |
| | | ||||||
| * | docs: update 3rd party projects by Strubbl | Sven Fischer | 2016-10-29 | 3 | -3/+6 | |
| | | ||||||
| * | Added the whole path to parameters.yml file | Nicolas Lœuillet | 2016-10-27 | 6 | -6/+6 | |
| | | ||||||
* | | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-10-24 | 23 | -60/+283 | |
|\| | ||||||
| * | Translate backup.rst to German | Julian Oster | 2016-10-22 | 1 | -14/+14 | |
| | | ||||||
| * | Added :fr: documentation for wallabag backup | Nicolas Lœuillet | 2016-10-22 | 5 | -11/+63 | |
| | | ||||||
| * | Merge pull request #2484 from bmillemathias/fix_2479 | Nicolas Lœuillet | 2016-10-22 | 2 | -0/+27 | |
| |\ | | | | | | | Document what to backup in Wallabag | |||||
| | * | Document what to backup in Wallabag | Baptiste Mille-Mathias | 2016-10-22 | 2 | -0/+27 | |
| | | | | | | | | | | | | Fixes issue #2479 | |||||
| * | | Add missing words in the documentation | Baptiste Mille-Mathias | 2016-10-22 | 1 | -1/+1 | |
| |/ | ||||||
| * | Removed MD5 hash in documentation | Nicolas Lœuillet | 2016-10-17 | 3 | -3/+3 | |
| | | ||||||
| * | Merge pull request #2446 from wallabag/fix-taggingrules-doc | Nicolas Lœuillet | 2016-10-15 | 3 | -3/+3 | |
| |\ | | | | | | | Added information about tagging rules in documentation | |||||
| | * | 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 | 3 | -3/+3 | |
| | | | | | | | | | | | | Fix #2060 | |||||
| * | | Fixed french and german doc homepages | Nicolas Lœuillet | 2016-10-14 | 2 | -4/+4 | |
| | | | ||||||
| * | | Mention example instance | Kaligule | 2016-10-14 | 1 | -1/+1 | |
| | | | | | | | | | Namely http://v2.wallabag.org/api/doc, so api methods can be looked up without installing wallabag first. | |||||
| * | | Merge pull request #2435 from wallabag/french-upgrade-doc | Nicolas Lœuillet | 2016-10-13 | 6 | -41/+81 | |
| |\ \ | | | | | | | | | Added french documentation for upgrade | |||||
| | * | | Added missing space | Nicolas Lœuillet | 2016-10-13 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | update German user/upgrade-2.1.x-2.1.y.rst | Sven Fischer | 2016-10-12 | 1 | -5/+5 | |
| | | | | ||||||
| | * | | update German user/upgrade-2.0.x-2.1.1 | Sven Fischer | 2016-10-12 | 1 | -14/+34 | |
| | | | | ||||||
| | * | | Added french documentation for upgrade | Nicolas Lœuillet | 2016-10-12 | 5 | -22/+42 | |
| | |/ | ||||||
| * | | Merge pull request #2434 from wallabag/parameters-doc | Nicolas Lœuillet | 2016-10-13 | 6 | -3/+106 | |
| |\ \ | | | | | | | | | Added french documentation for parameters.yml | |||||
| | * | | translate to German: user/parameters | Sven Fischer | 2016-10-12 | 2 | -0/+51 | |
| | | | | ||||||
| | * | | Added french documentation for parameters.yml | Nicolas Lœuillet | 2016-10-12 | 4 | -3/+55 | |
| | |/ | ||||||
| * / | Minor fixes in the english documentation | zertrin | 2016-10-13 | 3 | -7/+8 | |
| |/ |