4690 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	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
Jérémy Benoist	570113208b	Merge pull request #3942 from wallabag/issue-3838 ... material: add metadata to list view	2019-05-09 15:45:07 +03:00
Jérémy Benoist	6e67f41152	Merge pull request #3223 from wallabag/rss2atom ... Changed RSS to Atom feed and improve paging	2019-05-09 15:21:21 +03: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
Jérémy Benoist	ea54c2adb1	Merge pull request #3937 from wallabag/fix/credential-subdomain ... Add ability to match many domains for credentials	2019-04-27 10:58:26 +02:00
Jeremy Benoist	68a90821a3	Handle redirection from previous feeds	2019-04-26 13:40:58 +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
Jérémy Benoist	522e37ad27	Merge pull request #3158 from wallabag/hash-exist-url ... Hash exist url	2019-04-25 13:28:09 +02:00
Jeremy Benoist	35359bd3c6	Adding more tests to cover different scenario	2019-04-24 15:28:15 +02:00
Jeremy Benoist	ff8f338dc2	FIx unrelated failing test	2019-04-23 22:48:04 +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
Jérémy Benoist	76bc05ebc0	Fix ApiDoc about md5/sha1	2019-04-02 22:59:50 +02:00
Jeremy Benoist	5cc0646e66	Fix index on MySQL	2019-04-01 15:45:17 +02:00