Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3816 from wallabag/validate-import-entry | Jérémy Benoist | 2019-01-04 | 10 | -4/+108 |
|\ | | | | | Validate imported entry to avoid error on import | ||||
| * | Validate imported entry to avoid error on import | Jeremy Benoist | 2019-01-03 | 10 | -4/+108 |
| | | | | | | | | | | We got some imports with a missing `url` field generating some errors while trying to retrieve an existing entry with that url. Introducing the `validateEntry` allow us to dismiss a message when it doesn't have an url (or other missing stuff in the future) | ||||
* | | Merge pull request #3823 from wallabag/fix-tag-api-leak | Jérémy Benoist | 2019-01-03 | 5 | -147/+214 |
|\ \ | |/ |/| | Fix tag API leak | ||||
| * | TagRestController: fix test for tag without entries | Kevin Decherf | 2018-12-30 | 1 | -2/+12 |
| | | | | | | | | | | | | | | | | As the deletion now requires that at least one entry for the user must be linked to the given tag, we fix the test testDeleteUserTag by linking it to an entry. Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | TagRestController: rewrite delete actions to only retrieve tags related to ↵ | Kevin Decherf | 2018-12-30 | 2 | -11/+28 |
| | | | | | | | | | | | | | | | | the user Fixes #3815 Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | TagRestController: add tests to ensure that other user's tags are unreachable | Kevin Decherf | 2018-12-30 | 1 | -0/+32 |
| | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | TagRepository: refactor query builder for queries by userId | Kevin Decherf | 2018-12-30 | 1 | -16/+20 |
| | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | fixtures: refactor EntryData, TagData, add a new tag | Kevin Decherf | 2018-12-29 | 2 | -118/+122 |
|/ | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | Merge pull request #3814 from wallabag/2.3.6-dev | Jérémy Benoist | 2018-12-17 | 3 | -4/+4 |
|\ | | | | | Jump to 2.3.6-dev and update release process | ||||
| * | Jump to 2.3.6-dev and update release process | Jeremy Benoist | 2018-12-15 | 3 | -4/+4 |
|/ | | | | Fix release archive in `release.sh` and also fix a typo in the release process | ||||
* | Merge pull request #3812 from wallabag/prepare-2.3.5 | Jérémy Benoist | 2018-12-14 | 3 | -5/+21 |
|\ | | | | | Prepare 2.3.5 release | ||||
| * | Prepare 2.3.5 release | Jeremy Benoist | 2018-12-14 | 3 | -5/+21 |
|/ | |||||
* | Merge pull request #3810 from wallabag/remove-guzzle-site-authenticator-dev | Jérémy Benoist | 2018-12-14 | 1 | -1/+1 |
|\ | | | | | No more dev for guzzle-site-authenticator | ||||
| * | No more dev for guzzle-site-authenticator | Jeremy Benoist | 2018-12-13 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #3781 from wallabag/yarn-up | Jérémy Benoist | 2018-12-13 | 6 | -1259/+3129 |
|\ \ | |/ |/| | build: upgrade yarn dependencies, update prod assets | ||||
| * | build: upgrade yarn dependencies, update prod assets | Kevin Decherf | 2018-12-10 | 6 | -1259/+3129 |
|/ | | | | | | Production assets are rebuilt against new dependency versions. Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | Merge pull request #3783 from wallabag/issue-3780 | Kevin Decherf | 2018-11-26 | 1 | -1/+3 |
|\ | | | | | material: decrease size of tags on list view | ||||
| * | material: decrease size of tags on list view | Kevin Decherf | 2018-11-25 | 1 | -1/+3 |
| | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | | Merge pull request #3782 from wallabag/issue-3779 | Kevin Decherf | 2018-11-26 | 2 | -25/+20 |
|\ \ | | | | | | | material: fix missing thumbnail on list view | ||||
| * | | material: fix missing thumbnail on list view | Kevin Decherf | 2018-11-25 | 2 | -25/+20 |
| |/ | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | | Merge pull request #3784 from giuppi/master | Jérémy Benoist | 2018-11-26 | 1 | -1/+1 |
|\ \ | | | | | | | Fix Android app login issue | ||||
| * | | Fix Android app login issue | giuppi | 2018-11-25 | 1 | -1/+1 |
| |/ | | | | | class and alt tags must be in the correct order for the android app to recognize the wallabag server | ||||
* | | Merge pull request #3765 from burkemw3/patch-2 | Jérémy Benoist | 2018-11-26 | 2 | -7/+0 |
|\ \ | | | | | | | Remove preview picture from single entry view page for #1875 | ||||
| * | | Remove preview picture from single entry view page for #1875 | Matt Burke | 2018-11-24 | 2 | -7/+0 |
| | | | | | | | | | | | | | | | | | | Showing the preview picture usually leads to showing a duplicate image, and frequently leads to showing duplicate images directly adjacent to each other. | ||||
* | | | Merge pull request #3778 from wallabag/better-release | Jérémy Benoist | 2018-11-25 | 3 | -13/+12 |
|\ \ \ | |_|/ |/| | | Jump to 2.3.5-dev and update release process | ||||
| * | | Jump to 2.3.5-dev and update release process | Jeremy Benoist | 2018-11-25 | 3 | -13/+12 |
|/ / | | | | | | | After the latest release, I update the documentation about it so it’s more clear | ||||
* | | Merge pull request #3775 from wallabag/prepare-2.3.4 | Jérémy Benoist | 2018-11-24 | 5 | -22/+63 |
|\ \ | | | | | | | Prepare 2.3.4 release | ||||
| * | | Create a custom swap to avoid error | Jeremy Benoist | 2018-11-23 | 1 | -9/+17 |
| | | | |||||
| * | | Use latest bridge to avoid PHPUnit break | Jeremy Benoist | 2018-11-23 | 1 | -1/+1 |
| | | | | | | | | | | | | Because branch 4.8 & 5.7 have been removed | ||||
| * | | Use new Travis infra | Jeremy Benoist | 2018-11-23 | 1 | -9/+6 |
| | | | |||||
| * | | Prepare 2.3.4 release | Jeremy Benoist | 2018-11-23 | 3 | -4/+40 |
|/ / | |||||
* | | Merge pull request #3774 from Simounet/feature/card-ui | Jérémy Benoist | 2018-11-21 | 7 | -16/+12 |
|\ \ | | | | | | | Card no preview replaced by wallabag logo | ||||
| * | | Card no preview replaced by wallabag logo | Simounet | 2018-11-21 | 7 | -16/+12 |
|/ / | |||||
* | | Merge pull request #3772 from techexo/patch-1 | Jérémy Benoist | 2018-11-16 | 2 | -6/+6 |
|\ \ | | | | | | | Update translation when marking as read | ||||
| * | | Update messages.en.yml | Eloi Coutant | 2018-11-16 | 1 | -3/+3 |
| | | | |||||
| * | | Update messages.fr.yml | Eloi Coutant | 2018-11-16 | 1 | -1/+1 |
| | | | |||||
| * | | Update messages.fr.yml | Eloi Coutant | 2018-11-16 | 1 | -3/+3 |
|/ / | | | | | Modification pour éclaircir le sens de l'option | ||||
* | | Merge pull request #3769 from burkemw3/patch-4 | Jérémy Benoist | 2018-11-09 | 6 | -25/+25 |
|\ \ | | | | | | | Add rel=noopener to target=_blank links | ||||
| * | | Add rel=noopener to target=_blank links | Matt Burke | 2018-11-07 | 6 | -25/+25 |
|/ / | | | | | | | | | | | | | From https://developers.google.com/web/tools/lighthouse/audits/noopener: - new pages will run in separate processes, avoiding any performance intermingling impacts - new pages won't have access to current page's window object via JavaScript | ||||
* | | Merge pull request #3766 from merwan/patch-1 | Jérémy Benoist | 2018-11-06 | 1 | -1/+1 |
|\ \ | |/ |/| | Fix link to wallabag requirements in documentation | ||||
| * | Fix link to wallabag requirements in documentation | Merouane Atig | 2018-11-05 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #3764 from shtrom/fix-matches-notmatches-language | Kevin Decherf | 2018-11-01 | 8 | -13/+13 |
|\ | | | | | Fix documentation wording for matches/notmatches tagging rules | ||||
| * | fixup! fixup! Fix documentation wording for matches/notmatches tagging rules | Olivier Mehani | 2018-11-01 | 8 | -8/+8 |
| | | |||||
| * | fixup! Fix documentation wording for matches/notmatches tagging rules | Olivier Mehani | 2018-11-01 | 8 | -8/+8 |
| | | |||||
| * | Fix documentation wording for matches/notmatches tagging rules | Olivier Mehani | 2018-10-31 | 8 | -13/+13 |
| | | | | | | | | Signed-off-by: Olivier Mehani <shtrom@ssji.net> | ||||
* | | Merge pull request #3763 from wallabag/ghpr-template-update | Jérémy Benoist | 2018-10-27 | 1 | -1/+7 |
|\ \ | | | | | | | Add note on GitHub PR template to auto-close issues | ||||
| * | | misc: add note on GitHub PR template to auto-close issues | Kevin Decherf | 2018-10-26 | 1 | -1/+7 |
|/ / | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | | Merge pull request #3553 from wallabag/url-3529 | Kevin Decherf | 2018-10-26 | 2 | -1/+244 |
|\ \ | | | | | | | Swap entry url with origin url if graby provides an updated one | ||||
| * | | phpcs | Kevin Decherf | 2018-10-24 | 1 | -1/+2 |
| | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | | updateOriginUrl: remove 'query string' case from ignore list | Kevin Decherf | 2018-10-24 | 2 | -12/+2 |
| | | | | | | | | | | | | | | | | | | | | | Two urls with a different query string may refer to two different pages so keep them both. Signed-off-by: Kevin Decherf <kevin@kdecherf.com> |