pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity
5,165 Commits 12 Branches 98 Tags
1abcfe8c98a22ef5eb5b7b2dc62e2c5ee0284f72
Commit Graph

1689 Commits

Author SHA1 Message Date
Jérémy Benoist
2cbee36a01 Merge pull request #3944 from shtrom/always-hash-exists-url 
Always hash exists url
 2019-05-28 14:18:33 +02:00
Jeremy Benoist
6e68417f03 Fix tests after rebase 2019-05-28 12:02:17 +02:00
Jeremy Benoist
b6c1e1bacc Fix some tests 2019-05-28 11:44:20 +02:00
Jeremy Benoist
448d99f84e CS 2019-05-28 11:42:27 +02:00
adev
1048c9c4a8 Configure timeout 2019-05-28 11:42:27 +02:00
adev
5f08426201 Fix because of some breaking changes of Graby 2.0 2019-05-28 11:42:27 +02:00
adev
bf9ace0643 Use httplug 2019-05-28 11:40:41 +02:00
Jeremy Benoist
629a3797bc Remove useless methods 
Also fix a phpdoc block
 2019-05-24 15:46:28 +02:00
Jeremy Benoist
0132ccd2a2 Change the way to define algorithm for hashing url 2019-05-24 15:17:46 +02:00
Olivier Mehani
4a5516376b Add Wallabag\CoreBundle\Helper\UrlHasher 
Signed-off-by: Olivier Mehani <shtrom@ssji.net>
 2019-05-24 15:17:46 +02:00
Olivier Mehani
d5744bf0df Delegate findByUrlAndUserId to findByHashedUrlAndUserId 
Signed-off-by: Olivier Mehani <shtrom@ssji.net>
 2019-05-24 15:17:46 +02:00
nicofrand
423efadefc Set first picture as preview picture 2019-05-21 20:38:22 +02:00
Jérémy Benoist
a2b5d67560 Merge pull request #3960 from wallabag/api-entries-2817 
api/entries: add parameter detail to exclude or include content in response
 2019-05-21 11:18:19 +02:00
Kevin Decherf
feb239ea10 mysql: change collation of tag table 
utf8mb4_unicode_ci considers that 'caché' is equal to 'cache' which
can lead to attaching incorrect tags to entries. This issue is due to
some unicode normalization done by MySQL.

utf8mb4_bin makes no unicode normalization, letting wallabag to consider
'cache' and 'caché' as two different tags.

We change the collation of the whole table as Doctrine does not support
setting a collation on a column for a specific platform (it tries to
apply utf8mb4_bin even for pgsql and sqlite).

Fixes #3302

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2019-05-19 23:37:49 +02:00
Kevin Decherf
2c290747cb api/entries: add parameter detail to exclude or include content in response 
detail=metadata will nullify the content field of entries in order to
make smaller responses.

detail=full keeps the former behavior, it sends the content of entries.
It's the default, for backward compatibility.

Fixes #2817

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2019-05-18 18:11:08 +02:00
Jeremy Benoist
9f0957b831 Merge remote-tracking branch 'origin/master' into 2.4 2019-05-15 14:38:07 +02:00
Jérémy Benoist
a73cb8a689 Merge pull request #3922 from burkemw3/patch-5 
Remove preview picture from share view page for #1875
 2019-05-13 06:40:16 +02:00
Matt Burke
19822ecb31 Remove preview picture from share view page for #1875 
Essentially, same as commit 038fccd for single entry views. From that commit:
> Showing the preview picture usually leads to showing a duplicate
> image, and frequently leads to showing duplicate images directly
> adjacent to each other.
 2019-05-12 12:32:22 -04:00
Kevin Decherf
2dbb5b2307 Enable no-referrer on img tags, enable strict-origin-when-cross-origin by default 
Fixes #3889

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2019-05-10 23:07:26 +02:00
Jeremy Benoist
844fd9fafc Fallback to default solution if Imagick fails 2019-05-10 16:52:01 +02:00
Jeremy Benoist
9306c2a368 Use Imagick to keep GIF animation 
If Imagick is available, GIF will be saved using it to keep animation.
Otherwise the previous method will be used and the animation won't be kept.
 2019-05-10 15:33:36 +02:00
