Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2524 from lologhi/instapaper-cli-import | Nicolas Lœuillet | 2016-11-01 | 1 | -0/+3 |
|\ | | | | | Add Instapaper to CLI import | ||||
| * | 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 the install scripts | ||||
| * | 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 |
|\ \ | |/ |/| | Inject parameter instead of service | ||||
| * | Fix tests | Jeremy Benoist | 2016-10-30 | 1 | -10/+2 |
| | | |||||
| * | Inject parameter instead of service | Jeremy Benoist | 2016-10-30 | 5 | -12/+11 |
|/ | | | | | We are injecting CraueConfig service when we only need to retrieve one or two values from it. Instead I discovered we can directly inject a value from a service in the service definition! | ||||
* | 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 | ||||
| * | 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 | ||||
| * | 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 | ||||
| * | 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 |
|\ \ | |/ |/| | Fixed entries export filtered with a tag | ||||
| * | 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 |
|/ | | | | Fix #2505 | ||||
* | Merge pull request #2509 from wallabag/explode-api-controller | Jeremy Benoist | 2016-10-29 | 7 | -1341/+1381 |
|\ | | | | | Exploded WallabagRestController into many controllers | ||||
| * | 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 |
|/ | | | | Fix #2503 | ||||
* | 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 | ||||
| * | 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 |
|\ | | | | | Added require.sh to check if composer is installed | ||||
| * | 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 | ||||
| * | Added a check in Makefile to see if composer is installed | Nicolas Lœuillet | 2016-10-24 | 2 | -1/+3 |
| | | | | | | | | Fix #2498 | ||||
* | | Merge pull request #2504 from wallabag/change-page-title-filter-tags | Nicolas Lœuillet | 2016-10-26 | 16 | -15/+24 |
|\ \ | | | | | | | Added tag label in the page title | ||||
| * | | 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 |
|/ / | | | | | | | Fix #2472 | ||||
* | | Merge pull request #2473 from pmichelazzo/master | Jeremy Benoist | 2016-10-25 | 6 | -0/+532 |
|\ \ | | | | | | | Portuguese (Brazilian) translation | ||||
| * | | Translated missed line 147 | Paulino Michelazzo | 2016-10-25 | 1 | -1/+1 |
| | | | |||||
| * | | Fix Portuguese translation | Jeremy Benoist | 2016-10-21 | 1 | -2/+2 |
| | | | |||||
| * | | Update translation | Paulino Michelazzo | 2016-10-21 | 1 | -60/+60 |
| | | | |||||
| * | | Update Portuguese translations | Jeremy Benoist | 2016-10-20 | 1 | -9/+78 |
| | | | |||||
| * | | Validate ALL translations files | Jeremy Benoist | 2016-10-20 | 1 | -0/+2 |
| | | | |||||
| * | | Update validators.pt.yml file | Paulino Michelazzo | 2016-10-20 | 1 | -5/+5 |
| | | | | | | | | | Some missed strings translated. | ||||
| * | | Update Portuguese (Brazilian) translation | Paulino Michelazzo | 2016-10-19 | 1 | -0/+1 |
| | | | | | | | | | | | | Adding the config.yml on the package. | ||||
| * | | Merge remote-tracking branch 'wallabag/master' | Paulino Michelazzo | 2016-10-18 | 459 | -20211/+144794 |
| |\ \ | |||||
| * | | | Portuguese (Brazilian) translation | Paulino Michelazzo | 2016-10-18 | 4 | -0/+460 |
| | | | | | | | | | | | | | | | | This the Portuguese (Brazilian) for the Wallaby v2. | ||||
* | | | | Merge pull request #2493 from bmillemathias/add_link_content_fetch_problem | Nicolas Lœuillet | 2016-10-24 | 1 | -1/+2 |
|\ \ \ \ | | | | | | | | | | | Add relevant links to fetch content error page | ||||
| * | | | | Removed the email part | Nicolas Lœuillet | 2016-10-24 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add relevant links to fetch content error pages. | Baptiste Mille-Mathias | 2016-10-23 | 1 | -1/+2 |
|/ / / / | | | | | | | | | | | | | We link to the troubleshooting guide and give the mail link. | ||||
* | | | | Merge pull request #2486 from wallabag/translate-backup-doc | Jeremy Benoist | 2016-10-22 | 5 | -11/+63 |
|\ \ \ \ | | | | | | | | | | | Added :fr: documentation for wallabag backup | ||||
| * | | | | Translate backup.rst to German | Julian Oster | 2016-10-22 | 1 | -14/+14 |
| | | | | | |||||
| * | | | | Added :fr: documentation for wallabag backup | Nicolas Lœuillet | 2016-10-22 | 5 | -11/+63 |
|/ / / / | |||||
* | | | | Merge pull request #2484 from bmillemathias/fix_2479 | Nicolas Lœuillet | 2016-10-22 | 2 | -0/+27 |
|\ \ \ \ | | | | | | | | | | | Document what to backup in Wallabag | ||||
| * | | | | Document what to backup in Wallabag | Baptiste Mille-Mathias | 2016-10-22 | 2 | -0/+27 |
| | | | | | | | | | | | | | | | | | | | | Fixes issue #2479 | ||||
* | | | | | Merge pull request #2485 from bmillemathias/fix_android_documentation | Jeremy Benoist | 2016-10-22 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix missing words in Android application documentation | ||||
| * | | | | Add missing words in the documentation | Baptiste Mille-Mathias | 2016-10-22 | 1 | -1/+1 |
|/ / / / |