Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | |||||
| * | | Add menu access to site credentials CRUD | Jeremy Benoist | 2017-06-20 | 22 | -14/+258 |
| | | | |||||
| * | | Retrieve username/password from database | Jeremy Benoist | 2017-06-20 | 4 | -13/+49 |
| | | | | | | | | | | | | Inject the current user & the repo to retrieve username/password from the database | ||||
| * | | Update route & user verification | Jeremy Benoist | 2017-06-20 | 6 | -19/+34 |
| | | | |||||
| * | | Add CRUD for site credentials | Jeremy Benoist | 2017-06-20 | 24 | -13/+1054 |
| | | | |||||
* | | | Merge pull request #3215 from wallabag/fix-3192 | Jérémy Benoist | 2017-06-20 | 2 | -5/+5 |
|\ \ \ | | | | | | | | | Empty preview pictures and language return null | ||||
| * | | | Fix empty language and preview pics | Thomas Citharel | 2017-06-12 | 2 | -5/+5 |
| | | | | |||||
* | | | | Merge pull request #3229 from wallabag/fix-mobile-view | Thomas Citharel | 2017-06-15 | 9 | -612/+654 |
|\ \ \ \ | |_|_|/ |/| | | | Fix mobile view and update asset deps | ||||
| * | | | Fix mobile view and update asset deps | Thomas Citharel | 2017-06-15 | 9 | -612/+654 |
|/ / / | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | | | Merge pull request #3220 from wallabag/remove-padding | Nicolas Lœuillet | 2017-06-13 | 5 | -5/+5 |
|\ \ \ | | | | | | | | | Removed padding on entry view | ||||
| * | | | Updated production files | Nicolas Lœuillet | 2017-06-13 | 4 | -4/+4 |
| | | | | |||||
| * | | | Removed padding on entry view | Nicolas Lœuillet | 2017-06-13 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #3213 from wallabag/fix-internal-settings-form | Nicolas Lœuillet | 2017-06-13 | 1 | -2/+1 |
|\ \ \ | |/ / |/| | | Fixed internal settings form | ||||
| * | | Fixed internal settings form | Nicolas Lœuillet | 2017-06-12 | 1 | -2/+1 |
|/ / | |||||
* | | Merge pull request #3208 from wallabag/is-public | Nicolas Lœuillet | 2017-06-12 | 19 | -6/+165 |
|\ \ | |/ |/| | Add ability to filter public entries & use it in the API | ||||
| * | CS | Jeremy Benoist | 2017-06-10 | 1 | -1/+1 |
| | | |||||
| * | Few fixes | Jeremy Benoist | 2017-06-10 | 3 | -3/+4 |
| | | |||||
| * | Add public filter/field in the API | Jeremy Benoist | 2017-06-10 | 4 | -6/+88 |
| | | | | | | | | | | | | Listing entries can now be filtered by “public”. Creating or patching an entry can now set is to public or remove the public. Entry response now include “is_public” boolean field | ||||
| * | Add isPublic filter on entries | Jeremy Benoist | 2017-06-10 | 16 | -0/+76 |
|/ | |||||
* | Merge remote-tracking branch 'origin/master' into 2.3 | Jeremy Benoist | 2017-06-10 | 7 | -7/+7 |
|\ | |||||
| * | Merge pull request #3202 from pVesian/master | Jérémy Benoist | 2017-06-10 | 7 | -7/+7 |
| |\ | | | | | | | Config label improvement #3199 | ||||
| | * | Update translations | Jeremy Benoist | 2017-06-10 | 2 | -2/+2 |
| | | | |||||
| | * | Config label improvement #3199 | Pierre de Vésian | 2017-06-09 | 7 | -7/+7 |
| |/ |