Commit graph

4412 commits

Author SHA1 Message Date
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
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
Jérémy Benoist
685a5d745e
Merge pull request #3707 from wallabag/fix-test-de-at
Removing failing test from Travis
2018-08-19 18:15:11 +02:00
Jeremy Benoist
72efc80fdc
Removing failing test from Travis 2018-08-19 16:38:48 +02:00
Jérémy Benoist
fea06d19f3
Merge pull request #3705 from wallabag/update-release
Update release script
2018-08-19 09:17:40 +02:00
Olivier Mehani
681e04b060
Makefile fixes for non GNU systems
* Move `Makefile` to `GNUmakefile`, which GNU `make` picks first
* Add `Makefile` so other `make`s forward to `gmake`
* Set the `SHELL` variable and let `make` handle the shell

Signed-off-by: Olivier Mehani <shtrom@ssji.net>
2018-08-18 18:50:18 +10:00
Jeremy Benoist
2bf568ff46
Update release script 2018-08-17 14:40:06 +02:00
Jérémy Benoist
1421236800
Merge pull request #3702 from aleksandar-todorovic/patch-1
Fixes a typo
2018-08-16 14:45:23 +02:00
Aleksandar Todorović (r3bl)
e0a9791412
Fixes another typo 2018-08-10 20:28:48 +02:00
Aleksandar Todorović (r3bl)
7fd4ad6564
Fixes a typo 2018-08-10 20:15:46 +02:00
Jérémy Benoist
d29b18e82e
Merge pull request #3690 from Simounet/fix/srcset-attribute
More robust srcset image attribute handling
2018-07-23 16:24:20 +00:00
Simounet
e6f12c0734 More robust srcset image attribute handling
Linked to HTMLawed PR https://github.com/kesar/HTMLawed/pull/17
2018-07-12 14:29:30 +02:00
Jérémy Benoist
0f36a88e16
Merge pull request #3692 from Simounet/feature/svg-logo
Feature/svg logo
2018-07-12 11:31:30 +00:00
Simounet
e93f37206a wallabag logo (side-nav) replaced by an SVG one 2018-07-11 21:57:53 +02:00
Simounet
4c78612eb4 wallabag logo with typo replaced by an SVG one 2018-07-11 21:51:52 +02:00
Simounet
2fdd512488 Fake wallabag logo data image replaced by real SVG 2018-07-11 21:25:46 +02:00
Jérémy Benoist
9b12f822e1
Merge pull request #3691 from Simounet/feature/login-username-autofocus
Autofocus the username field on the login page
2018-07-11 18:49:38 +00:00
Simounet
d02e6850c2 Autofocus the username field on the login page 2018-07-11 20:10:51 +02:00