github/wallabag/wallabag.git
8 months agoMerge pull request #3861 from wallabag/fix/siteconfig-email master
Jérémy Benoist [Fri, 18 Jan 2019 12:20:38 +0000 (13:20 +0100)] 
Merge pull request #3861 from wallabag/fix/siteconfig-email

Add dedicated email for site config issue

8 months agoAdd dedicated email for site config issue 3861/head
Jeremy Benoist [Fri, 18 Jan 2019 10:14:28 +0000 (11:14 +0100)] 
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.

8 months agoMerge pull request #3853 from techexo/patch-2
Jérémy Benoist [Thu, 17 Jan 2019 11:09:07 +0000 (12:09 +0100)] 
Merge pull request #3853 from techexo/patch-2

Update composer.json to add php-tidy (ext-tidy)

8 months agoUpdate composer.json to add php-tidy (ext-tidy) 3853/head
Eloi Coutant [Wed, 16 Jan 2019 20:54:38 +0000 (21:54 +0100)] 
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.

8 months agoMerge pull request #3841 from wallabag/fix/bad-order-api
Jérémy Benoist [Mon, 14 Jan 2019 21:24:40 +0000 (22:24 +0100)] 
Merge pull request #3841 from wallabag/fix/bad-order-api

Fix bad order parameter in the API

8 months agoAvoid error when a bad `order` parameter is given 3841/head
Jeremy Benoist [Mon, 14 Jan 2019 16:01:21 +0000 (17:01 +0100)] 
Avoid error when a bad `order` parameter is given

Only allowed parameter are asc & desc

8 months agoCome back to stable version
Jeremy Benoist [Mon, 14 Jan 2019 16:00:32 +0000 (17:00 +0100)] 
Come back to stable version

Previous one was used because some PHPUnit version where deleted and tests can't be run anymore.

9 months agoMerge pull request #3837 from wallabag/2.3.7-dev
Kevin Decherf [Sat, 12 Jan 2019 10:19:19 +0000 (11:19 +0100)] 
Merge pull request #3837 from wallabag/2.3.7-dev

Jump to 2.3.7-dev

9 months agoJump to 2.3.7-dev 3837/head
Jérémy Benoist [Fri, 11 Jan 2019 21:17:48 +0000 (22:17 +0100)] 
Jump to 2.3.7-dev

9 months agoMerge pull request #3835 from wallabag/prepare-2.3.6
Jérémy Benoist [Fri, 11 Jan 2019 16:12:13 +0000 (17:12 +0100)] 
Merge pull request #3835 from wallabag/prepare-2.3.6

Prepare 2.3.6 release

9 months agoPrepare 2.3.6 release 3835/head
Jeremy Benoist [Fri, 11 Jan 2019 13:16:41 +0000 (14:16 +0100)] 
Prepare 2.3.6 release

9 months agoMerge pull request #3826 from wallabag/epub-toc
Jérémy Benoist [Fri, 11 Jan 2019 12:34:38 +0000 (13:34 +0100)] 
Merge pull request #3826 from wallabag/epub-toc

Rework of EPUB/PDF exports

9 months agoMerge pull request #3831 from wallabag/fix/api-bad-client-id
Jérémy Benoist [Thu, 10 Jan 2019 16:03:03 +0000 (17:03 +0100)] 
Merge pull request #3831 from wallabag/fix/api-bad-client-id

Cast client id to avoid PG error

9 months agoMerge pull request #3833 from techexo/patch-1
Jérémy Benoist [Thu, 10 Jan 2019 09:02:34 +0000 (10:02 +0100)] 
Merge pull request #3833 from techexo/patch-1

Fix settings field inverted

9 months agoUpdate entries.html.twig 3833/head
Eloi Coutant [Thu, 10 Jan 2019 03:25:51 +0000 (04:25 +0100)] 
Update entries.html.twig

Should fix https://github.com/wallabag/wallabag/issues/3832

9 months agoUpdate entries.html.twig
Eloi Coutant [Thu, 10 Jan 2019 03:23:08 +0000 (04:23 +0100)] 
Update entries.html.twig

Should fix https://github.com/wallabag/wallabag/issues/3832

9 months agoCast client id to avoid PG error 3831/head
Jeremy Benoist [Wed, 9 Jan 2019 22:29:30 +0000 (23:29 +0100)] 
Cast client id to avoid PG error

If someone send a malformated client_id when trying to authenticate using the API we got a 500 if wallabag use postgres because the request send a string instead of an integer.

