4540 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Jérémy Benoist	8ab5dcc467	Merge pull request #3908 from wallabag/epub-issue-3642 ... epub: fix exception when articles have the same title	2019-03-18 09:26:16 +01:00
Jérémy Benoist	893f107fa1	Merge pull request #3860 from baurmatt/fix/posix_compatibility ... Make dev/install/update script posix compatible	2019-03-18 09:25:00 +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
Matthias Baur	7c553a6017	Properly source require.sh ... Fixes #3571.	2019-03-12 15:44:38 +01:00
Kevin Decherf	a48ff25d4c	Merge pull request #3901 from wallabag/fix-pr-3893 ... material: fix left padding on non-entry pages introduced by #3893	2019-03-09 12:19:31 +01:00
Kevin Decherf	cf0010cf4a	material: fix left padding on non-entry pages introduced by #3893 ... Signed-off-by: Kevin Decherf <kevin@kdecherf.com>	2019-03-09 00:27:50 +01:00
Jérémy Benoist	13d2fe6d2e	Merge pull request #3897 from wallabag/2.3.8-dev ... Jump to 2.3.8-dev	2019-03-04 15:23:06 +01:00
Jeremy Benoist	3d7a1f4caf	Jump to 2.3.8-dev	2019-03-04 13:49:23 +01:00
Jérémy Benoist	36fd8e5fde	Merge pull request #3895 from wallabag/prepare-2.3.7 ... Prepare 2.3.7 release	2019-03-04 12:06:22 +01:00
Jeremy Benoist	f2aa373054	Prepare 2.3.7 release	2019-03-04 09:32:26 +01:00
Kevin Decherf	4ae4fa7b89	Merge pull request #3894 from wallabag/issue-3851 ... material: hide creation date from card actions on specific sizes	2019-03-03 20:22:30 +01:00
Kevin Decherf	6640a922d1	material: update prod assets ... Signed-off-by: Kevin Decherf <kevin@kdecherf.com>	2019-03-03 19:24:34 +01:00
Kevin Decherf	246cc9ac93	material: add media queries to hide creation date from card actions ... Hide the creation date from card actions on specific sizes when there's not enough space for all parts. Fixes #3851 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>	2019-03-03 19:22:32 +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
Kevin Decherf	806635f7d5	Merge pull request #3893 from wallabag/issue-3877 ... material: fix left padding of content on medium screens	2019-03-03 19:22:03 +01:00
Kevin Decherf	05232afe32	material: fix left padding of content on medium screens ... Fixes #3877 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>	2019-03-02 23:46:00 +01:00
Kevin Decherf	fb7dedf36c	material: move a media query from cards to dedicated scss file ... Signed-off-by: Kevin Decherf <kevin@kdecherf.com>	2019-03-02 22:48:43 +01:00
Jérémy Benoist	1e9c710fdd	Merge pull request #3885 from mart-e/script-ignore-root ... Allow optional --ignore-root-warning	2019-03-01 20:22:22 +01:00
Jérémy Benoist	d5154ee2ae	Merge pull request #3886 from wallabag/issue-3602 ... epub export: fix missing cover image, only for exports of one article	2019-02-25 14:03:41 +01:00
Jérémy Benoist	4de99d1ab1	Merge pull request #3887 from wallabag/issue-3711 ... Add support of expect parameter to change return object when deleting entry	2019-02-25 10:56:07 +01:00
Kevin Decherf	12a97c3522	tests: fix broken session clients for rest entry deletion tests ... Signed-off-by: Kevin Decherf <kevin@kdecherf.com>	2019-02-20 15:57:56 +01:00
Kevin Decherf	508302042f	EntryRestController: add support of expect parameter to delete action ... The expect parameter enables an application to request the whole entry or only the id when requesting its deletion. `expects` defaults to `entry` to prevent any API breakage. Fixes #3711 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>	2019-02-20 15:57:50 +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
Kevin Decherf	4e0ed3368d	tests: create entry for testDeleteEntry, fix missing id ... When using the entity manager to retrieve an already stored entry, the id disapears from $entry after the first delete call. This leads to testing a nonexistent endpoint (api/entries/.json) during the second delete call. This change now creates an entry specifically for the test. Signed-off-by: Kevin Decherf <kevin@kdecherf.com>	2019-02-17 15:25:21 +01:00
Martin Trigaux	c01bda038e	Allow optional --ignore-root-warning ... Now both ./install prod --ignore-root-warning ./install --ignore-root-warning prod will work $1 was both used for the environment and the root flag Fixes wallabag/wallabag#3884	2019-02-14 16:42:57 +05:30
Kevin Decherf	b1992b340e	Merge pull request #3882 from wallabag/fix/cors ... Fix CORS for API	2019-02-13 15:05:57 +01:00
Jeremy Benoist	44560c7767	CS	2019-02-13 14:06:57 +01:00
Jeremy Benoist	0182cdaec4	CS	2019-02-11 11:57:52 +01:00
Rurik19	a9f61d3dbb	CORS repare for api	2019-02-11 11:57:52 +01:00
Jérémy Benoist	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
Jonathan Crooke	7e04bd4ca4	Fix broken 2 factor auth logo image	2019-01-31 22:14:53 +01:00
Jérémy Benoist	755753e3ef	Merge pull request #3819 from stan3/pocket-import ... Fix read & starred status in Pocket import	2019-01-28 11:34:37 +01:00
Jeremy Benoist	8d082488e9	Improve checks & add tests	2019-01-28 06:03:16 +01:00
Tristan Hill	a2e60dd393	status and favourite are actually strings in the import so use ==	2019-01-27 18:39:26 +01:00
Jérémy Benoist	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
Jeremy Benoist	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
Jérémy Benoist	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
Eloi Coutant	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
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