mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-07-02 03:55:47 +00:00
Code Issues Projects Releases Wiki Activity
4555 commits 14 branches 99 tags 148 MiB
Commit graph

4555 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Benoist 9a57653aec
Redirect to the current view instead of homepage 2019-01-19 21:10:16 +01:00
Jeremy Benoist 90a0d086a8
Better icon 2019-01-19 21:10:16 +01:00
Jeremy Benoist 062fad434a
Better random function 2019-01-19 21:09:33 +01:00
Jeremy Benoist 0447a75b06
Use only one method to randomize 
Instead of one per type, one for all is ok.
 2019-01-19 21:09:33 +01:00
Jeremy Benoist f85d220c19
Fix tests 2019-01-19 21:09:33 +01:00
Nicolas Lœuillet 09ef25c3c3
Added random feature 2019-01-19 21:09:32 +01:00
Jérémy Benoist c73025ad8b
Merge pull request #3858 from wallabag/bump-ocramius 
Bump ocramius/proxy-manager
 2019-01-18 16:50:24 +01:00
Jeremy Benoist 963b873626
CS 2019-01-18 16:05:20 +01:00
Jérémy Benoist 6bfbf16eeb
Merge pull request #3859 from wallabag/phpstan 
Enable PHPStan
 2019-01-18 15:56:39 +01:00
Jeremy Benoist 1e0d8ad7b7
Enable PHPStan 
- Fix error for level 0 & 1 (level 7 has 699 errors...)
- Add `updated_at` to site_credential (so the `timestamps()` method applies correctly)
 2019-01-18 15:25:50 +01:00
Thomas Citharel 9666fb70fc
Bump ocramius/proxy-manager 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-01-17 12:47:24 +01:00
Kevin Decherf 8445ad4790
Merge pull request #3845 from wallabag/feature/api-info-endpoint 
Add a new endpoint to retrieve information from the wallabag instance
 2019-01-15 12:22:35 +01:00
Jeremy Benoist 3bd65991ad
Add a new endpoint to retrieve information from the wallabag instance 
Useful for api client which required some information.
We might add more inside them in the future.

The endpoint /api/version should be avoided now as it contains not so much information rather the version.
 2019-01-15 10:17:11 +01:00
Jeremy Benoist 3afc87426d
CS 2019-01-15 09:49:22 +01:00
Jeremy Benoist 5419a8368e
Merge remote-tracking branch 'origin/master' into 2.4 2019-01-15 09:41:18 +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
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
Jérémy Benoist 2378fd6347
Merge pull request #3823 from wallabag/fix-tag-api-leak 
Fix tag API leak
 2019-01-03 09:14:26 +01:00
Kevin Decherf 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
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 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
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