9 months agoEntriesExport: avoid else on $authors 3826/head
Kevin Decherf [Wed, 9 Jan 2019 15:26:19 +0000 (16:26 +0100)] 
EntriesExport: avoid else on $authors

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
9 months agoEntriesExport: sanitize filename and fix tests
Kevin Decherf [Mon, 7 Jan 2019 22:50:08 +0000 (23:50 +0100)] 
EntriesExport: sanitize filename and fix tests

Filename will now only use a-zA-Z0-9-' and space.

Fixes remaining filename issue on #3811

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
9 months agoEntriesExport/pdf: move notice to the end, add metadata cover
Kevin Decherf [Mon, 7 Jan 2019 22:36:41 +0000 (23:36 +0100)] 
EntriesExport/pdf: move notice to the end, add metadata cover

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
9 months agoAdd translations
Kevin Decherf [Sun, 6 Jan 2019 22:28:39 +0000 (23:28 +0100)] 
Add translations

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
9 months agoEntriesExport/epub: add metadata to each entry's cover
Kevin Decherf [Sun, 6 Jan 2019 22:27:13 +0000 (23:27 +0100)] 
EntriesExport/epub: add metadata to each entry's cover

Add metadata to the cover of each entry:

- Publishers
- Estimated reading time
- Date of creation ("Added on")
- Address (URL)

Related to #2821

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
9 months agoEntriesExport: change authors and title when not single entry export
Kevin Decherf [Sun, 6 Jan 2019 19:17:35 +0000 (20:17 +0100)] 
EntriesExport: change authors and title when not single entry export

Change '{method} authors' (which gives 'Tag_entries authors' when
exporting a tag) to 'Various authors'.

When exporting a tag (tag_entries), change the title from 'Tag_entries
articles' to 'Tag {tag} articles'.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
9 months agoEntriesExport/epub: revert c779373f, move exportinfo to the end of the book
Kevin Decherf [Sun, 6 Jan 2019 18:23:01 +0000 (19:23 +0100)] 
EntriesExport/epub: revert c779373f, move exportinfo to the end of the book

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
9 months agoEntriesExport/epub: use sha1 sums for filenames, fix and rename title chapters
Kevin Decherf [Sun, 6 Jan 2019 18:13:26 +0000 (19:13 +0100)] 
EntriesExport/epub: use sha1 sums for filenames, fix and rename title chapters

This commit renames entry chapters file using a sha1 sum of their title
for simplicity. Also we fix the 'Title' chapter duplicate issue by using
the hash of the related entry and the suffix '_title'.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
9 months agoEntriesExport/epub: remove TOC page
Kevin Decherf [Sun, 6 Jan 2019 17:55:39 +0000 (18:55 +0100)] 
EntriesExport/epub: remove TOC page

This change only remove the rendered page of the TOC at the end of the
book, the TOC remains available to readers.

Fixes #3603

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
9 months agoMerge pull request #3827 from wallabag/epub-quote
Kevin Decherf [Mon, 7 Jan 2019 10:59:38 +0000 (11:59 +0100)] 
Merge pull request #3827 from wallabag/epub-quote

EntriesExport/epub: replace epub identifier with unique urn

9 months agoMerge pull request #3820 from lizyn/bugfix/incorrect-calculation-of-CJK-characters...
Jérémy Benoist [Mon, 7 Jan 2019 09:17:29 +0000 (10:17 +0100)] 
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

9 months agoEntriesExport/epub: replace epub identifier with unique urn 3827/head
Kevin Decherf [Sun, 6 Jan 2019 17:38:02 +0000 (18:38 +0100)] 
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>
9 months agoCounting two characters together as a word in CJK 3820/head
lizyn [Sat, 5 Jan 2019 04:30:15 +0000 (12:30 +0800)] 
Counting two characters together as a word in CJK

9 months agoImprove reading time tests
Jeremy Benoist [Fri, 4 Jan 2019 10:22:43 +0000 (11:22 +0100)] 
Improve reading time tests

9 months agoMerge pull request #3816 from wallabag/validate-import-entry
Jérémy Benoist [Fri, 4 Jan 2019 10:06:53 +0000 (11:06 +0100)] 
Merge pull request #3816 from wallabag/validate-import-entry

Validate imported entry to avoid error on import

9 months agoValidate imported entry to avoid error on import 3816/head
Jeremy Benoist [Tue, 18 Dec 2018 12:14:42 +0000 (13:14 +0100)] 
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)

