mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-17 05:06:28 +00:00
Code Issues Projects Releases Wiki Activity
4528 commits 12 branches 100 tags 173 MiB
Commit graph

4528 commits

This branch
This branch
All branches
Author SHA1 Message Date
Olivier Mehani
0452e869ec
Fix documentation wording for matches/notmatches tagging rules 
Signed-off-by: Olivier Mehani <shtrom@ssji.net>
 2018-10-31 19:56:48 +11:00
Jérémy Benoist
385dac6d31
Merge pull request #3763 from wallabag/ghpr-template-update 
Add note on GitHub PR template to auto-close issues
 2018-10-27 06:15:03 +00:00
Kevin Decherf
96823682f9 misc: add note on GitHub PR template to auto-close issues 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2018-10-26 23:50:55 +02:00
Kevin Decherf
a6e4e83809
Merge pull request #3553 from wallabag/url-3529 
Swap entry url with origin url if graby provides an updated one
 2018-10-26 11:31:41 +02:00
Kevin Decherf
1b220426e2 phpcs 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2018-10-24 22:33:32 +02:00
Kevin Decherf
6059967951 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>
 2018-10-24 22:27:27 +02:00
Kevin Decherf
44e63667d9 updateOriginUrl: add comment blocks for the parse_url diff check 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2018-10-24 22:13:03 +02:00
Kevin Decherf
5ba5e22a09 updateOriginUrl: rewrite some if, resolving feedbacks from PR 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2018-10-24 21:54:09 +02:00
Kevin Decherf
b49c87acf1 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>
 2018-10-22 23:42:09 +02:00
Kevin Decherf
fc040c749d updateOriginUrl: add behavior when diff is fragment and query 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2018-10-22 23:08:58 +02:00
Kevin Decherf
e07fadea76 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>
 2018-10-22 23:01:16 +02:00
Kevin Decherf
781864b954 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>
 2018-10-21 16:15:31 +02:00
Kevin Decherf
4a81360efc ContentProxy: fix a corner case when entry.url is empty in updateEntry 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2018-10-21 16:13:20 +02:00
Kevin Decherf
ae4f7dceec
Merge pull request #3733 from Deuchnord/root-abort-update 
Abort running install and update script if root
 2018-10-17 11:26:12 +02:00
Jérôme Deuchnord
c2bd272cf3 Added argument to ignore the warning. 2018-10-16 20:34:28 +02:00
Jérémy Benoist
0658ce4f11
Merge pull request #3745 from burkemw3/patch-3 
Add placeholder image to card-based gallery entries page
 2018-10-16 07:45:22 +00:00
Matt Burke
cefbe6a87f 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.
 2018-10-15 23:59:39 -04:00
Jérémy Benoist
fbdc665487
Merge pull request #3606 from mritzmann/master 
add manifest.json for android pwa
 2018-10-15 08:30:26 +00:00
Kevin Decherf
0ebf595c11
Merge pull request #3706 from shtrom/fix/gnu-make-bash 
Makefile fixes for non GNU systems
 2018-10-14 20:07:42 +02:00
Jérémy Benoist
ba69c04c27
Merge pull request #3743 from burkemw3/patch-1 
Show tags on non-image gallery preview card
 2018-10-13 12:00:00 +00:00
Jérémy Benoist
78ef840eda
Merge pull request #3734 from davidmohamedfr/fix-dockerfile-php72 
Fix dockerfile php72
 2018-10-13 06:30:10 +00:00
Matt Burke
d73bfdbddb
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.
 2018-10-11 19:47:48 -04:00
David MOHAMED
f5c862640b libpng12-dev was rename as libpng-dev 2018-10-06 14:15:59 +02:00
David MOHAMED
9e83c3bdf0 remove mcrypt since openssl is included in php 7.2 
mcrypt extension doesn't exist anymore
 2018-10-06 14:15:01 +02:00
