Commit graph

4389 commits

Author SHA1 Message Date
Kevin Decherf 66697b29b9 views: escape piwik host and siteId to prevent XSS
Fixes CVE-2018-11352

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2018-09-23 22:46:09 +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
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
Jérémy Benoist 6337b46e80
Merge pull request #3678 from anmol26s/patch-1
Propose YunoHost badge for installing
2018-07-06 05:40:03 +00:00
Jérémy Benoist 9216bab8c9
Merge pull request #3683 from Simounet/fix/iframe-video-width-shared
Fix mobile viewport on big iframe and video elements
2018-07-06 05:38:39 +00:00
Jérémy Benoist 9bc086071a
Merge pull request #3686 from wallabag/remove-trusted-proxies
Remove remaining deprecation notices
2018-07-06 05:38:02 +00:00
Jeremy Benoist 80336f77fd
The 'framework.trusted_proxies' configuration key has been deprecated in Symfony 3.3 2018-07-05 21:01:45 +02:00
Jérémy Benoist 200392b462
Merge pull request #3685 from wallabag/fix-random-failing-test
Replace SO url by lemonde.fr to avoid random failing test
2018-07-05 13:37:28 +00:00
Jeremy Benoist 9c48053b14
Replace SO url by lemonde
Looks like we got a lot of random failing while grabing SO content, replacing it might fix the problem.
2018-07-05 14:50:27 +02:00
Jérémy Benoist 18167b9a24
Merge pull request #3684 from Simounet/fix/empty-image-download-error
Fix image downloading on null image path
2018-07-05 12:15:50 +00:00
Simounet 3fbbe0d9f1 Fix image downloading on null image path 2018-07-05 11:40:51 +02:00
Simounet 6cf7f21dcb Fix mobile viewport on big iframe and video elements 2018-06-28 15:22:51 +02:00
anmol26s 8d09f57c0d
Propose YunoHost badge for installing
The YunoHost have working Wallabag package with working install,remove,update,backup and restore scripts. YunoHost makes self -hosting easy for the end users. Please add the this badge so that people can find this solution.
2018-06-22 02:43:43 +05:30
Jérémy Benoist e586d65b64
Merge pull request #3675 from wallabag/prepare-2.3.3
Prepare 2.3.3 release
2018-06-19 07:44:48 +00:00
Jeremy Benoist 7ddba67745
Prepare 2.3.3 release 2018-06-19 06:50:13 +02:00
Jérémy Benoist 7ebd4bdcf7
Merge pull request #3538 from wallabag/fix-migrations-dash
Fixed migrations with dash into db names
2018-06-15 05:25:44 +00:00
Jeremy Benoist 49b4c87598
We should able to get the table name unescaped
When we want to perform complex queries to retrieve metadata from the database
2018-06-14 14:15:07 +02:00
Jeremy Benoist bfe7a69226
Fixed migrations with dash into db name 2018-06-14 13:43:09 +02:00
Jérémy Benoist 36054f5dd4
Merge pull request #3636 from flozz/syntax-highlight
Highlight code in articles using highlight.js
2018-06-07 06:22:14 +00:00
Jérémy Benoist c00a691019
Merge pull request #3668 from wallabag/fix-tests
Fix tests
2018-06-07 06:21:06 +00:00
Jeremy Benoist 778543311f
Fix tests 2018-06-06 17:34:20 +02:00
Jérémy Benoist a550a64c84
Merge pull request #3614 from comradekingu/patch-3
Spelling: GitHub, Log out, of the dev
2018-06-06 14:26:40 +00:00
Jérémy Benoist def73759ae
Merge pull request #3664 from Simounet/fix/entry-attributes-encoding
Fix authors and preview alt encoding display
2018-06-05 04:33:37 +00:00