9 months agoMerge pull request #3823 from wallabag/fix-tag-api-leak
Jérémy Benoist [Thu, 3 Jan 2019 08:14:26 +0000 (09:14 +0100)] 
Merge pull request #3823 from wallabag/fix-tag-api-leak

Fix tag API leak

9 months agoTagRestController: fix test for tag without entries 3823/head
Kevin Decherf [Sat, 29 Dec 2018 19:43:34 +0000 (20:43 +0100)] 
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>
9 months agoTagRestController: rewrite delete actions to only retrieve tags related to the user
Kevin Decherf [Sat, 29 Dec 2018 19:42:41 +0000 (20:42 +0100)] 
TagRestController: rewrite delete actions to only retrieve tags related to the user

Fixes #3815

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
9 months agoTagRestController: add tests to ensure that other user's tags are unreachable
Kevin Decherf [Sat, 29 Dec 2018 18:43:07 +0000 (19:43 +0100)] 
TagRestController: add tests to ensure that other user's tags are unreachable

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
9 months agoTagRepository: refactor query builder for queries by userId
Kevin Decherf [Sat, 29 Dec 2018 18:42:37 +0000 (19:42 +0100)] 
TagRepository: refactor query builder for queries by userId

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
9 months agofixtures: refactor EntryData, TagData, add a new tag
Kevin Decherf [Sat, 29 Dec 2018 18:22:05 +0000 (19:22 +0100)] 
fixtures: refactor EntryData, TagData, add a new tag

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
9 months agofix incorrect reading time calculation for entries with CJK characters
lizyn [Tue, 25 Dec 2018 07:31:44 +0000 (15:31 +0800)] 
fix incorrect reading time calculation for entries with CJK characters

9 months agoMerge pull request #3814 from wallabag/2.3.6-dev
Jérémy Benoist [Mon, 17 Dec 2018 08:34:15 +0000 (09:34 +0100)] 
Merge pull request #3814 from wallabag/2.3.6-dev

Jump to 2.3.6-dev and update release process

9 months agoJump to 2.3.6-dev and update release process 3814/head
Jeremy Benoist [Sat, 15 Dec 2018 07:14:47 +0000 (08:14 +0100)] 
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

9 months agoMerge pull request #3812 from wallabag/prepare-2.3.5
Jérémy Benoist [Fri, 14 Dec 2018 21:53:07 +0000 (22:53 +0100)] 
Merge pull request #3812 from wallabag/prepare-2.3.5

Prepare 2.3.5 release

9 months agoPrepare 2.3.5 release 3812/head
Jeremy Benoist [Fri, 14 Dec 2018 19:59:16 +0000 (20:59 +0100)] 
Prepare 2.3.5 release

10 months agoMerge pull request #3810 from wallabag/remove-guzzle-site-authenticator-dev
Jérémy Benoist [Fri, 14 Dec 2018 09:46:44 +0000 (10:46 +0100)] 
Merge pull request #3810 from wallabag/remove-guzzle-site-authenticator-dev

No more dev for guzzle-site-authenticator

10 months agoMerge pull request #3781 from wallabag/yarn-up
Jérémy Benoist [Thu, 13 Dec 2018 21:13:34 +0000 (22:13 +0100)] 
Merge pull request #3781 from wallabag/yarn-up

build: upgrade yarn dependencies, update prod assets

10 months agoNo more dev for guzzle-site-authenticator 3810/head
Jeremy Benoist [Thu, 13 Dec 2018 21:12:21 +0000 (22:12 +0100)] 
No more dev for guzzle-site-authenticator

10 months agobuild: upgrade yarn dependencies, update prod assets 3781/head
Kevin Decherf [Sun, 25 Nov 2018 13:57:41 +0000 (14:57 +0100)] 
build: upgrade yarn dependencies, update prod assets

Production assets are rebuilt against new dependency versions.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
10 months agoMerge pull request #3783 from wallabag/issue-3780
Kevin Decherf [Mon, 26 Nov 2018 17:45:38 +0000 (18:45 +0100)] 
Merge pull request #3783 from wallabag/issue-3780

material: decrease size of tags on list view

10 months agoMerge pull request #3782 from wallabag/issue-3779
Kevin Decherf [Mon, 26 Nov 2018 17:45:12 +0000 (18:45 +0100)] 
Merge pull request #3782 from wallabag/issue-3779

material: fix missing thumbnail on list view

