aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3831 from wallabag/fix/api-bad-client-idJérémy Benoist2019-01-103-1/+34
|\ | | | | Cast client id to avoid PG error
| * Cast client id to avoid PG errorJeremy Benoist2019-01-093-1/+34
| | | | | | | | If someone send a malformated client_id when trying to authenticate using the API we got a 500 if wallabag use postgres because the request send a string instead of an integer.
* | Merge pull request #3833 from techexo/patch-1Jérémy Benoist2019-01-102-4/+4
|\ \ | | | | | | Fix settings field inverted
| * | Update entries.html.twigEloi Coutant2019-01-101-2/+2
| | | | | | | | | Should fix https://github.com/wallabag/wallabag/issues/3832
| * | Update entries.html.twigEloi Coutant2019-01-101-2/+2
|/ / | | | | Should fix https://github.com/wallabag/wallabag/issues/3832
* | Merge pull request #3827 from wallabag/epub-quoteKevin Decherf2019-01-071-2/+8
|\ \ | | | | | | EntriesExport/epub: replace epub identifier with unique urn
| * | EntriesExport/epub: replace epub identifier with unique urnKevin Decherf2019-01-061-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We replace the title used as the unique identifier of the epub file with a urn following the format: urn:wallabag:{sha1("wallabagUrl:listOfEntryIdsSeparatedByComma")} This format is repeatable: it always gives the same uid for the same list of entries. Fixes #3811 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | | Merge pull request #3820 from ↵Jérémy Benoist2019-01-079-10/+63
|\ \ \ | |/ / |/| | | | | | | | lizyn/bugfix/incorrect-calculation-of-CJK-characters-in-reading-time-estimation Fix incorrect reading time calculation for entries with CJK characters
| * | Counting two characters together as a word in CJKlizyn2019-01-064-5/+5
| | |
| * | Improve reading time testsJeremy Benoist2019-01-049-9/+41
| | |
| * | fix incorrect reading time calculation for entries with CJK characterslizyn2018-12-254-1/+22
| |/
* | Merge pull request #3816 from wallabag/validate-import-entryJérémy Benoist2019-01-0410-4/+108
|\ \ | | | | | | Validate imported entry to avoid error on import
| * | Validate imported entry to avoid error on importJeremy Benoist2019-01-0310-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-leakJérémy Benoist2019-01-035-147/+214
|\ \ | |/ |/| Fix tag API leak
| * TagRestController: fix test for tag without entriesKevin Decherf2018-12-301-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 Decherf2018-12-302-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 unreachableKevin Decherf2018-12-301-0/+32
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * TagRepository: refactor query builder for queries by userIdKevin Decherf2018-12-301-16/+20
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * fixtures: refactor EntryData, TagData, add a new tagKevin Decherf2018-12-292-118/+122
|/ | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* Merge pull request #3814 from wallabag/2.3.6-devJérémy Benoist2018-12-173-4/+4
|\ | | | | Jump to 2.3.6-dev and update release process
| * Jump to 2.3.6-dev and update release processJeremy Benoist2018-12-153-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.5Jérémy Benoist2018-12-143-5/+21
|\ | | | | Prepare 2.3.5 release
| * Prepare 2.3.5 releaseJeremy Benoist2018-12-143-5/+21
|/
* Merge pull request #3810 from wallabag/remove-guzzle-site-authenticator-devJérémy Benoist2018-12-141-1/+1
|\ | | | | No more dev for guzzle-site-authenticator
| * No more dev for guzzle-site-authenticatorJeremy Benoist2018-12-131-1/+1
| |
* | Merge pull request #3781 from wallabag/yarn-upJérémy Benoist2018-12-136-1259/+3129
|\ \ | |/ |/| build: upgrade yarn dependencies, update prod assets
| * build: upgrade yarn dependencies, update prod assetsKevin Decherf2018-12-106-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-3780Kevin Decherf2018-11-261-1/+3
|\ | | | | material: decrease size of tags on list view
| * material: decrease size of tags on list viewKevin Decherf2018-11-251-1/+3
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #3782 from wallabag/issue-3779Kevin Decherf2018-11-262-25/+20
|\ \ | | | | | | material: fix missing thumbnail on list view
| * | material: fix missing thumbnail on list viewKevin Decherf2018-11-252-25/+20
| |/ | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #3784 from giuppi/masterJérémy Benoist2018-11-261-1/+1
|\ \ | | | | | | Fix Android app login issue
| * | Fix Android app login issuegiuppi2018-11-251-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-2Jérémy Benoist2018-11-262-7/+0
|\ \ | | | | | | Remove preview picture from single entry view page for #1875
| * | Remove preview picture from single entry view page for #1875Matt Burke2018-11-242-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-releaseJérémy Benoist2018-11-253-13/+12
|\ \ \ | |_|/ |/| | Jump to 2.3.5-dev and update release process
| * | Jump to 2.3.5-dev and update release processJeremy Benoist2018-11-253-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.4Jérémy Benoist2018-11-245-22/+63
|\ \ | | | | | | Prepare 2.3.4 release
| * | Create a custom swap to avoid errorJeremy Benoist2018-11-231-9/+17
| | |
| * | Use latest bridge to avoid PHPUnit breakJeremy Benoist2018-11-231-1/+1
| | | | | | | | | | | | Because branch 4.8 & 5.7 have been removed
| * | Use new Travis infraJeremy Benoist2018-11-231-9/+6
| | |
| * | Prepare 2.3.4 releaseJeremy Benoist2018-11-233-4/+40
|/ /
* | Merge pull request #3774 from Simounet/feature/card-uiJérémy Benoist2018-11-217-16/+12
|\ \ | | | | | | Card no preview replaced by wallabag logo
| * | Card no preview replaced by wallabag logoSimounet2018-11-217-16/+12
|/ /
* | Merge pull request #3772 from techexo/patch-1Jérémy Benoist2018-11-162-6/+6
|\ \ | | | | | | Update translation when marking as read
| * | Update messages.en.ymlEloi Coutant2018-11-161-3/+3
| | |
| * | Update messages.fr.ymlEloi Coutant2018-11-161-1/+1
| | |
| * | Update messages.fr.ymlEloi Coutant2018-11-161-3/+3
|/ / | | | | Modification pour éclaircir le sens de l'option
* | Merge pull request #3769 from burkemw3/patch-4Jérémy Benoist2018-11-096-25/+25
|\ \ | | | | | | Add rel=noopener to target=_blank links
| * | Add rel=noopener to target=_blank linksMatt Burke2018-11-076-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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 02:40:35 +0000