Kevin Decherf
4b5b228650 material: add metadata to list view 
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>
 2019-05-01 15:47:48 +02:00
Jeremy Benoist
f277bc042c Fix tests & cs & migration 2019-04-26 12:53:21 +02:00
Thomas Citharel
531c8d0a5c Changed RSS to Atom feed and improve paging 2019-04-25 13:46:31 +02:00
Jeremy Benoist
35359bd3c6 Adding more tests to cover different scenario 2019-04-24 15:28:15 +02:00
Jeremy Benoist
f45496336f Add ability to match many domains for credentials 
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.
 2019-04-23 22:39:31 +02:00
Jeremy Benoist
5cc0646e66 Fix index on MySQL 2019-04-01 15:45:17 +02:00
Jeremy Benoist
c579ce2306 Some cleanup 
Also, do not run the hashed_url migration into a Doctrine migration
 2019-04-01 14:34:20 +02:00
Jeremy Benoist
8a64566298 Use a better index for hashed_url 
It'll most often be used in addition to the `user_id`.
Also, automatically generate the hash when saving the url.
Switch from `md5` to `sha1`.
 2019-04-01 13:51:57 +02:00
Jeremy Benoist
9c2b2aae70 Keep url in exists endpoint 
- Add migration
- Use md5 instead of sha512 (we don't need security here, just a hash)
- Update tests
 2019-04-01 13:24:40 +02:00
Thomas Citharel
bfe02a0b48 Hash the urls to check if they exist 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-04-01 13:24:40 +02:00
Jeremy Benoist
3620dae1e6 Merge remote-tracking branch 'origin/master' into 2.4 2019-04-01 13:16:15 +02:00
Jérémy Benoist
bfd69c74e5 Merge pull request #3909 from wallabag/fix/html-not-defined 
Fix PHP warning
 2019-03-18 09:26:33 +01:00
Jeremy Benoist
8ca858ee73 Fix PHP warning 
Looks like sometimes (usually from import) the `html` key isn’t available.
 2019-03-18 06:23:41 +01:00
Kevin Decherf
41d476d7e7 epub: fix exception when articles have the same title 
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>
 2019-03-17 23:36:10 +01:00
Kevin Decherf
f1f1efb5de material: wrap card actions, remove class hiding of creation date 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2019-03-03 19:22:32 +01:00
Jeremy Benoist
8c0ba95307 Adding more tests 2019-02-27 15:01:03 +01:00
Jeremy Benoist
ea925bb112 CS 2019-02-27 14:33:26 +01:00
Thomas Citharel
3784688a88 Replace continue; with break; to avoid PHP 7.3 warnings 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2019-02-27 14:29:14 +01:00
Kevin Decherf
9a7a0e1e6b epub export: fix missing cover image, only for exports of one article 
Fixes #3602

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2019-02-18 00:16:05 +01:00
Jeremy Benoist
0182cdaec4 CS 2019-02-11 11:57:52 +01:00
Jeremy Benoist
baa5ee2d42 Force default_protocol to generate an url input 2019-02-08 15:03:52 +01:00
Jeremy Benoist
18460b2d79 Merge remote-tracking branch 'origin/master' into 2.4 2019-02-07 18:01:15 +01:00
Jeremy Benoist
4654a83b64 Hash backup codes in the database using password_hash 2019-01-23 14:43:39 +01:00
Jeremy Benoist
c416ed485f CS 2019-01-23 13:28:24 +01:00
Jeremy Benoist
a0c5eb003f Change the way to enable 2FA 
And add a step to validate a generated code from the OTP app
 2019-01-23 13:28:24 +01:00
Jeremy Benoist
e073090b8d Update translation 2019-01-23 13:28:24 +01:00
Jeremy Benoist
dfd0a7bc5f Add backup codes 2019-01-23 13:28:03 +01:00
Jeremy Benoist
6e4fc956ab Better translations 
Replace “Google Authenticator” by “Google Authenticator, Authy or FreeOTP” in all text.

Translate how to use the code / qr code.
 2019-01-23 13:28:02 +01:00
Jeremy Benoist
2dfbe9e5fa Fix tests 2019-01-23 13:28:02 +01:00