aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2548 from wallabag/pinboardJeremy Benoist2016-11-0829-10/+672
|\
| * docs: update german import.rstStrubbl2016-11-071-21/+18
| * Use more explicit checkJeremy Benoist2016-11-071-2/+2
| * Add english doc into german oneJeremy Benoist2016-11-061-5/+44
| * Update messages.en.ymlStrubbl2016-11-061-1/+1
| * Update messages.de.ymlStrubbl2016-11-061-3/+3
| * Add docJeremy Benoist2016-11-062-0/+32
| * Fix testsJeremy Benoist2016-11-062-2/+2
| * Add Pinboard importJeremy Benoist2016-11-0424-2/+596
* | Merge pull request #2551 from wallabag/remove-maintenance-bundleJeremy Benoist2016-11-069-112/+0
|\ \ | |/ |/|
| * Removed Maintenance bundleNicolas Lœuillet2016-11-069-112/+0
|/
* Merge pull request #2541 from wallabag/mruminski-patch-1Jeremy Benoist2016-11-041-5/+5
|\
| * Update messages.pl.ymlMateusz Rumiński2016-11-041-5/+5
* | Merge pull request #2540 from wallabag/Quent-in-patch-1Thomas Citharel2016-11-041-19/+19
|\ \ | |/ |/|
| * Update of the OC versionQuent-in2016-11-041-19/+19
|/
* Merge pull request #2535 from wallabag/default-sort-2.2Jeremy Benoist2016-11-043-2/+59
|\
| * Add index into Table definitionJeremy Benoist2016-11-041-1/+5
| * Use created_at as default sortJeremy Benoist2016-11-042-1/+54
|/
* 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
| |/ /