mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-09-28 22:32:03 +00:00
Code Issues Projects Releases Wiki Activity
4494 commits 10 branches 99 tags 157 MiB
Commit graph

1773 commits

Author SHA1 Message Date
Jérémy Benoist
3625833b2c
Merge pull request #3826 from wallabag/epub-toc 
Rework of EPUB/PDF exports
 2019-01-11 13:34:38 +01:00
Jérémy Benoist
03663530ed
Merge pull request #3831 from wallabag/fix/api-bad-client-id 
Cast client id to avoid PG error
 2019-01-10 17:03:03 +01:00
Eloi Coutant
bb8ad42b27
Update entries.html.twig 
Should fix https://github.com/wallabag/wallabag/issues/3832
 2019-01-10 04:25:51 +01:00
Eloi Coutant
d4466a37fe
Update entries.html.twig 
Should fix https://github.com/wallabag/wallabag/issues/3832
 2019-01-10 04:23:08 +01:00
Jeremy Benoist
3a2d4cf9fd
Cast client id to avoid PG error 
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.
 2019-01-09 23:31:14 +01:00
Kevin Decherf
5e1f27767b EntriesExport: avoid else on $authors 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2019-01-09 16:26:19 +01:00
Kevin Decherf
dac93644e8 EntriesExport: sanitize filename and fix tests 
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>
 2019-01-08 15:13:35 +01:00
Kevin Decherf
ad5ef8bca0 EntriesExport/pdf: move notice to the end, add metadata cover 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2019-01-07 23:36:41 +01:00
Kevin Decherf
af83d05ce2 Add translations 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2019-01-07 23:06:02 +01:00
Kevin Decherf
4944703edc EntriesExport/epub: add metadata to each entry's cover 
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>
 2019-01-07 21:44:14 +01:00
Kevin Decherf
f810834623 EntriesExport: change authors and title when not single entry export 
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>
 2019-01-07 21:44:14 +01:00
Kevin Decherf
30cf72bf55 EntriesExport/epub: revert c779373f, move exportinfo to the end of the book 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2019-01-07 21:43:16 +01:00
Kevin Decherf
edd1825b58 EntriesExport/epub: use sha1 sums for filenames, fix and rename title chapters 
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>
 2019-01-07 21:41:12 +01:00
Kevin Decherf
063d5e7bda EntriesExport/epub: remove TOC page 
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>
 2019-01-07 21:11:05 +01:00
Kevin Decherf
5de17117a1
Merge pull request #3827 from wallabag/epub-quote 
EntriesExport/epub: replace epub identifier with unique urn
 2019-01-07 11:59:38 +01:00
Jérémy Benoist
d2aec7096d
Merge pull request #3820 from lizyn/bugfix/incorrect-calculation-of-CJK-characters-in-reading-time-estimation 
Fix incorrect reading time calculation for entries with CJK characters
 2019-01-07 10:17:29 +01:00
Kevin Decherf
bf22266a62 EntriesExport/epub: replace epub identifier with unique urn 
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>
 2019-01-06 23:29:32 +01:00
lizyn
7f8630b91c Counting two characters together as a word in CJK 2019-01-06 01:21:13 +08:00
Jeremy Benoist
35983eb9bb
Improve reading time tests 2019-01-04 11:23:33 +01:00
Jérémy Benoist
8f5c4b083c
Merge pull request #3816 from wallabag/validate-import-entry 
Validate imported entry to avoid error on import
 2019-01-04 11:06:53 +01:00
Jeremy Benoist
9f8f188d92
Validate imported entry to avoid error on import 
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)
 2019-01-03 09:42:06 +01:00
Kevin Decherf
2a0e0a47d8 TagRestController: rewrite delete actions to only retrieve tags related to the user 
Fixes #3815

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2018-12-30 01:34:49 +01:00
Kevin Decherf
6708bf238d TagRepository: refactor query builder for queries by userId 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2018-12-30 01:34:44 +01:00
Kevin Decherf
bafb9744c8 fixtures: refactor EntryData, TagData, add a new tag 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2018-12-29 19:22:05 +01:00
lizyn
5becf260fa fix incorrect reading time calculation for entries with CJK characters 2018-12-25 15:31:44 +08:00
Kevin Decherf
72efc8ceeb
Merge pull request #3782 from wallabag/issue-3779 
material: fix missing thumbnail on list view
 2018-11-26 18:45:12 +01:00