Jérôme Deuchnord
23aa47d828 Abort running install and update script if root (closes #3590) 2018-10-06 12:23:40 +02:00
Kevin Decherf
0f5c15d543
Merge pull request #3725 from Tobi823/master 
Bugfix: Sanitize the title of a saved webpage from invalid UTF-8 characters.
 2018-09-24 18:34:16 +02:00
Tobi823
28cc645b93 Run php-cs-fixer for fixing coding standard issues (on ContentProxyTest) 2018-09-23 23:42:05 +02:00
Tobi823
83f1c3274f Run php-cs-fixer for fixing coding standard issues 2018-09-23 22:20:43 +02:00
Tobi823
d64139d812 Make helper methods strToHex and hexToStr in ContentProxyTest.php private 
to prevent misusage (from outside this class)
 2018-09-21 13:31:28 +02:00
Tobi823
7a65c2017b Override the value of the given parameter ($title) with the (hopefully) 
correct (to UTF-8) converted PDF title
 2018-09-21 13:23:39 +02:00
Tobi823
c01d953292 Add tests for logic 
Try to translate the title of a PDF from UTF-8 (then UTF-16BE, then WINDOWS-1252) to UTF-8
 2018-09-21 13:15:00 +02:00
Tobi823
f80f16dfc8 Try to detect the character encoding in PDFs and try to translate 
the title from the PDF to UTF-8
 2018-09-21 13:15:00 +02:00
Tobi823
8648f0c005 Remove type declaration for PHP 5 compatibility 2018-09-21 13:15:00 +02:00
Tobi823
d76a5a6d60 Bugfix: Sanitize the title of a saved webpage from invalid UTF-8 characters 2018-09-21 13:15:00 +02:00
Jérémy Benoist
759c91940b
Merge pull request #3726 from wallabag/fix-tests 
Liberation goes https
 2018-09-21 08:16:27 +00:00
Jeremy Benoist
84b3bdaac0
Liberation goes https 2018-09-21 09:07:40 +02:00
Kevin Decherf
8013f35d96
Merge pull request #3719 from wallabag/fix-sort-parameters 
Fix sort parameters
 2018-09-07 17:02:39 +02:00
Jeremy Benoist
c0b65ad1c9
Updating node to 6.10 
Same as defined in .travis.yml
 2018-09-07 15:18:00 +02:00
Jeremy Benoist
4408ebd40a
Fix tests 2018-09-07 15:18:00 +02:00
Jeremy Benoist
8d109df851
Jump to the new Scrutinizer PHP analysis engine 2018-09-07 15:18:00 +02:00
Jeremy Benoist
17476f4d8d
Add missing parameters 
Parameters weren’t passed to the sub function.
 2018-09-07 13:56:14 +02:00
Jérémy Benoist
495f83c925
Merge pull request #3712 from wallabag/refactor-entry-queries 
Rename getBuilderByUser and refactor query for untagged entries
 2018-09-07 11:43:07 +00:00
Kevin Decherf
eb5e3f1d1d
Merge pull request #3717 from wallabag/php-72 
PHP 7.2 shouldn't fail
 2018-09-06 11:28:57 +02:00
Jérémy Benoist
04f85fd9a8
PHP 7.2 shouldn't fail 2018-09-06 07:58:26 +02:00
Kevin Decherf
b8115ff46b php-cs-fixer 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2018-09-05 18:44:08 +02:00
Kevin Decherf
0636697289 EntryRepository: refactor getBuilderForUntaggedByUser 
Improve SQL performance by replacing size(e.tags) with a left join and a
null condition

Move the QueryBuilder logic into getRawBuilderForUntaggedByUser

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2018-09-05 18:44:08 +02:00
Kevin Decherf
b7c5fda512 EntryRepository: refactor getBuilderByUser 
We refactor getBuilderByUser to separate QueryBuilder getter and the
orderBy(). The previous code of getBuilderByUser() has been moved to
getSortedQueryBuilderByUser(). getBuildByUser() now returns a
QueryBuilder without the call to orderBy().

A new method named sortQueryBuilder() returns a given QueryBuilder with
an orderBy() call using given sort parameters.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2018-09-05 18:44:08 +02:00
Kevin Decherf
69b563948d AnnotationRepository: rename getBuilderByUser 
We rename getBuilderByUser to getSortedQueryBuilderByUser as long as the
method currently returns a QueryBuilder with an orderBy()

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2018-09-05 18:44:08 +02:00
Jérémy Benoist
ada5d5b269
Merge pull request #3716 from wallabag/csfixer 
php-cs-fixer: native_function_invocation
 2018-09-05 16:38:20 +00:00
Kevin Decherf
2a1ceb67b4 php-cs-fixer 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2018-09-05 14:25:32 +02:00