Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Cleanup | Jeremy Benoist | 2016-11-03 | 7 | -29/+6 | |
* | | | Fix rest controller merge | Jeremy Benoist | 2016-11-03 | 4 | -0/+141 | |
* | | | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-11-03 | 60 | -1936/+2477 | |
|\| | | ||||||
| * | | Merge pull request #2530 from wallabag/add-doc-failed-load-external-entity | Nicolas Lœuillet | 2016-11-02 | 3 | -0/+21 | |
| |\ \ | ||||||
| | * | | 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 | |
| |/ / | ||||||
| * | | Merge pull request #2519 from Jibec/master | Jeremy Benoist | 2016-11-02 | 4 | -373/+373 | |
| |\ \ | ||||||
| | * | | wallabag is full lowercase | Jeremy Benoist | 2016-11-02 | 1 | -7/+7 | |
| | * | | Translation - French - tiny typo | Jean-Baptiste | 2016-10-31 | 1 | -1/+1 | |
| | * | | Translation - French - tiny escape correction | Jean-Baptiste | 2016-10-31 | 1 | -24/+24 | |
| | * | | Translation - French - tiny escape correction | Jean-Baptiste | 2016-10-31 | 1 | -1/+1 | |
| | * | | Translation update - French | Jean-Baptiste | 2016-10-30 | 1 | -4/+4 | |
| | * | | Translation update - French | Jean-Baptiste | 2016-10-30 | 2 | -367/+367 | |
| | * | | Translation update - French | Jean-Baptiste | 2016-10-30 | 0 | -0/+0 | |
| | * | | Translation update - French | Jean-Baptiste | 2016-10-30 | 1 | -1/+1 | |
| * | | | Merge pull request #2528 from Kdecherf/slashdot-cookie | Jeremy Benoist | 2016-11-01 | 1 | -0/+1 | |
| |\ \ \ | ||||||
| | * | | | Force user-agent for .slashdot.org | Kevin Decherf | 2016-11-01 | 1 | -0/+1 | |
| |/ / / | ||||||
| * | | | Merge pull request #2524 from lologhi/instapaper-cli-import | Nicolas Lœuillet | 2016-11-01 | 1 | -0/+3 | |
| |\ \ \ | ||||||
| | * | | | Add Instapaper to CLI import | Laurent | 2016-11-01 | 1 | -0/+3 | |
| |/ / / | ||||||
| * | | | Merge pull request #2521 from foxmask/master | Nicolas Lœuillet | 2016-10-31 | 3 | -9/+9 | |
| |\ \ \ | ||||||
| | * | | | fix path for in install scripts | FoxMaSk | 2016-10-30 | 3 | -3/+3 | |
| | * | | | fix path for in install scripts | FoxMaSk | 2016-10-30 | 3 | -9/+9 | |
| * | | | | Merge pull request #2520 from wallabag/config | Nicolas Lœuillet | 2016-10-31 | 6 | -22/+13 | |
| |\ \ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | Fix tests | Jeremy Benoist | 2016-10-30 | 1 | -10/+2 | |
| | * | | | Inject parameter instead of service | Jeremy Benoist | 2016-10-30 | 5 | -12/+11 | |
| |/ / / | ||||||
| * | | | Merge pull request #2518 from wallabag/docs-dev-3rd-party-by-strubbl | Thomas Citharel | 2016-10-30 | 3 | -3/+3 | |
| |\ \ \ | ||||||
| | * | | | docs: fix link to wallabag-stats project | Sven Fischer | 2016-10-30 | 3 | -3/+3 | |
| * | | | | Merge pull request #2514 from wallabag/docs-dev-3rd-party-by-strubbl | Nicolas Lœuillet | 2016-10-30 | 3 | -3/+6 | |
| |\| | | | ||||||
| | * | | | docs: update 3rd party projects by Strubbl | Sven Fischer | 2016-10-29 | 3 | -3/+6 | |
| |/ / / | ||||||
| * | | | Merge pull request #2513 from wallabag/update-capistrano-config | Jeremy Benoist | 2016-10-29 | 4 | -11/+8 | |
| |\ \ \ | ||||||
| | * | | | Updated Capistrano configuration | Nicolas Lœuillet | 2016-10-29 | 4 | -11/+8 | |
| * | | | | Merge pull request #2506 from wallabag/fix-export-with-tags | Nicolas Lœuillet | 2016-10-29 | 4 | -20/+50 | |
| |\ \ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | Added test for export by filtering with tag | Nicolas Lœuillet | 2016-10-29 | 1 | -0/+11 | |
| | * | | | Fixed entries export filtered with a tag | Nicolas Lœuillet | 2016-10-29 | 3 | -20/+39 | |
| |/ / / | ||||||
| * | | | Merge pull request #2509 from wallabag/explode-api-controller | Jeremy Benoist | 2016-10-29 | 7 | -1341/+1381 | |
| |\ \ \ | | |/ / | |/| | | ||||||
| | * | | Removed useless route | Nicolas Lœuillet | 2016-10-28 | 1 | -5/+0 | |
| | * | | Exploded WallabagRestController into many controllers | Nicolas Lœuillet | 2016-10-28 | 7 | -1341/+1386 | |
| |/ / | ||||||
| * | | Merge pull request #2508 from wallabag/fix-redis-rabbit-doc | Nicolas Lœuillet | 2016-10-27 | 6 | -6/+6 | |
| |\ \ | ||||||
| | * | | Added the whole path to parameters.yml file | Nicolas Lœuillet | 2016-10-27 | 6 | -6/+6 | |
| |/ / | ||||||
| * | | Merge pull request #2507 from wallabag/add-check-makefile | Nicolas Lœuillet | 2016-10-27 | 4 | -6/+31 | |
| |\ \ | ||||||
| | * | | Usage of composer.phar if it's found | Nicolas Lœuillet | 2016-10-27 | 4 | -5/+12 | |
| | * | | Added require.sh to check if composer is installed | Nicolas Lœuillet | 2016-10-27 | 4 | -3/+21 | |
| |/ / | ||||||
| * | | Merge pull request #2500 from wallabag/add-check-composer | Jeremy Benoist | 2016-10-27 | 2 | -1/+3 | |
| |\ \ | ||||||
| | * | | Added a check in Makefile to see if composer is installed | Nicolas Lœuillet | 2016-10-24 | 2 | -1/+3 | |
| * | | | Merge pull request #2504 from wallabag/change-page-title-filter-tags | Nicolas Lœuillet | 2016-10-26 | 16 | -15/+24 | |
| |\ \ \ | ||||||
| | * | | | Renamed variable for page title | Nicolas Lœuillet | 2016-10-26 | 3 | -9/+9 | |
| | * | | | Added tag label in the page title | Nicolas Lœuillet | 2016-10-26 | 16 | -15/+24 | |
| |/ / / |