Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | 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 | |
|\ \ | ||||||
| * | | Add :it: translation | Jérémy Benoist | 2017-06-22 | 1 | -1/+1 | |
| * | | Update polish | Mateusz Rumiński | 2017-06-22 | 1 | -3/+3 | |
| * | | Fix translations on QR code instructions | Thomas Citharel | 2017-06-22 | 14 | -2/+14 | |
* | | | Merge pull request #3227 from wallabag/oauth-client-credentials | Nicolas Lœuillet | 2017-06-22 | 2 | -4/+25 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Add client_credentials oAuth2 auth method | Thomas Citharel | 2017-06-14 | 2 | -4/+25 | |
* | | | Merge pull request #3207 from wallabag/tag-rss | Jérémy Benoist | 2017-06-21 | 31 | -103/+258 | |
|\ \ \ | ||||||
| * | | | Add all entries RSS feed and put links on tag page itself and baggy too | Thomas Citharel | 2017-06-21 | 21 | -45/+106 | |
| * | | | Fix typo | Jeremy Benoist | 2017-06-21 | 1 | -3/+3 | |
| * | | | add rss icon | Thomas Citharel | 2017-06-21 | 1 | -0/+3 | |
| * | | | Fix tests | Jeremy Benoist | 2017-06-21 | 1 | -1/+1 | |
| * | | | Fix getContainer in command | Jeremy Benoist | 2017-06-21 | 5 | -8/+7 | |
| * | | | Add RSS tags feeds | Jeremy Benoist | 2017-06-21 | 5 | -20/+117 | |
| * | | | User existing service instead of getDoctrine | Jeremy Benoist | 2017-06-21 | 8 | -37/+32 | |
|/ / / | ||||||
* | | | Merge pull request #2683 from wallabag/credentials-in-db | Jérémy Benoist | 2017-06-20 | 41 | -39/+1605 | |
|\ \ \ | ||||||
| * | | | Get rid of masked value in listing | Jeremy Benoist | 2017-06-20 | 2 | -6/+0 | |
| * | | | Fix reviews | Thomas Citharel | 2017-06-20 | 11 | -22/+43 | |
| * | | | Crypt site credential password | Jeremy Benoist | 2017-06-20 | 15 | -9/+169 | |
| * | | | Add a live test for restricted article | Jeremy Benoist | 2017-06-20 | 5 | -31/+81 |