Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix testsnotifications | Thomas Citharel | 2017-07-09 | 1 | -1/+1 |
| | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | Add migration | Thomas Citharel | 2017-07-09 | 1 | -0/+63 |
| | |||||
* | Notifications | Thomas Citharel | 2017-07-09 | 68 | -16/+1701 |
| | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | Merge pull request #3256 from wallabag/fix-patch | Jérémy Benoist | 2017-07-05 | 5 | -167/+347 |
|\ | | | | | Fix PATCH method | ||||
| * | CS | Jeremy Benoist | 2017-07-03 | 4 | -96/+95 |
| | | |||||
| * | Fix validateAndSetPreviewPicture | Jeremy Benoist | 2017-07-03 | 2 | -4/+36 |
| | | | | | | | | Which wasn't covered by a test! | ||||
| * | Fix PATCH method | Jeremy Benoist | 2017-07-03 | 5 | -121/+270 |
| | | | | | | | | | | The PATCH method for the entry should only update what user sent to us and not the whole entry as it was before. Also, sending tags when patching an entry will now remove all current tags & assocatied new ones. | ||||
* | | Merge pull request #3257 from wallabag/fix-mapping-entities | Jérémy Benoist | 2017-07-03 | 2 | -1/+8 |
|\ \ | |/ |/| | Fixed mapping entities | ||||
| * | CS | Jeremy Benoist | 2017-07-03 | 2 | -2/+2 |
| | | |||||
| * | Fixed mapping entities | Jeremy Benoist | 2017-07-03 | 1 | -0/+7 |
|/ | | | | | | There were this error in the console: > The association Wallabag\CoreBundle\Entity\SiteCredential#user refers to the inverse side field Wallabag\UserBundle\Entity\User#site_credentials which does not exist. | ||||
* | Merge pull request #3258 from wallabag/cs-fixer | Jérémy Benoist | 2017-07-03 | 171 | -2330/+2352 |
|\ | | | | | Add a real configuration for CS-Fixer | ||||
| * | 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 |
|\ | | | | | Avoid BC on exists endpoint | ||||
| * | 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 |
| |\ | | | | | | | Revised messages.it.yml file | ||||
| | * | Fixed broken lines and added new lines | matteocoder | 2017-06-24 | 1 | -5/+7 |
| | | | | | | | | | In addition to fixing broken lines, I've also added a couple of lines from recent PRs. | ||||
| | * | Merge pull request #1 from matteocoder/matteocoder-messages.it | matteocoder | 2017-06-17 | 1 | -154/+156 |
| |/| | | | | | | | revised messages.it | ||||
| | * | 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 |
|\ \ | | | | | | | Better public sharing page | ||||
| * | | 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 |
| | | | | | | | | | | | | Still needs to include it in the twig template | ||||
| * | | 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 |
|/ / | | | | | | | I’ve increase the width of the page 900px, 600px looks too small for me. Should we use something like 90% instead? | ||||
* | | Merge pull request #3241 from wallabag/fix-qr-code-trans | Nicolas Lœuillet | 2017-06-22 | 14 | -4/+16 |
|\ \ | | | | | | | Fix translations on QR code instructions | ||||
| * | | Add :it: translation | Jérémy Benoist | 2017-06-22 | 1 | -1/+1 |
| | | | |||||
| * | | Update polish | Mateusz Rumiński | 2017-06-22 | 1 | -3/+3 |
| | | | | | | | | | add missing translation | ||||
| * | | 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 | ||||
| * | | Add client_credentials oAuth2 auth method | Thomas Citharel | 2017-06-14 | 2 | -4/+25 |
| | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | | | Merge pull request #3207 from wallabag/tag-rss | Jérémy Benoist | 2017-06-21 | 31 | -103/+258 |
|\ \ \ | | | | | | | | | Add RSS for tags | ||||
| * | | | Add all entries RSS feed and put links on tag page itself and baggy too | Thomas Citharel | 2017-06-21 | 21 | -45/+106 |
| | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | | | Fix typo | Jeremy Benoist | 2017-06-21 | 1 | -3/+3 |
| | | | | |||||
| * | | | add rss icon | Thomas Citharel | 2017-06-21 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | | | 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 |
|\ \ \ | | | | | | | | | Store credentials in DB | ||||
| * | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Encrypt username too Redirect to list after saving credentials Fix typos Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
| * | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not aimed to test if we can get the full article (since we aren't using real login/password) but mostly to test the full work (with authentication, etc.) Do not clean fixtured to avoid SQLite to re-use id for entry tag relation 😓 | ||||
| * | | | Force sequence creation for postgresql | Jeremy Benoist | 2017-06-20 | 1 | -1/+6 |
| | | | |