aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Avoid error when a bad `order` parameter is givenJeremy Benoist2019-01-142-14/+23
| | | | Only allowed parameter are asc & desc
* Merge pull request #3826 from wallabag/epub-tocJérémy Benoist2019-01-1116-29/+157
|\ | | | | 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-081-10/+18
| | | | | | | | | | | | | | | | 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-102-1/+20
|\ \ | | | | | | Cast client id to avoid PG error
| * | Cast client id to avoid PG errorJeremy Benoist2019-01-092-1/+20
| | | | | | | | | | | | 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.
* | | 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-071-4/+3
|\ \ \ | |/ / |/| | | | | | | | 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-061-1/+1
| | |
| * | Improve reading time testsJeremy Benoist2019-01-041-3/+2
| | |
| * | fix incorrect reading time calculation for entries with CJK characterslizyn2018-12-251-1/+1
| |/
* | 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)
* | 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>
* | 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 #3782 from wallabag/issue-3779Kevin Decherf2018-11-261-6/+5
|\ | | | | material: fix missing thumbnail on list view
| * material: fix missing thumbnail on list viewKevin Decherf2018-11-251-6/+5
| | | | | | | | 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.
* | Card no preview replaced by wallabag logoSimounet2018-11-211-5/+2
| |
* | 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
* | 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
* Merge pull request #3764 from shtrom/fix-matches-notmatches-languageKevin Decherf2018-11-018-13/+13
|\ | | | | Fix documentation wording for matches/notmatches tagging rules
| * fixup! fixup! Fix documentation wording for matches/notmatches tagging rulesOlivier Mehani2018-11-018-8/+8
| |
| * fixup! Fix documentation wording for matches/notmatches tagging rulesOlivier Mehani2018-11-018-8/+8
| |
| * Fix documentation wording for matches/notmatches tagging rulesOlivier Mehani2018-10-318-13/+13
| | | | | | | | Signed-off-by: Olivier Mehani <shtrom@ssji.net>
* | phpcsKevin Decherf2018-10-241-1/+2
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | updateOriginUrl: remove 'query string' case from ignore listKevin Decherf2018-10-241-2/+0
| | | | | | | | | | | | | | 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>
* | updateOriginUrl: add comment blocks for the parse_url diff checkKevin Decherf2018-10-241-0/+23
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | updateOriginUrl: rewrite some if, resolving feedbacks from PRKevin Decherf2018-10-241-32/+35
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | ignoreOriginUrl: add initial support of ignore listsKevin Decherf2018-10-221-20/+59
| | | | | | | | | | | | | | | | | | | | | | Add the ability to specify hosts and patterns lists to ignore the given entry url and replace it with the fetched content url without touching to origin_url. This initial support should be reworked in the following months to move the hardcoded ignore lists in the database. Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | updateOriginUrl: add behavior when diff is fragment and queryKevin Decherf2018-10-221-0/+1
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Refactor updateOriginUrl to include new behaviors behaviorsKevin Decherf2018-10-221-9/+45
| | | | | | | | | | | | | | | | - Leave origin_url unchanged if difference is an ending slash - Leave origin_url unchanged if difference is scheme - Ignore (noop) if difference is query string or fragment Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | ContentProxy: swap entry url to origin_url and set new url according to ↵Kevin Decherf2018-10-211-4/+11
| | | | | | | | | | | | | | | | graby content Closes #3529 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | ContentProxy: fix a corner case when entry.url is empty in updateEntryKevin Decherf2018-10-211-0/+8
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>