aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* material: add metadata to list viewKevin Decherf2019-05-012-2/+5
| | | | | | | | | Add reading time and creation date to rows of list view. Refactor styles using a sass mixin. Fixes #3838 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* Adding more tests to cover different scenarioJeremy Benoist2019-04-242-16/+38
|
* Add ability to match many domains for credentialsJeremy Benoist2019-04-2314-17/+27
| | | | | Instead of fetching one domain, we use the same method as in site config (to retrieve the matching file) and handle api.example.org, example.org, .org (yes the last one isn’t useful). If one of these match, we got it and use it.
* Merge pull request #3909 from wallabag/fix/html-not-definedJérémy Benoist2019-03-181-7/+6
|\ | | | | Fix PHP warning
| * Fix PHP warningJeremy Benoist2019-03-181-7/+6
| | | | | | | | Looks like sometimes (usually from import) the `html` key isn’t available.
* | epub: fix exception when articles have the same titleKevin Decherf2019-03-171-1/+1
|/ | | | | | | | | | This commit fixes an exception occuring when exporting as epub several articles with the same title. The chapter filename is now derived from title and url. Fixes #3642 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* material: wrap card actions, remove class hiding of creation dateKevin Decherf2019-03-031-5/+7
| | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* 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>
* | EntryRestController: add support of expect parameter to delete actionKevin Decherf2019-02-201-4/+17
|/ | | | | | | | | | | 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>
* CSJeremy Benoist2019-02-131-1/+1
|
* CSJeremy Benoist2019-02-119-13/+13
|
* Fix broken 2 factor auth logo imageJonathan Crooke2019-01-311-1/+1
|
* Improve checks & add testsJeremy Benoist2019-01-281-3/+3
|
* status and favourite are actually strings in the import so use ==Tristan Hill2019-01-271-2/+2
|
* 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.
* 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
| |