mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-25 18:41:05 +00:00
Code Issues Projects Releases Wiki Activity
4703 commits 12 branches 100 tags 170 MiB
Commit graph

4703 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jeremy Benoist
6546aca4a3
Keep composer.lock 
We initially ignored the `composer.lock` because it generated a lock of rebase on PR when someone updated it and the master updated it too.
Now we have less contributions (sadly) so I think we won't run against that problem.
Also, it'll solve issue about people cloning the master and got angry because composer eat all the available memory to determine packages to install.
It'll also be much easier to make release.
Scrutinizer & Travis will be faster too.
 2019-05-29 11:41:07 +02:00
Jérémy Benoist
73ec68b1ff
Merge pull request #3984 from wallabag/2.4 
Merge 2.4 into master
 2019-05-29 11:14:00 +02:00
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
Jérémy Benoist
48d136d3a0
Merge pull request #3390 from aaa2000/httplug 
Use httplug and graby 2.0
 2019-05-28 14:00:22 +02:00
Jeremy Benoist
6e68417f03
Fix tests after rebase 2019-05-28 12:02:17 +02:00
Jeremy Benoist
36b0d52ee4
CS & fix tests 2019-05-28 11:44:21 +02:00
Jeremy Benoist
b6c1e1bacc
Fix some tests 2019-05-28 11:44:20 +02:00
Jeremy Benoist
a91a3150fb
CS 2019-05-28 11:42:27 +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
92a6683562
Merge remote-tracking branch 'origin/master' into 2.4 2019-05-27 10:46:01 +02:00
Jérémy Benoist
2ba365c7c4
Merge pull request #3982 from wallabag/fix/https-test 
Fix http/https test
 2019-05-27 10:22:03 +02:00
Jeremy Benoist
d6cc0b249e
Fix test 2019-05-27 09:38:07 +02:00
Kevin Decherf
5c0701ba41
Merge pull request #3965 from nicofrand/previewPic 
Preview picture: use the 1st pic retrieved if no og:image set
 2019-05-26 17:47:44 +02:00
Jérémy Benoist
cc9731bf2b
Merge pull request #3980 from wallabag/fix/instapaper-date-import 
Fix Instapaper import date order
 2019-05-24 16:03:05 +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
Olivier Mehani
31e276fc16
EntryRestController::getEntriesExistsAction: always find by hashed url 
Simplify the logic from #3158 by hashing all the urls from the request,
and only doing a search by hash. This allows to get performance benefits
from the new indexed hash column even when using older clients that do
not hash the URL in the request.

Fixes: #3158, #3919

Signed-off-by: Olivier Mehani <shtrom@ssji.net>
 2019-05-24 15:17:45 +02:00
Jeremy Benoist
9ca670c801
Fix Instapaper import date 2019-05-24 14:37:54 +02:00
Jérémy Benoist
65b495e75b
Merge pull request #3977 from wallabag/fix/7.2-dockerfile 
Force PHP version in Dockerfile
 2019-05-23 11:57:07 +02:00
Jérémy Benoist
c1a1c46e9d
Force PHP version in Dockerfile 2019-05-23 08:51:54 +02:00
nicofrand
d99e6423f4 [tests] Fix pre-existing tests (preview now imported + records added) 2019-05-21 20:38:22 +02:00
nicofrand
715fabf8f2 [tests] Set first picture as preview picture 2019-05-21 20:38:22 +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
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
b8b37ccdea
CS 2019-05-15 14:58:40 +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
227a1a27f1
Merge pull request #3966 from wallabag/prepare-2.3.8 
Prepare 2.3.8 release
 2019-05-14 11:14:37 +02:00
Jeremy Benoist
cc181629a0
Prepare 2.3.8 release 2019-05-14 10:16:46 +02:00
Kevin Decherf
eb06edba0c
Merge pull request #3964 from wallabag/fix/intl 
Fix Intl Locale issue
 2019-05-14 09:36:46 +02:00
Jeremy Benoist
b50ecd0c8a
Fix Intl Locale issue 
Some issue appeared after the release of PHP 7.2.17 about Intl Memory
Leak / infinite loop.
To fix it we should upgrade to Symfony 3.4 (which is done in wallabag
2.4) but for the 2.3 branch, we'll use a temporary fix for the Locale
issue.
 2019-05-13 14:04:33 +02:00
Jérémy Benoist
9e2194e9cb
Merge pull request #3956 from wallabag/fix/delete-cascade-oauth2 
Cascade delete on oauth2 table when deleting a user
 2019-05-13 06:41:16 +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
Kevin Decherf
295b714426
Merge pull request #3943 from wallabag/img-referrer 
Enable no-referrer on img tags, enable strict-origin-when-cross-origin by default
 2019-05-12 23:44:33 +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
9ae5bd9e10 assets: regenerate material.css 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2019-05-10 23:08:23 +02: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
754bf12e67
Fix SQLite constraint 2019-05-10 21:15:46 +02:00
Jeremy Benoist
d2ef2d6df8
Fix SQLite migration 2019-05-10 20:36:45 +02:00
Jeremy Benoist
637f0df976
Cascade delete on oauth2 table when deleting a user 2019-05-10 20:36:45 +02:00
Jérémy Benoist
de1162b91a
Merge pull request #3955 from wallabag/fix/gif-animation-imagick 
Use Imagick to keep GIF animation
 2019-05-10 21:24:06 +03:00
Jeremy Benoist
844fd9fafc
Fallback to default solution if Imagick fails 2019-05-10 16:52:01 +02:00
Jeremy Benoist
77bd7f690d
CS 2019-05-10 15:49:39 +02:00
Jeremy Benoist
1ca9310f5e
Setup Imagick for Travis 
To avoid error from phpstan about class not found
 2019-05-10 15:47:47 +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