aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3292 from nclsHart/remove-getdoctrineJérémy Benoist2017-07-283-15/+0
|\
| * Remove unused method getDoctrine in several commandsNicolas Hart2017-07-273-15/+0
* | Merge pull request #3293 from nclsHart/remove-unused-useJérémy Benoist2017-07-281-1/+0
|\ \
| * | Remove unused use statement in install commandNicolas Hart2017-07-271-1/+0
| |/
* | Merge pull request #3280 from Simounet/fix/2.3-dateJérémy Benoist2017-07-252-2/+42
|\ \
| * | Add a test for updatePublishedAtJeremy Benoist2017-07-242-3/+43
| * | Fix updatePublishedAt on already parsed article's dateSimounet2017-07-241-1/+1
* | | Merge pull request #3284 from wallabag/travis-7.2Jérémy Benoist2017-07-241-0/+2
|\ \ \ | |/ / |/| |
| * | Testing on PHP 7.2Jérémy Benoist2017-07-241-0/+2
|/ /
* | Merge pull request #3283 from wallabag/fix-language-validationJérémy Benoist2017-07-242-7/+7
|\ \ | |/ |/|
| * CSJeremy Benoist2017-07-241-6/+6
| * Put the final URL in data testJeremy Benoist2017-07-241-1/+1
|/
* Merge pull request #3266 from egilli/export-domain-as-authorJérémy Benoist2017-07-114-6/+35
|\
| * Make updateAuthor code simpler to readÉtienne Gilli2017-07-101-8/+10
| * Use the article publisher as author for exportÉtienne Gilli2017-07-091-2/+9
| * Use the article domain as author for export filesÉtienne Gilli2017-07-084-6/+26
* | Merge pull request #3270 from wallabag/do-not-allow-html-apiJérémy Benoist2017-07-111-1/+1
|\ \
| * | Disallow html for templating formatsJeremy Benoist2017-07-091-1/+1
| |/
* | Merge pull request #3264 from wallabag/trait-timestampsJérémy Benoist2017-07-115-48/+36
|\ \
| * | Add EntityTimestampsTrait to handle datesJeremy Benoist2017-07-065-48/+36
| |/
* | Merge pull request #3267 from wallabag/revert-client-credentialsJérémy Benoist2017-07-092-22/+2
|\ \ | |/ |/|
| * Revert client_credentials grant typesJeremy Benoist2017-07-082-22/+2
|/
* Merge pull request #3256 from wallabag/fix-patchJérémy Benoist2017-07-055-167/+347
|\
| * CSJeremy Benoist2017-07-034-96/+95
| * Fix validateAndSetPreviewPictureJeremy Benoist2017-07-032-4/+36
| * Fix PATCH methodJeremy Benoist2017-07-035-121/+270
* | Merge pull request #3257 from wallabag/fix-mapping-entitiesJérémy Benoist2017-07-032-1/+8
|\ \ | |/ |/|
| * CSJeremy Benoist2017-07-032-2/+2
| * Fixed mapping entitiesJeremy Benoist2017-07-031-0/+7
|/
* Merge pull request #3258 from wallabag/cs-fixerJérémy Benoist2017-07-03171-2330/+2352
|\
| * Fix testsJeremy Benoist2017-07-039-39/+34
| * Add a real configuration for CS-FixerJeremy Benoist2017-07-01170-2312/+2339
|/
* Merge pull request #3245 from wallabag/fix-bcJérémy Benoist2017-06-292-8/+69
|\
| * CSJérémy Benoist2017-06-281-2/+2
| * Return null instead of falseJeremy Benoist2017-06-282-6/+30
| * Avoid BC on exists endpointJeremy Benoist2017-06-232-6/+43
* | Merge remote-tracking branch 'origin/master' into 2.3Jeremy Benoist2017-06-261-142/+142
|\ \ | |/ |/|
| * Merge pull request #3237 from matteocoder/masterJérémy Benoist2017-06-261-156/+160
| |\
| | * Fixed broken lines and added new linesmatteocoder2017-06-241-5/+7
| | * Merge pull request #1 from matteocoder/matteocoder-messages.itmatteocoder2017-06-171-154/+156
| |/|
| | * revised messages.itmatteocoder2017-06-171-154/+156
| |/
* | Merge pull request #3204 from wallabag/better-export-pageJérémy Benoist2017-06-2220-80/+479
|\ \
| * | Don't load js for nothing in prodThomas Citharel2017-06-221-2/+3
| * | Add css on share public pageThomas Citharel2017-06-229-3/+17
| * | Add share.scss fileJeremy Benoist2017-06-222-26/+407
| * | Fix linter issue on webpack config filesJeremy Benoist2017-06-223-42/+40
| * | add :it: shared_by_wallabag string translated by @matteocoderSven Fischer2017-06-221-1/+1
| * | adjust :de: shared_by_wallabag string to include user infoSven Fischer2017-06-221-1/+1
| * | Better export pageJeremy Benoist2017-06-228-9/+14
|/ /
* | Merge pull request #3241 from wallabag/fix-qr-code-transNicolas Lœuillet2017-06-2214-4/+16
|\ \