Jérémy Benoist
6f2287da69
Merge pull request #3784 from giuppi/master 
Fix Android app login issue
 2018-11-26 13:57:16 +01:00
Jérémy Benoist
8896f0f988
Merge pull request #3765 from burkemw3/patch-2 
Remove preview picture from single entry view page for #1875
 2018-11-26 13:51:00 +01:00
giuppi
b34b489cfd
Fix Android app login issue 
class and alt tags must be in the correct order for the android app to recognize the wallabag server
 2018-11-25 16:07:08 +01:00
Kevin Decherf
e5de9917fd material: fix missing thumbnail on list view 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2018-11-25 15:00:08 +01:00
Matt Burke
038fccd244 Remove preview picture from single entry view page for #1875 
Showing the preview picture usually leads to showing a duplicate
image, and frequently leads to showing duplicate images directly
adjacent to each other.
 2018-11-24 19:29:58 -05:00
Simounet
2daae77094 Card no preview replaced by wallabag logo 2018-11-21 18:51:44 +01:00
Eloi Coutant
060f3ce34c
Update messages.en.yml 2018-11-16 14:16:38 +01:00
Eloi Coutant
ccc3b0a531
Update messages.fr.yml 2018-11-16 01:45:16 +01:00
Eloi Coutant
0ddfb2956c
Update messages.fr.yml 
Modification pour éclaircir le sens de l'option
 2018-11-16 01:37:53 +01:00
Matt Burke
a22b8043b4 Add rel=noopener to target=_blank links 
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
 2018-11-07 20:34:54 -05:00
Kevin Decherf
3a69628007
Merge pull request #3764 from shtrom/fix-matches-notmatches-language 
Fix documentation wording for matches/notmatches tagging rules
 2018-11-01 12:04:55 +01:00
Olivier Mehani
3f0dd0f0bc
fixup! fixup! Fix documentation wording for matches/notmatches tagging rules 2018-11-01 19:40:17 +11:00
Olivier Mehani
da7b8e256f
fixup! Fix documentation wording for matches/notmatches tagging rules 2018-11-01 19:26:06 +11:00
Olivier Mehani
0452e869ec
Fix documentation wording for matches/notmatches tagging rules 
Signed-off-by: Olivier Mehani <shtrom@ssji.net>
 2018-10-31 19:56:48 +11:00
Kevin Decherf
1b220426e2 phpcs 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2018-10-24 22:33:32 +02:00
Kevin Decherf
6059967951 updateOriginUrl: remove 'query string' case from ignore list 
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>
 2018-10-24 22:27:27 +02:00
Kevin Decherf
44e63667d9 updateOriginUrl: add comment blocks for the parse_url diff check 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2018-10-24 22:13:03 +02:00
Kevin Decherf
5ba5e22a09 updateOriginUrl: rewrite some if, resolving feedbacks from PR 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2018-10-24 21:54:09 +02:00
Kevin Decherf
b49c87acf1 ignoreOriginUrl: add initial support of ignore lists 
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>
 2018-10-22 23:42:09 +02:00
Kevin Decherf
fc040c749d updateOriginUrl: add behavior when diff is fragment and query 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2018-10-22 23:08:58 +02:00
Kevin Decherf
e07fadea76 Refactor updateOriginUrl to include new behaviors behaviors 
- 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>
 2018-10-22 23:01:16 +02:00
Kevin Decherf
781864b954 ContentProxy: swap entry url to origin_url and set new url according to graby content 
Closes #3529

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2018-10-21 16:15:31 +02:00
Kevin Decherf
4a81360efc ContentProxy: fix a corner case when entry.url is empty in updateEntry 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2018-10-21 16:13:20 +02:00
Jérémy Benoist
0658ce4f11
Merge pull request #3745 from burkemw3/patch-3 
Add placeholder image to card-based gallery entries page
 2018-10-16 07:45:22 +00:00