10 months agoMerge pull request #3784 from giuppi/master
Jérémy Benoist [Mon, 26 Nov 2018 12:57:16 +0000 (13:57 +0100)] 
Merge pull request #3784 from giuppi/master

Fix Android app login issue

10 months agoMerge pull request #3765 from burkemw3/patch-2
Jérémy Benoist [Mon, 26 Nov 2018 12:51:00 +0000 (13:51 +0100)] 
Merge pull request #3765 from burkemw3/patch-2

Remove preview picture from single entry view page for #1875

10 months agoMerge pull request #3778 from wallabag/better-release
Jérémy Benoist [Sun, 25 Nov 2018 21:21:19 +0000 (22:21 +0100)] 
Merge pull request #3778 from wallabag/better-release

Jump to 2.3.5-dev and update release process

10 months agoFix Android app login issue 3784/head
giuppi [Sun, 25 Nov 2018 15:07:08 +0000 (16:07 +0100)] 
Fix Android app login issue

class and alt tags must be in the correct order for the android app to recognize the wallabag server

10 months agomaterial: decrease size of tags on list view 3783/head
Kevin Decherf [Sun, 25 Nov 2018 14:38:17 +0000 (15:38 +0100)] 
material: decrease size of tags on list view

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
10 months agomaterial: fix missing thumbnail on list view 3782/head
Kevin Decherf [Sun, 25 Nov 2018 14:00:08 +0000 (15:00 +0100)] 
material: fix missing thumbnail on list view

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
10 months agoJump to 2.3.5-dev and update release process 3778/head
Jeremy Benoist [Sun, 25 Nov 2018 08:43:21 +0000 (09:43 +0100)] 
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

10 months agoRemove preview picture from single entry view page for #1875 3765/head
Matt Burke [Sat, 3 Nov 2018 16:56:49 +0000 (12:56 -0400)] 
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.

10 months agoMerge pull request #3775 from wallabag/prepare-2.3.4
Jérémy Benoist [Sat, 24 Nov 2018 20:13:03 +0000 (21:13 +0100)] 
Merge pull request #3775 from wallabag/prepare-2.3.4

Prepare 2.3.4 release

10 months agoCreate a custom swap to avoid error 3775/head
Jeremy Benoist [Fri, 23 Nov 2018 20:48:35 +0000 (21:48 +0100)] 
Create a custom swap to avoid error

10 months agoUse latest bridge to avoid PHPUnit break
Jeremy Benoist [Fri, 23 Nov 2018 15:04:33 +0000 (16:04 +0100)] 
Use latest bridge to avoid PHPUnit break

Because branch 4.8 & 5.7 have been removed

10 months agoUse new Travis infra
Jeremy Benoist [Fri, 23 Nov 2018 07:50:16 +0000 (08:50 +0100)] 
Use new Travis infra

10 months agoPrepare 2.3.4 release
Jeremy Benoist [Wed, 21 Nov 2018 20:11:55 +0000 (21:11 +0100)] 
Prepare 2.3.4 release

10 months agoMerge pull request #3774 from Simounet/feature/card-ui
Jérémy Benoist [Wed, 21 Nov 2018 19:56:09 +0000 (20:56 +0100)] 
Merge pull request #3774 from Simounet/feature/card-ui

Card no preview replaced by wallabag logo

10 months agoCard no preview replaced by wallabag logo 3774/head
Simounet [Wed, 11 Jul 2018 21:57:01 +0000 (23:57 +0200)] 
Card no preview replaced by wallabag logo

10 months agoMerge pull request #3772 from techexo/patch-1
Jérémy Benoist [Fri, 16 Nov 2018 13:34:41 +0000 (14:34 +0100)] 
Merge pull request #3772 from techexo/patch-1

Update translation when marking as read

10 months agoUpdate messages.en.yml 3772/head
Eloi Coutant [Fri, 16 Nov 2018 13:16:38 +0000 (14:16 +0100)] 
Update messages.en.yml

10 months agoUpdate messages.fr.yml
Eloi Coutant [Fri, 16 Nov 2018 00:45:16 +0000 (01:45 +0100)] 
Update messages.fr.yml

10 months agoUpdate messages.fr.yml
Eloi Coutant [Fri, 16 Nov 2018 00:37:53 +0000 (01:37 +0100)] 
Update messages.fr.yml

Modification pour éclaircir le sens de l'option

