aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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 configuration
| * 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
|\ \ | |/ |/| Fixed entries export filtered with a tag
| * 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
|/ | | | Fix #2505
* Merge pull request #2509 from wallabag/explode-api-controllerJeremy Benoist2016-10-297-1341/+1381
|\ | | | | Exploded WallabagRestController into many controllers
| * Removed useless routeNicolas Lœuillet2016-10-281-5/+0
| |
| * Exploded WallabagRestController into many controllersNicolas Lœuillet2016-10-287-1341/+1386
|/ | | | Fix #2503
* Merge pull request #2508 from wallabag/fix-redis-rabbit-docNicolas Lœuillet2016-10-276-6/+6
|\ | | | | Added the whole path to parameters.yml file
| * 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
|\ | | | | Added require.sh to check if composer is installed
| * 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 installed
| * Added a check in Makefile to see if composer is installedNicolas Lœuillet2016-10-242-1/+3
| | | | | | | | Fix #2498
* | Merge pull request #2504 from wallabag/change-page-title-filter-tagsNicolas Lœuillet2016-10-2616-15/+24
|\ \ | | | | | | Added tag label in the page title
| * | Renamed variable for page titleNicolas Lœuillet2016-10-263-9/+9
| | |
| * | Added tag label in the page titleNicolas Lœuillet2016-10-2616-15/+24
|/ / | | | | | | Fix #2472
* | Merge pull request #2473 from pmichelazzo/masterJeremy Benoist2016-10-256-0/+532
|\ \ | | | | | | Portuguese (Brazilian) translation
| * | 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
| | | | | | | | | Some missed strings translated.
| * | Update Portuguese (Brazilian) translationPaulino Michelazzo2016-10-191-0/+1
| | | | | | | | | | | | Adding the config.yml on the package.
| * | Merge remote-tracking branch 'wallabag/master'Paulino Michelazzo2016-10-18459-20211/+144794
| |\ \
| * | | Portuguese (Brazilian) translationPaulino Michelazzo2016-10-184-0/+460
| | | | | | | | | | | | | | | | This the Portuguese (Brazilian) for the Wallaby v2.
* | | | Merge pull request #2493 from bmillemathias/add_link_content_fetch_problemNicolas Lœuillet2016-10-241-1/+2
|\ \ \ \ | | | | | | | | | | Add relevant links to fetch content error page
| * | | | 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
|/ / / / | | | | | | | | | | | | We link to the troubleshooting guide and give the mail link.
* | | | Merge pull request #2486 from wallabag/translate-backup-docJeremy Benoist2016-10-225-11/+63
|\ \ \ \ | | | | | | | | | | Added :fr: documentation for wallabag backup
| * | | | 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 Wallabag
| * | | | Document what to backup in WallabagBaptiste Mille-Mathias2016-10-222-0/+27
| | | | | | | | | | | | | | | | | | | | Fixes issue #2479
* | | | | Merge pull request #2485 from bmillemathias/fix_android_documentationJeremy Benoist2016-10-221-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Fix missing words in Android application documentation
| * | | | 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
|\ \ \ \ | | | | | | | | | | Some fixes
| * | | | 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
| | | | | | | | | | | | | | | | | | | | Browser import can requeue message from `parseEntry` but we should take care of the way import are handled (depending on the producer)
| * | | | Avoid RabbitMQ consumer to loopJeremy Benoist2016-10-201-2/+3
| | | | | | | | | | | | | | | | | | | | When the `parseEntry` returns null it means the entry already exists in the database. Sending `false` as return, will requeue the message which will then loop forever.
| * | | | Translate dateJeremy Benoist2016-10-201-1/+4
| | | | | | | | | | | | | | | | | | | | I use a kind of hacky way to convert the user locale (defined with 2 letters, like `fr`) into a local with 5 letters (like `fr_FR`). I guess it should work on most of the case..
| * | | | Fix french translationJeremy Benoist2016-10-201-1/+1
| | |/ / | |/| |
* | | | Merge pull request #2482 from wallabag/avoid-bad-refreshNicolas Lœuillet2016-10-216-2/+53
|\ \ \ \ | |/ / / |/| | | If reload content failed, don’t update it
| * | | This test doesn’t require an internet connectionJeremy Benoist2016-10-201-2/+0
| | | |