aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
...
* | | CleanupJeremy Benoist2016-11-037-29/+6
* | | Fix rest controller mergeJeremy Benoist2016-11-034-0/+141
* | | Merge remote-tracking branch 'origin/master' into 2.2Jeremy Benoist2016-11-0360-1936/+2477
|\| |
| * | Merge pull request #2530 from wallabag/add-doc-failed-load-external-entityNicolas Lœuillet2016-11-023-0/+21
| |\ \
| | * | Update faq.rstJeremy Benoist2016-11-021-1/+1
| | * | update German faq.rstStrubbl2016-11-021-2/+2
| | * | update German faq.rstStrubbl2016-11-021-4/+4
| | * | Added more info about Doctrine / PHP bugNicolas Lœuillet2016-11-023-0/+6
| | * | Added documentation about failed to load external entity errorNicolas Lœuillet2016-11-023-0/+15
| |/ /
| * | Merge pull request #2519 from Jibec/masterJeremy Benoist2016-11-024-373/+373
| |\ \
| | * | wallabag is full lowercaseJeremy Benoist2016-11-021-7/+7
| | * | Translation - French - tiny typoJean-Baptiste2016-10-311-1/+1
| | * | Translation - French - tiny escape correctionJean-Baptiste2016-10-311-24/+24
| | * | Translation - French - tiny escape correctionJean-Baptiste2016-10-311-1/+1
| | * | Translation update - FrenchJean-Baptiste2016-10-301-4/+4
| | * | Translation update - FrenchJean-Baptiste2016-10-302-367/+367
| | * | Translation update - FrenchJean-Baptiste2016-10-300-0/+0
| | * | Translation update - FrenchJean-Baptiste2016-10-301-1/+1
| * | | Merge pull request #2528 from Kdecherf/slashdot-cookieJeremy Benoist2016-11-011-0/+1
| |\ \ \
| | * | | Force user-agent for .slashdot.orgKevin Decherf2016-11-011-0/+1
| |/ / /
| * | | Merge pull request #2524 from lologhi/instapaper-cli-importNicolas Lœuillet2016-11-011-0/+3
| |\ \ \
| | * | | Add Instapaper to CLI importLaurent2016-11-011-0/+3
| |/ / /
| * | | Merge pull request #2521 from foxmask/masterNicolas Lœuillet2016-10-313-9/+9
| |\ \ \
| | * | | fix path for in install scriptsFoxMaSk2016-10-303-3/+3
| | * | | fix path for in install scriptsFoxMaSk2016-10-303-9/+9
| * | | | Merge pull request #2520 from wallabag/configNicolas Lœuillet2016-10-316-22/+13
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix testsJeremy Benoist2016-10-301-10/+2
| | * | | Inject parameter instead of serviceJeremy Benoist2016-10-305-12/+11
| |/ / /
| * | | Merge pull request #2518 from wallabag/docs-dev-3rd-party-by-strubblThomas Citharel2016-10-303-3/+3
| |\ \ \
| | * | | docs: fix link to wallabag-stats projectSven Fischer2016-10-303-3/+3
| * | | | Merge pull request #2514 from wallabag/docs-dev-3rd-party-by-strubblNicolas Lœuillet2016-10-303-3/+6
| |\| | |
| | * | | docs: update 3rd party projects by StrubblSven Fischer2016-10-293-3/+6
| |/ / /
| * | | Merge pull request #2513 from wallabag/update-capistrano-configJeremy Benoist2016-10-294-11/+8
| |\ \ \
| | * | | Updated Capistrano configurationNicolas Lœuillet2016-10-294-11/+8
| * | | | Merge pull request #2506 from wallabag/fix-export-with-tagsNicolas Lœuillet2016-10-294-20/+50
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Added test for export by filtering with tagNicolas Lœuillet2016-10-291-0/+11
| | * | | Fixed entries export filtered with a tagNicolas Lœuillet2016-10-293-20/+39
| |/ / /
| * | | Merge pull request #2509 from wallabag/explode-api-controllerJeremy Benoist2016-10-297-1341/+1381
| |\ \ \ | | |/ / | |/| |
| | * | Removed useless routeNicolas Lœuillet2016-10-281-5/+0
| | * | Exploded WallabagRestController into many controllersNicolas Lœuillet2016-10-287-1341/+1386
| |/ /
| * | Merge pull request #2508 from wallabag/fix-redis-rabbit-docNicolas Lœuillet2016-10-276-6/+6
| |\ \
| | * | Added the whole path to parameters.yml fileNicolas Lœuillet2016-10-276-6/+6
| |/ /
| * | Merge pull request #2507 from wallabag/add-check-makefileNicolas Lœuillet2016-10-274-6/+31
| |\ \
| | * | Usage of composer.phar if it's foundNicolas Lœuillet2016-10-274-5/+12
| | * | Added require.sh to check if composer is installedNicolas Lœuillet2016-10-274-3/+21
| |/ /
| * | Merge pull request #2500 from wallabag/add-check-composerJeremy Benoist2016-10-272-1/+3
| |\ \
| | * | Added a check in Makefile to see if composer is installedNicolas Lœuillet2016-10-242-1/+3
| * | | Merge pull request #2504 from wallabag/change-page-title-filter-tagsNicolas Lœuillet2016-10-2616-15/+24
| |\ \ \
| | * | | Renamed variable for page titleNicolas Lœuillet2016-10-263-9/+9
| | * | | Added tag label in the page titleNicolas Lœuillet2016-10-2616-15/+24
| |/ / /