11 months agoMerge pull request #3769 from burkemw3/patch-4
Jérémy Benoist [Fri, 9 Nov 2018 15:08:27 +0000 (16:08 +0100)] 
Merge pull request #3769 from burkemw3/patch-4

Add rel=noopener to target=_blank links

11 months agoAdd rel=noopener to target=_blank links 3769/head
Matt Burke [Wed, 7 Nov 2018 03:53:48 +0000 (22:53 -0500)] 
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

11 months agoMerge pull request #3766 from merwan/patch-1
Jérémy Benoist [Tue, 6 Nov 2018 05:20:28 +0000 (05:20 +0000)] 
Merge pull request #3766 from merwan/patch-1

Fix link to wallabag requirements in documentation

11 months agoFix link to wallabag requirements in documentation 3766/head
Merouane Atig [Mon, 5 Nov 2018 09:17:50 +0000 (10:17 +0100)] 
Fix link to wallabag requirements in documentation

11 months agoMerge pull request #3764 from shtrom/fix-matches-notmatches-language
Kevin Decherf [Thu, 1 Nov 2018 11:04:55 +0000 (12:04 +0100)] 
Merge pull request #3764 from shtrom/fix-matches-notmatches-language

Fix documentation wording for matches/notmatches tagging rules

11 months agofixup! fixup! Fix documentation wording for matches/notmatches tagging rules 3764/head
Olivier Mehani [Thu, 1 Nov 2018 08:40:17 +0000 (19:40 +1100)] 
fixup! fixup! Fix documentation wording for matches/notmatches tagging rules

11 months agofixup! Fix documentation wording for matches/notmatches tagging rules
Olivier Mehani [Thu, 1 Nov 2018 08:26:06 +0000 (19:26 +1100)] 
fixup! Fix documentation wording for matches/notmatches tagging rules

11 months agoFix documentation wording for matches/notmatches tagging rules
Olivier Mehani [Wed, 31 Oct 2018 08:56:48 +0000 (19:56 +1100)] 
Fix documentation wording for matches/notmatches tagging rules

Signed-off-by: Olivier Mehani <shtrom@ssji.net>
11 months agoMerge pull request #3763 from wallabag/ghpr-template-update
Jérémy Benoist [Sat, 27 Oct 2018 06:15:03 +0000 (06:15 +0000)] 
Merge pull request #3763 from wallabag/ghpr-template-update

Add note on GitHub PR template to auto-close issues

11 months agomisc: add note on GitHub PR template to auto-close issues 3763/head
Kevin Decherf [Fri, 26 Oct 2018 21:50:55 +0000 (23:50 +0200)] 
misc: add note on GitHub PR template to auto-close issues

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
11 months agoMerge pull request #3553 from wallabag/url-3529
Kevin Decherf [Fri, 26 Oct 2018 09:31:41 +0000 (11:31 +0200)] 
Merge pull request #3553 from wallabag/url-3529

Swap entry url with origin url if graby provides an updated one

11 months agophpcs 3553/head
Kevin Decherf [Wed, 24 Oct 2018 20:33:32 +0000 (22:33 +0200)] 
phpcs

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
11 months agoupdateOriginUrl: remove 'query string' case from ignore list
Kevin Decherf [Wed, 24 Oct 2018 20:27:27 +0000 (22:27 +0200)] 
updateOriginUrl: remove 'query string' case from ignore list

Two urls with a different query string may refer to two different pages
so keep them both.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
11 months agoupdateOriginUrl: add comment blocks for the parse_url diff check
Kevin Decherf [Wed, 24 Oct 2018 20:11:35 +0000 (22:11 +0200)] 
updateOriginUrl: add comment blocks for the parse_url diff check

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
11 months agoupdateOriginUrl: rewrite some if, resolving feedbacks from PR
Kevin Decherf [Wed, 24 Oct 2018 19:54:09 +0000 (21:54 +0200)] 
updateOriginUrl: rewrite some if, resolving feedbacks from PR

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
11 months agoignoreOriginUrl: add initial support of ignore lists
Kevin Decherf [Mon, 22 Oct 2018 21:39:31 +0000 (23:39 +0200)] 
ignoreOriginUrl: add initial support of ignore lists

Add the ability to specify hosts and patterns lists to ignore the given
entry url and replace it with the fetched content url without touching
to origin_url.

