a9f61d3dbb
CORS repare for api
2019-02-11 11:57:52 +01:00
47e4784110
Merge pull request #3869 from itsthejb/fix-2factor-email-image
...
Fix broken 2 factor auth logo image
2019-02-01 12:58:31 +01:00
7e04bd4ca4
Fix broken 2 factor auth logo image
2019-01-31 22:14:53 +01:00
755753e3ef
Merge pull request #3819 from stan3/pocket-import
...
Fix read & starred status in Pocket import
2019-01-28 11:34:37 +01:00
8d082488e9
Improve checks & add tests
2019-01-28 06:03:16 +01:00
a2e60dd393
status and favourite are actually strings in the import so use ==
2019-01-27 18:39:26 +01:00
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
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
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
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
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
78e3fafa3f
Avoid error when a bad order parameter is given
...
Only allowed parameter are asc & desc
2019-01-14 17:01:21 +01:00
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
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
314f647238
Jump to 2.3.7-dev
2019-01-11 22:17:48 +01:00
c17d1ab033
Merge pull request #3835 from wallabag/prepare-2.3.6
...
Prepare 2.3.6 release
2019-01-11 17:12:13 +01:00
3bed2e440e
Prepare 2.3.6 release
2019-01-11 14:16:41 +01:00
3625833b2c
Merge pull request #3826 from wallabag/epub-toc
...
Rework of EPUB/PDF exports
2019-01-11 13:34:38 +01:00
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
ca990600da
Merge pull request #3833 from techexo/patch-1
...
Fix settings field inverted
2019-01-10 10:02:34 +01:00
bb8ad42b27
Update entries.html.twig
...
Should fix https://github.com/wallabag/wallabag/issues/3832
2019-01-10 04:25:51 +01:00
d4466a37fe
Update entries.html.twig
...
Should fix https://github.com/wallabag/wallabag/issues/3832
2019-01-10 04:23:08 +01:00
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
5e1f27767b
EntriesExport: avoid else on $authors
...
Signed-off-by: Kevin Decherf <kevin@kdecherf.com >
2019-01-09 16:26:19 +01:00
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
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
af83d05ce2
Add translations
...
Signed-off-by: Kevin Decherf <kevin@kdecherf.com >
2019-01-07 23:06:02 +01:00
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
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
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
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
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
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
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
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
7f8630b91c
Counting two characters together as a word in CJK
2019-01-06 01:21:13 +08:00
35983eb9bb
Improve reading time tests
2019-01-04 11:23:33 +01:00
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
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
2378fd6347
Merge pull request #3823 from wallabag/fix-tag-api-leak
...
Fix tag API leak
2019-01-03 09:14:26 +01:00
6c40d7fc85
TagRestController: fix test for tag without entries
...
As the deletion now requires that at least one entry for the user must
be linked to the given tag, we fix the test testDeleteUserTag by linking
it to an entry.
Signed-off-by: Kevin Decherf <kevin@kdecherf.com >
2018-12-30 01:34:49 +01:00
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
0ee9848231
TagRestController: add tests to ensure that other user's tags are unreachable
...
Signed-off-by: Kevin Decherf <kevin@kdecherf.com >
2018-12-30 01:34:49 +01:00
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
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
5becf260fa
fix incorrect reading time calculation for entries with CJK characters
2018-12-25 15:31:44 +08:00
4d0c632c70
Merge pull request #3814 from wallabag/2.3.6-dev
...
Jump to 2.3.6-dev and update release process
2018-12-17 09:34:15 +01:00
4fd5f670fe
Jump to 2.3.6-dev and update release process
...
Fix release archive in `release.sh` and also fix a typo in the release process
2018-12-15 08:14:47 +01:00
45e26a7fc8
Merge pull request #3812 from wallabag/prepare-2.3.5
...
Prepare 2.3.5 release
2018-12-14 22:53:07 +01:00
a1272ab84d
Prepare 2.3.5 release
2018-12-14 20:59:16 +01:00
