4481 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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
lizyn	5becf260fa	fix incorrect reading time calculation for entries with CJK characters	2018-12-25 15:31:44 +08:00
Jérémy Benoist	4d0c632c70	Merge pull request #3814 from wallabag/2.3.6-dev ... Jump to 2.3.6-dev and update release process	2018-12-17 09:34:15 +01:00
Jeremy Benoist	4fd5f670fe	Jump to 2.3.6-dev and update release process ... Fix release archive in `release.sh` and also fix a typo in the release process	2018-12-15 08:14:47 +01:00
Jérémy Benoist	45e26a7fc8	Merge pull request #3812 from wallabag/prepare-2.3.5 ... Prepare 2.3.5 release	2018-12-14 22:53:07 +01:00
Jeremy Benoist	a1272ab84d	Prepare 2.3.5 release	2018-12-14 20:59:16 +01:00
Jérémy Benoist	4840d618c2	Merge pull request #3810 from wallabag/remove-guzzle-site-authenticator-dev ... No more dev for guzzle-site-authenticator	2018-12-14 10:46:44 +01:00
Jérémy Benoist	ac20dc6155	Merge pull request #3781 from wallabag/yarn-up ... build: upgrade yarn dependencies, update prod assets	2018-12-13 22:13:34 +01:00
Jeremy Benoist	8bb381e78c	No more dev for guzzle-site-authenticator	2018-12-13 22:12:21 +01:00
Kevin Decherf	63fb9d6f07	build: upgrade yarn dependencies, update prod assets ... Production assets are rebuilt against new dependency versions. Signed-off-by: Kevin Decherf <kevin@kdecherf.com>	2018-12-10 22:56:20 +01:00
Kevin Decherf	20898d5ef4	Merge pull request #3783 from wallabag/issue-3780 ... material: decrease size of tags on list view	2018-11-26 18:45:38 +01:00
Kevin Decherf	72efc8ceeb	Merge pull request #3782 from wallabag/issue-3779 ... material: fix missing thumbnail on list view	2018-11-26 18:45:12 +01:00
Jérémy Benoist	6f2287da69	Merge pull request #3784 from giuppi/master ... Fix Android app login issue	2018-11-26 13:57:16 +01:00
Jérémy Benoist	8896f0f988	Merge pull request #3765 from burkemw3/patch-2 ... Remove preview picture from single entry view page for #1875	2018-11-26 13:51:00 +01:00
Jérémy Benoist	bf483b628e	Merge pull request #3778 from wallabag/better-release ... Jump to 2.3.5-dev and update release process	2018-11-25 22:21:19 +01:00
giuppi	b34b489cfd	Fix Android app login issue ... class and alt tags must be in the correct order for the android app to recognize the wallabag server	2018-11-25 16:07:08 +01:00
Kevin Decherf	13d94929ec	material: decrease size of tags on list view ... Signed-off-by: Kevin Decherf <kevin@kdecherf.com>	2018-11-25 15:38:17 +01:00
Kevin Decherf	e5de9917fd	material: fix missing thumbnail on list view ... Signed-off-by: Kevin Decherf <kevin@kdecherf.com>	2018-11-25 15:00:08 +01:00
Jeremy Benoist	a03c4d90b2	Jump to 2.3.5-dev and update release process ... After the latest release, I update the documentation about it so it’s more clear	2018-11-25 09:43:21 +01:00
Matt Burke	038fccd244	Remove preview picture from single entry view page for #1875 ... Showing the preview picture usually leads to showing a duplicate image, and frequently leads to showing duplicate images directly adjacent to each other.	2018-11-24 19:29:58 -05:00
Jérémy Benoist	bffe65478d	Merge pull request #3775 from wallabag/prepare-2.3.4 ... Prepare 2.3.4 release	2018-11-24 21:13:03 +01:00
Jeremy Benoist	5a4cbf5b70	Create a custom swap to avoid error	2018-11-23 22:11:10 +01:00
Jeremy Benoist	ea60d76e60	Use latest bridge to avoid PHPUnit break ... Because branch 4.8 & 5.7 have been removed	2018-11-23 22:11:10 +01:00
Jeremy Benoist	d470f817ac	Use new Travis infra	2018-11-23 22:11:04 +01:00
Jeremy Benoist	dc90eab32b	Prepare 2.3.4 release	2018-11-23 08:34:13 +01:00
Jérémy Benoist	e01b00298a	Merge pull request #3774 from Simounet/feature/card-ui ... Card no preview replaced by wallabag logo	2018-11-21 20:56:09 +01:00
Simounet	2daae77094	Card no preview replaced by wallabag logo	2018-11-21 18:51:44 +01:00
Jérémy Benoist	59a31ed07f	Merge pull request #3772 from techexo/patch-1 ... Update translation when marking as read	2018-11-16 14:34:41 +01:00
Eloi Coutant	060f3ce34c	Update messages.en.yml	2018-11-16 14:16:38 +01:00
Eloi Coutant	ccc3b0a531	Update messages.fr.yml	2018-11-16 01:45:16 +01:00
Eloi Coutant	0ddfb2956c	Update messages.fr.yml ... Modification pour éclaircir le sens de l'option	2018-11-16 01:37:53 +01:00
Jérémy Benoist	b3bcc6aa06	Merge pull request #3769 from burkemw3/patch-4 ... Add rel=noopener to target=_blank links	2018-11-09 16:08:27 +01:00
Matt Burke	a22b8043b4	Add rel=noopener to target=_blank links ... From https://developers.google.com/web/tools/lighthouse/audits/noopener: - new pages will run in separate processes, avoiding any performance intermingling impacts - new pages won't have access to current page's window object via JavaScript	2018-11-07 20:34:54 -05:00
Jérémy Benoist	078d54411b	Merge pull request #3766 from merwan/patch-1 ... Fix link to wallabag requirements in documentation	2018-11-06 05:20:28 +00:00
Merouane Atig	c7e9610b3f	Fix link to wallabag requirements in documentation	2018-11-05 10:17:50 +01:00