This initial support should be reworked in the following months to move
the hardcoded ignore lists in the database.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
11 months agoupdateOriginUrl: add behavior when diff is fragment and query
Kevin Decherf [Mon, 22 Oct 2018 21:08:58 +0000 (23:08 +0200)] 
updateOriginUrl: add behavior when diff is fragment and query

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
11 months agoRefactor updateOriginUrl to include new behaviors behaviors
Kevin Decherf [Thu, 6 Sep 2018 20:26:20 +0000 (22:26 +0200)] 
Refactor updateOriginUrl to include new behaviors behaviors

- Leave origin_url unchanged if difference is an ending slash
- Leave origin_url unchanged if difference is scheme
- Ignore (noop) if difference is query string or fragment

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
11 months agoContentProxy: swap entry url to origin_url and set new url according to graby content
Kevin Decherf [Sun, 7 Jan 2018 16:28:04 +0000 (17:28 +0100)] 
ContentProxy: swap entry url to origin_url and set new url according to graby content

Closes #3529

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
11 months agoContentProxy: fix a corner case when entry.url is empty in updateEntry
Kevin Decherf [Sun, 7 Jan 2018 16:25:26 +0000 (17:25 +0100)] 
ContentProxy: fix a corner case when entry.url is empty in updateEntry

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
11 months agoMerge pull request #3733 from Deuchnord/root-abort-update
Kevin Decherf [Wed, 17 Oct 2018 09:26:12 +0000 (11:26 +0200)] 
Merge pull request #3733 from Deuchnord/root-abort-update

Abort running install and update script if root

11 months agoAdded argument to ignore the warning. 3733/head
Jérôme Deuchnord [Tue, 16 Oct 2018 18:32:25 +0000 (20:32 +0200)] 
Added argument to ignore the warning.

11 months agoMerge pull request #3745 from burkemw3/patch-3
Jérémy Benoist [Tue, 16 Oct 2018 07:45:22 +0000 (07:45 +0000)] 
Merge pull request #3745 from burkemw3/patch-3

Add placeholder image to card-based gallery entries page

11 months agoAdd placeholder image to card-based gallery entries page for #3651 3745/head
Matt Burke [Sat, 13 Oct 2018 18:30:34 +0000 (14:30 -0400)] 
Add placeholder image to card-based gallery entries page for #3651

I referenced https://css-tricks.com/using-svg/ for using the SVG icon.
The icon has a black foreground and white background, which doesn't
look very good as a placeholder. So, using the background-image style
to show the svg and the inversion filter to make it white on gray.

With the image always present, there isn't much difference between
the with and without image preview templates, so I merged them.

Tested on Chrome, Firefox, and Safari on OSX.

11 months agoMerge pull request #3606 from mritzmann/master
Jérémy Benoist [Mon, 15 Oct 2018 08:30:26 +0000 (08:30 +0000)] 
Merge pull request #3606 from mritzmann/master

add manifest.json for android pwa

12 months agoMerge pull request #3706 from shtrom/fix/gnu-make-bash
Kevin Decherf [Sun, 14 Oct 2018 18:07:42 +0000 (20:07 +0200)] 
Merge pull request #3706 from shtrom/fix/gnu-make-bash

Makefile fixes for non GNU systems

12 months agoMerge pull request #3743 from burkemw3/patch-1
Jérémy Benoist [Sat, 13 Oct 2018 12:00:00 +0000 (12:00 +0000)] 
Merge pull request #3743 from burkemw3/patch-1

Show tags on non-image gallery preview card

12 months agoMerge pull request #3734 from davidmohamedfr/fix-dockerfile-php72
Jérémy Benoist [Sat, 13 Oct 2018 06:30:10 +0000 (06:30 +0000)] 
Merge pull request #3734 from davidmohamedfr/fix-dockerfile-php72

Fix dockerfile php72

12 months agoShow tags on non-image gallery preview card 3743/head
Matt Burke [Thu, 11 Oct 2018 23:47:48 +0000 (19:47 -0400)] 
Show tags on non-image gallery preview card

Tags and images aren't coupled, so they shouldn't be coupled in
the UI, either. This also makes the titles and source domains show
up consistently for image and non-image entry cards.

12 months agolibpng12-dev was rename as libpng-dev 3734/head
David MOHAMED [Sat, 6 Oct 2018 12:15:59 +0000 (14:15 +0200)] 
libpng12-dev was rename as libpng-dev

12 months agoremove mcrypt since openssl is included in php 7.2
David MOHAMED [Sat, 6 Oct 2018 12:15:01 +0000 (14:15 +0200)] 
remove mcrypt since openssl is included in php 7.2

mcrypt extension doesn't exist anymore