aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3886 from wallabag/issue-3602Jérémy Benoist2019-02-251-7/+9
|\ | | | | epub export: fix missing cover image, only for exports of one article
| * epub export: fix missing cover image, only for exports of one articleKevin Decherf2019-02-181-7/+9
| | | | | | | | | | | | Fixes #3602 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #3887 from wallabag/issue-3711Jérémy Benoist2019-02-252-17/+72
|\ \ | |/ |/| Add support of expect parameter to change return object when deleting entry
| * tests: fix broken session clients for rest entry deletion testsKevin Decherf2019-02-201-4/+13
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * EntryRestController: add support of expect parameter to delete actionKevin Decherf2019-02-202-9/+33
| | | | | | | | | | | | | | | | | | | | | | The expect parameter enables an application to request the whole entry or only the id when requesting its deletion. `expects` defaults to `entry` to prevent any API breakage. Fixes #3711 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * tests: create entry for testDeleteEntry, fix missing idKevin Decherf2019-02-171-7/+29
|/ | | | | | | | | | | When using the entity manager to retrieve an already stored entry, the id disapears from $entry after the first delete call. This leads to testing a nonexistent endpoint (api/entries/.json) during the second delete call. This change now creates an entry specifically for the test. Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* Merge pull request #3882 from wallabag/fix/corsKevin Decherf2019-02-139-16/+16
|\ | | | | Fix CORS for API
| * CSJeremy Benoist2019-02-131-1/+1
| |
| * CSJeremy Benoist2019-02-119-13/+13
| |
| * CORS repare for apiRurik192019-02-111-4/+4
|/
* Merge pull request #3869 from itsthejb/fix-2factor-email-imageJérémy Benoist2019-02-011-1/+1
|\ | | | | Fix broken 2 factor auth logo image
| * Fix broken 2 factor auth logo imageJonathan Crooke2019-01-311-1/+1
|/
* Merge pull request #3819 from stan3/pocket-importJérémy Benoist2019-01-282-3/+10
|\ | | | | Fix read & starred status in Pocket import
| * Improve checks & add testsJeremy Benoist2019-01-282-3/+10
| |
| * status and favourite are actually strings in the import so use ==Tristan Hill2019-01-271-2/+2
|/
* Merge pull request #3861 from wallabag/fix/siteconfig-emailJérémy Benoist2019-01-182-2/+2
|\ | | | | Add dedicated email for site config issue
| * Add dedicated email for site config issueJeremy Benoist2019-01-182-2/+2
|/ | | | | Instead of sending an email to the devs, it now creates an issue on GitHub using a zap from zapier.
* Merge pull request #3853 from techexo/patch-2Jérémy Benoist2019-01-171-0/+1
|\ | | | | Update composer.json to add php-tidy (ext-tidy)
| * Update composer.json to add php-tidy (ext-tidy)Eloi Coutant2019-01-161-0/+1
|/ | | Should fix https://github.com/wallabag/wallabag/issues/3844 for milestone https://github.com/wallabag/wallabag/milestone/63.
* Merge pull request #3841 from wallabag/fix/bad-order-apiJérémy Benoist2019-01-144-15/+33
|\ | | | | Fix bad order parameter in the API
| * Avoid error when a bad `order` parameter is givenJeremy Benoist2019-01-143-14/+32
| | | | | | | | Only allowed parameter are asc & desc
| * Come back to stable versionJeremy Benoist2019-01-141-1/+1
|/ | | | Previous one was used because some PHPUnit version where deleted and tests can't be run anymore.
* Merge pull request #3837 from wallabag/2.3.7-devKevin Decherf2019-01-121-1/+1
|\ | | | | Jump to 2.3.7-dev
| * Jump to 2.3.7-devJérémy Benoist2019-01-111-1/+1
|/
* Merge pull request #3835 from wallabag/prepare-2.3.6Jérémy Benoist2019-01-112-1/+15
|\ | | | | Prepare 2.3.6 release
| * Prepare 2.3.6 releaseJeremy Benoist2019-01-112-1/+15
|/
* Merge pull request #3826 from wallabag/epub-tocJérémy Benoist2019-01-1117-32/+165
|\ | | | | Rework of EPUB/PDF exports
| * EntriesExport: avoid else on $authorsKevin Decherf2019-01-091-4/+2
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * EntriesExport: sanitize filename and fix testsKevin Decherf2019-01-082-13/+26
| | | | | | | | | | | | | | | | Filename will now only use a-zA-Z0-9-' and space. Fixes remaining filename issue on #3811 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * EntriesExport/pdf: move notice to the end, add metadata coverKevin Decherf2019-01-071-8/+25
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * Add translationsKevin Decherf2019-01-0714-1/+88
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * EntriesExport/epub: add metadata to each entry's coverKevin Decherf2019-01-071-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | Add metadata to the cover of each entry: - Publishers - Estimated reading time - Date of creation ("Added on") - Address (URL) Related to #2821 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * EntriesExport: change authors and title when not single entry exportKevin Decherf2019-01-072-2/+5
| | | | | | | | | | | | | | | | | | | | Change '{method} authors' (which gives 'Tag_entries authors' when exporting a tag) to 'Various authors'. When exporting a tag (tag_entries), change the title from 'Tag_entries articles' to 'Tag {tag} articles'. Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * EntriesExport/epub: revert c779373f, move exportinfo to the end of the bookKevin Decherf2019-01-071-1/+3
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * EntriesExport/epub: use sha1 sums for filenames, fix and rename title chaptersKevin Decherf2019-01-071-6/+6
| | | | | | | | | | | | | | | | This commit renames entry chapters file using a sha1 sum of their title for simplicity. Also we fix the 'Title' chapter duplicate issue by using the hash of the related entry and the suffix '_title'. Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * EntriesExport/epub: remove TOC pageKevin Decherf2019-01-071-2/+0
| | | | | | | | | | | | | | | | | | This change only remove the rendered page of the TOC at the end of the book, the TOC remains available to readers. Fixes #3603 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 15:04:09 +0000