Commit Graph

4576 Commits

Author SHA1 Message Date
naofum 55dd64dd47
Translated using Weblate (Japanese)
Currently translated at 100.0% (6 of 6 strings)
2019-02-24 01:47:51 +01:00
naofum 53162bf4d8
Added translation using Weblate (Japanese) 2019-02-24 01:43:46 +01:00
Weblate bd0961d25f
Added translation using Weblate (Japanese) 2019-02-24 01:43:45 +01:00
Weblate 4f83b83e4a
Added translation using Weblate (Japanese) 2019-02-24 01:43:44 +01:00
Weblate 4362d5ea98
Added translation using Weblate (Japanese) 2019-02-24 01:43:33 +01:00
Allan Nordhøy 4e4bd772d0
Translated using Weblate (Persian)
Currently translated at 53.6% (259 of 483 strings)
2019-02-23 15:25:01 +01:00
Weblate b97123c39f
Merge branch 'origin/master' into Weblate. 2019-01-28 11:34:42 +01:00
Jérémy Benoist 755753e3ef
Merge pull request #3819 from stan3/pocket-import
Fix read & starred status in Pocket import
2019-01-28 11:34:37 +01:00
Jeremy Benoist 8d082488e9
Improve checks & add tests 2019-01-28 06:03:16 +01:00
Tristan Hill a2e60dd393
status and favourite are actually strings in the import so use == 2019-01-27 18:39:26 +01:00
Allan Nordhøy 78e24f8954
Translated using Weblate (Norwegian Bokmål)
Currently translated at 85.7% (6 of 7 strings)
2019-01-27 16:06:14 +01:00
Allan Nordhøy 1e4dd73b07
Translated using Weblate (Norwegian Bokmål)
Currently translated at 100.0% (6 of 6 strings)
2019-01-24 12:06:33 +01:00
Allan Nordhøy 606ab37b6a
Translated using Weblate (English)
Currently translated at 100.0% (6 of 6 strings)
2019-01-24 12:06:32 +01:00
Allan Nordhøy 5bd456eda7
Translated using Weblate (Norwegian Bokmål)
Currently translated at 87.5% (35 of 40 strings)
2019-01-24 12:06:31 +01:00
Allan Nordhøy 7005e55f36
Translated using Weblate (Norwegian Bokmål)
Currently translated at 85.7% (6 of 7 strings)
2019-01-23 09:34:53 +01:00
Allan Nordhøy 4119dac5b2
Translated using Weblate (English)
Currently translated at 97.1% (34 of 35 strings)
2019-01-23 09:34:53 +01:00
Allan Nordhøy bfa267fc12
Translated using Weblate (Norwegian Bokmål)
Currently translated at 14.7% (65 of 442 strings)
2019-01-23 09:34:52 +01:00
Weblate 356f0f46a4 Added translation using Weblate (Norwegian Bokmål) 2019-01-23 09:34:29 +01:00
Weblate 61b7af80f0 Added translation using Weblate (Norwegian Bokmål) 2019-01-23 09:34:19 +01:00
Weblate 683511c32a Added translation using Weblate (Norwegian Bokmål) 2019-01-23 09:33:37 +01:00
Allan Nordhøy 752e0491ce
Translated using Weblate (Norwegian Bokmål)
Currently translated at 88.6% (31 of 35 strings)
2019-01-23 08:55:48 +01:00
Allan Nordhøy b18a16951d Added translation using Weblate (Norwegian Bokmål) 2019-01-23 08:53:37 +01:00
Jérémy Benoist b992522d85
Merge pull request #3861 from wallabag/fix/siteconfig-email
Add dedicated email for site config issue
2019-01-18 13:20:38 +01:00
Jeremy Benoist 293730656d Add dedicated email for site config issue
Instead of sending an email to the devs, it now creates an issue on GitHub using a zap from zapier.
2019-01-18 11:15:23 +01:00
Jérémy Benoist 6b32cf0c73
Merge pull request #3853 from techexo/patch-2
Update composer.json to add php-tidy (ext-tidy)
2019-01-17 12:09:07 +01:00
Eloi Coutant 1ec44a346b
Update composer.json to add php-tidy (ext-tidy)
Should fix https://github.com/wallabag/wallabag/issues/3844 for milestone https://github.com/wallabag/wallabag/milestone/63.
2019-01-16 21:54:38 +01:00
Jérémy Benoist f6b9e883c0
Merge pull request #3841 from wallabag/fix/bad-order-api
Fix bad order parameter in the API
2019-01-14 22:24:40 +01:00
Jeremy Benoist 78e3fafa3f
Avoid error when a bad `order` parameter is given
Only allowed parameter are asc & desc
2019-01-14 17:01:21 +01:00
Jeremy Benoist a5e9a98aa3
Come back to stable version
Previous one was used because some PHPUnit version where deleted and tests can't be run anymore.
2019-01-14 17:00:32 +01:00
Kevin Decherf f083836cc4
Merge pull request #3837 from wallabag/2.3.7-dev
Jump to 2.3.7-dev
2019-01-12 11:19:19 +01:00
Jérémy Benoist 314f647238
Jump to 2.3.7-dev 2019-01-11 22:17:48 +01:00
Jérémy Benoist c17d1ab033
Merge pull request #3835 from wallabag/prepare-2.3.6
Prepare 2.3.6 release
2019-01-11 17:12:13 +01:00
Jeremy Benoist 3bed2e440e
Prepare 2.3.6 release 2019-01-11 14:16:41 +01:00
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
Jérémy Benoist ca990600da
Merge pull request #3833 from techexo/patch-1
Fix settings field inverted
2019-01-10 10:02:34 +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