aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |\ | | | | | | Added documentation about failed to load external entity error
| | * 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
| |/ | | | | | | Fix #2529
| * Merge pull request #2519 from Jibec/masterJeremy Benoist2016-11-024-373/+373
| |\ | | | | | | Translation update - French
| | * 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.org
| | * | Force user-agent for .slashdot.orgKevin Decherf2016-11-011-0/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | Slashdot replaces actual content with a form regarding cookies when requests originate from France. By forcing the user-agent, the warning seems to go away. Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | Merge pull request #2524 from lologhi/instapaper-cli-importNicolas Lœuillet2016-11-011-0/+3
| |\ \ | | | | | | | | Add Instapaper to CLI import
| | * | 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 the install scripts
| | * | 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
| |\ \ \ | | |/ / | |/| | Inject parameter instead of service
| | * | Fix testsJeremy Benoist2016-10-301-10/+2
| | | |
| | * | Inject parameter instead of serviceJeremy Benoist2016-10-305-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-strubblThomas Citharel2016-10-303-3/+3
| |\ \ | | | | | | | | docs: fix link to wallabag-stats project
| | * | 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 Strubbl
| | * | 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
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 01:16:28 +0000