Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3292 from nclsHart/remove-getdoctrine | Jérémy Benoist | 2017-07-28 | 3 | -15/+0 |
|\ | |||||
| * | Remove unused method getDoctrine in several commands | Nicolas Hart | 2017-07-27 | 3 | -15/+0 |
* | | Merge pull request #3293 from nclsHart/remove-unused-use | Jérémy Benoist | 2017-07-28 | 1 | -1/+0 |
|\ \ | |||||
| * | | Remove unused use statement in install command | Nicolas Hart | 2017-07-27 | 1 | -1/+0 |
| |/ | |||||
* | | Merge pull request #3280 from Simounet/fix/2.3-date | Jérémy Benoist | 2017-07-25 | 2 | -2/+42 |
|\ \ | |||||
| * | | Add a test for updatePublishedAt | Jeremy Benoist | 2017-07-24 | 2 | -3/+43 |
| * | | Fix updatePublishedAt on already parsed article's date | Simounet | 2017-07-24 | 1 | -1/+1 |
* | | | Merge pull request #3284 from wallabag/travis-7.2 | Jérémy Benoist | 2017-07-24 | 1 | -0/+2 |
|\ \ \ | |/ / |/| | | |||||
| * | | Testing on PHP 7.2 | Jérémy Benoist | 2017-07-24 | 1 | -0/+2 |
|/ / | |||||
* | | Merge pull request #3283 from wallabag/fix-language-validation | Jérémy Benoist | 2017-07-24 | 2 | -7/+7 |
|\ \ | |/ |/| | |||||
| * | CS | Jeremy Benoist | 2017-07-24 | 1 | -6/+6 |
| * | Put the final URL in data test | Jeremy Benoist | 2017-07-24 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #3266 from egilli/export-domain-as-author | Jérémy Benoist | 2017-07-11 | 4 | -6/+35 |
|\ | |||||
| * | Make updateAuthor code simpler to read | Étienne Gilli | 2017-07-10 | 1 | -8/+10 |
| * | Use the article publisher as author for export | Étienne Gilli | 2017-07-09 | 1 | -2/+9 |
| * | Use the article domain as author for export files | Étienne Gilli | 2017-07-08 | 4 | -6/+26 |
* | | Merge pull request #3270 from wallabag/do-not-allow-html-api | Jérémy Benoist | 2017-07-11 | 1 | -1/+1 |
|\ \ | |||||
| * | | Disallow html for templating formats | Jeremy Benoist | 2017-07-09 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #3264 from wallabag/trait-timestamps | Jérémy Benoist | 2017-07-11 | 5 | -48/+36 |
|\ \ | |||||
| * | | Add EntityTimestampsTrait to handle dates | Jeremy Benoist | 2017-07-06 | 5 | -48/+36 |
| |/ | |||||
* | | Merge pull request #3267 from wallabag/revert-client-credentials | Jérémy Benoist | 2017-07-09 | 2 | -22/+2 |
|\ \ | |/ |/| | |||||
| * | Revert client_credentials grant types | Jeremy Benoist | 2017-07-08 | 2 | -22/+2 |
|/ | |||||
* | Merge pull request #3256 from wallabag/fix-patch | Jérémy Benoist | 2017-07-05 | 5 | -167/+347 |
|\ | |||||
| * | CS | Jeremy Benoist | 2017-07-03 | 4 | -96/+95 |
| * | Fix validateAndSetPreviewPicture | Jeremy Benoist | 2017-07-03 | 2 | -4/+36 |
| * | Fix PATCH method | Jeremy Benoist | 2017-07-03 | 5 | -121/+270 |
* | | Merge pull request #3257 from wallabag/fix-mapping-entities | Jérémy Benoist | 2017-07-03 | 2 | -1/+8 |
|\ \ | |/ |/| | |||||
| * | CS | Jeremy Benoist | 2017-07-03 | 2 | -2/+2 |
| * | Fixed mapping entities | Jeremy Benoist | 2017-07-03 | 1 | -0/+7 |
|/ | |||||
* | Merge pull request #3258 from wallabag/cs-fixer | Jérémy Benoist | 2017-07-03 | 171 | -2330/+2352 |
|\ | |||||
| * | Fix tests | Jeremy Benoist | 2017-07-03 | 9 | -39/+34 |
| * | Add a real configuration for CS-Fixer | Jeremy Benoist | 2017-07-01 | 170 | -2312/+2339 |
|/ | |||||
* | Merge pull request #3245 from wallabag/fix-bc | Jérémy Benoist | 2017-06-29 | 2 | -8/+69 |
|\ | |||||
| * | CS | Jérémy Benoist | 2017-06-28 | 1 | -2/+2 |
| * | Return null instead of false | Jeremy Benoist | 2017-06-28 | 2 | -6/+30 |
| * | Avoid BC on exists endpoint | Jeremy Benoist | 2017-06-23 | 2 | -6/+43 |
* | | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-06-26 | 1 | -142/+142 |
|\ \ | |/ |/| | |||||
| * | Merge pull request #3237 from matteocoder/master | Jérémy Benoist | 2017-06-26 | 1 | -156/+160 |
| |\ | |||||
| | * | Fixed broken lines and added new lines | matteocoder | 2017-06-24 | 1 | -5/+7 |
| | * | Merge pull request #1 from matteocoder/matteocoder-messages.it | matteocoder | 2017-06-17 | 1 | -154/+156 |
| |/| | |||||
| | * | revised messages.it | matteocoder | 2017-06-17 | 1 | -154/+156 |
| |/ | |||||
* | | Merge pull request #3204 from wallabag/better-export-page | Jérémy Benoist | 2017-06-22 | 20 | -80/+479 |
|\ \ | |||||
| * | | Don't load js for nothing in prod | Thomas Citharel | 2017-06-22 | 1 | -2/+3 |
| * | | Add css on share public page | Thomas Citharel | 2017-06-22 | 9 | -3/+17 |
| * | | Add share.scss file | Jeremy Benoist | 2017-06-22 | 2 | -26/+407 |
| * | | Fix linter issue on webpack config files | Jeremy Benoist | 2017-06-22 | 3 | -42/+40 |
| * | | add :it: shared_by_wallabag string translated by @matteocoder | Sven Fischer | 2017-06-22 | 1 | -1/+1 |
| * | | adjust :de: shared_by_wallabag string to include user info | Sven Fischer | 2017-06-22 | 1 | -1/+1 |
| * | | Better export page | Jeremy Benoist | 2017-06-22 | 8 | -9/+14 |
|/ / | |||||
* | | Merge pull request #3241 from wallabag/fix-qr-code-trans | Nicolas Lœuillet | 2017-06-22 | 14 | -4/+16 |
|\ \ |