aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* fix path for in install scriptsFoxMaSk2016-10-303-9/+9
* 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
|/ /
* | Merge pull request #2473 from pmichelazzo/masterJeremy Benoist2016-10-256-0/+532
|\ \
| * | Translated missed line 147Paulino Michelazzo2016-10-251-1/+1
| * | Fix Portuguese translationJeremy Benoist2016-10-211-2/+2
| * | Update translationPaulino Michelazzo2016-10-211-60/+60
| * | Update Portuguese translationsJeremy Benoist2016-10-201-9/+78
| * | Validate ALL translations filesJeremy Benoist2016-10-201-0/+2
| * | Update validators.pt.yml filePaulino Michelazzo2016-10-201-5/+5
| * | Update Portuguese (Brazilian) translationPaulino Michelazzo2016-10-191-0/+1
| * | Merge remote-tracking branch 'wallabag/master'Paulino Michelazzo2016-10-18459-20211/+144794
| |\ \
| * | | Portuguese (Brazilian) translationPaulino Michelazzo2016-10-184-0/+460
* | | | Merge pull request #2493 from bmillemathias/add_link_content_fetch_problemNicolas Lœuillet2016-10-241-1/+2
|\ \ \ \
| * | | | Removed the email partNicolas Lœuillet2016-10-241-1/+1
| * | | | Add relevant links to fetch content error pages.Baptiste Mille-Mathias2016-10-231-1/+2
|/ / / /
* | | | Merge pull request #2486 from wallabag/translate-backup-docJeremy Benoist2016-10-225-11/+63
|\ \ \ \
| * | | | Translate backup.rst to GermanJulian Oster2016-10-221-14/+14
| * | | | Added :fr: documentation for wallabag backupNicolas Lœuillet2016-10-225-11/+63
|/ / / /
* | | | Merge pull request #2484 from bmillemathias/fix_2479Nicolas Lœuillet2016-10-222-0/+27
|\ \ \ \
| * | | | Document what to backup in WallabagBaptiste Mille-Mathias2016-10-222-0/+27
* | | | | Merge pull request #2485 from bmillemathias/fix_android_documentationJeremy Benoist2016-10-221-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add missing words in the documentationBaptiste Mille-Mathias2016-10-221-1/+1
|/ / / /
* | | | Merge pull request #2481 from wallabag/some-fixesNicolas Lœuillet2016-10-2129-19/+68
|\ \ \ \
| * | | | Update Twitter cards descriptionJeremy Benoist2016-10-211-1/+1
| * | | | Update translation for piwik_hostJeremy Benoist2016-10-2113-13/+13
| * | | | Fix missing translationsJeremy Benoist2016-10-2111-0/+33
| * | | | Fix testJeremy Benoist2016-10-201-1/+1
| * | | | Requeue depending on producerJeremy Benoist2016-10-201-0/+12
| * | | | Avoid RabbitMQ consumer to loopJeremy Benoist2016-10-201-2/+3