]> git.immae.eu Git - github/wallabag/wallabag.git/log
github/wallabag/wallabag.git
6 years agoCleanup
Jeremy Benoist [Wed, 24 Oct 2018 19:02:35 +0000 (21:02 +0200)] 
Cleanup

6 years agoFix RulerZBundle
Jeremy Benoist [Wed, 24 Oct 2018 18:33:46 +0000 (20:33 +0200)] 
Fix RulerZBundle

People should really follow semver and provide UPGRADE file when they
provide a library ...

6 years agoJump to PHP 7.1+
Jeremy Benoist [Wed, 24 Oct 2018 18:26:18 +0000 (20:26 +0200)] 
Jump to PHP 7.1+

6 years agoMerge remote-tracking branch 'origin/master' into 2.4
Jeremy Benoist [Sun, 25 Nov 2018 08:58:18 +0000 (09:58 +0100)] 
Merge remote-tracking branch 'origin/master' into 2.4

# Conflicts:
# web/wallassets/baggy.js
# web/wallassets/manifest.json
# web/wallassets/material.css
# web/wallassets/material.js

6 years 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

6 years 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

6 years 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

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

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

6 years 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

6 years 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

6 years 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

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

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

6 years 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

6 years 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

6 years 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

6 years 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

6 years 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

6 years 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

6 years 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

6 years 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

6 years 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>
6 years 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

6 years 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>
6 years 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

6 years 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>
6 years 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>
6 years 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>
6 years 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>
6 years 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>
6 years 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>
6 years 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>
6 years 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>
6 years 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>
6 years 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

6 years 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.

6 years 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

6 years 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.

6 years agoMerge pull request #3574 from shulard/feature/rename-tags
Jérémy Benoist [Mon, 15 Oct 2018 08:32:59 +0000 (08:32 +0000)] 
Merge pull request #3574 from shulard/feature/rename-tags

Allow to rename tags from the web interface.

6 years agoMerge pull request #3216 from wallabag/change-locale-register
Jérémy Benoist [Mon, 15 Oct 2018 08:31:42 +0000 (08:31 +0000)] 
Merge pull request #3216 from wallabag/change-locale-register

Added possibility to change locale from login/register pages

6 years 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

6 years 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

6 years 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

6 years agoEnsure language is valid 3216/head
Jeremy Benoist [Sat, 13 Oct 2018 07:24:39 +0000 (09:24 +0200)] 
Ensure language is valid

- Do not override locale if user has choosen a locale from the login screen.
- Add some tests about locale url

6 years agoAdded possibility to change locale from login/register pages
Nicolas Lœuillet [Mon, 12 Jun 2017 15:23:35 +0000 (17:23 +0200)] 
Added possibility to change locale from login/register pages

6 years 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

6 years 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.

6 years agoMerge pull request #3596 from glego/add-secure-email
Jérémy Benoist [Thu, 11 Oct 2018 09:34:52 +0000 (09:34 +0000)] 
Merge pull request #3596 from glego/add-secure-email

Add secure email

6 years agoAdd secure email 3596/head
Glenn Goffin [Fri, 23 Feb 2018 19:39:25 +0000 (20:39 +0100)] 
Add secure email

6 years agoMerge pull request #3731 from wallabag/symfony3.4
Jérémy Benoist [Mon, 8 Oct 2018 08:00:07 +0000 (08:00 +0000)] 
Merge pull request #3731 from wallabag/symfony3.4

Jump to Symfony 3.4

6 years 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

6 years 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

6 years agoAbort running install and update script if root (closes #3590)
Jérôme Deuchnord [Sat, 6 Oct 2018 10:23:40 +0000 (12:23 +0200)] 
Abort running install and update script if root (closes #3590)

6 years agoJump to Symfony 3.4 3731/head
Jeremy Benoist [Thu, 4 Oct 2018 12:07:20 +0000 (14:07 +0200)] 
Jump to Symfony 3.4

Thanks to the BC compatibility, almost nothing have to be changed.
All changes are related to new bundle version of:
- SensioFrameworkExtraBundle
- DoctrineFixturesBundle

6 years agoUpdate assets 3574/head
Jeremy Benoist [Tue, 25 Sep 2018 08:21:21 +0000 (10:21 +0200)] 
Update assets

6 years agoAdd tests about the tag renaming process.
Stéphane HULARD [Wed, 24 Jan 2018 16:53:00 +0000 (17:53 +0100)] 
Add tests about the tag renaming process.

6 years agoAdd specific styles for the card tag form element.
Stéphane HULARD [Wed, 24 Jan 2018 16:30:06 +0000 (17:30 +0100)] 
Add specific styles for the card tag form element.

Also add a `.hidden` class in the baggy theme to have consistency with material.

6 years agoAdd translations about latest Tag changes.
Stéphane HULARD [Wed, 24 Jan 2018 16:29:41 +0000 (17:29 +0100)] 
Add translations about latest Tag changes.

Add new translations in each language file.

6 years agoUpdate tag list template to allow renaming.
Stéphane HULARD [Wed, 24 Jan 2018 16:29:26 +0000 (17:29 +0100)] 
Update tag list template to allow renaming.

* Add a form on each tag to handle rename action.
* Add JavaScript to handle action on the corresponding page inside the global index.js file.
* Add support for the 2 active themes : material / baggy

The form solution is cleaner than an Ajax one because it let the browser validate input data and make the POST easier without the need to handle JSON response.

6 years agoAdd RenameForm as tag list view parameters.
Stéphane HULARD [Wed, 24 Jan 2018 17:04:39 +0000 (18:04 +0100)] 
Add RenameForm as tag list view parameters.

This will help handling the CSRF protection token and use symfony HTML generation layer.
Also a FormView instance is generated for each tag because we need to render a form for each tag and FormView are not reusable.

6 years agoCreate a new Tag action to rename tags.
Stéphane HULARD [Wed, 24 Jan 2018 16:27:16 +0000 (17:27 +0100)] 
Create a new Tag action to rename tags.

The current tag is removed from all the current logged user entries. Then the new one is created and attached.

6 years agoRename Tag : Add a new FormType
Stéphane HULARD [Tue, 23 Jan 2018 18:09:03 +0000 (19:09 +0100)] 
Rename Tag : Add a new FormType

6 years agoMerge pull request #3725 from Tobi823/master
Kevin Decherf [Mon, 24 Sep 2018 16:34:16 +0000 (18:34 +0200)] 
Merge pull request #3725 from Tobi823/master

Bugfix: Sanitize the title of a saved webpage from invalid UTF-8 characters.

6 years agoRun php-cs-fixer for fixing coding standard issues (on ContentProxyTest) 3725/head
Tobi823 [Sun, 23 Sep 2018 21:42:05 +0000 (23:42 +0200)] 
Run php-cs-fixer for fixing coding standard issues (on ContentProxyTest)

6 years agoRun php-cs-fixer for fixing coding standard issues
Tobi823 [Sun, 23 Sep 2018 20:20:43 +0000 (22:20 +0200)] 
Run php-cs-fixer for fixing coding standard issues

6 years agoMake helper methods strToHex and hexToStr in ContentProxyTest.php private
Tobi823 [Fri, 21 Sep 2018 11:31:28 +0000 (13:31 +0200)] 
Make helper methods strToHex and hexToStr in ContentProxyTest.php private
to prevent misusage (from outside this class)

6 years agoOverride the value of the given parameter ($title) with the (hopefully)
Tobi823 [Fri, 21 Sep 2018 11:23:39 +0000 (13:23 +0200)] 
Override the value of the given parameter ($title) with the (hopefully)
correct (to UTF-8) converted PDF title

6 years agoAdd tests for logic
Tobi823 [Wed, 19 Sep 2018 11:59:07 +0000 (13:59 +0200)] 
Add tests for logic
Try to translate the title of a PDF from UTF-8 (then UTF-16BE, then WINDOWS-1252) to UTF-8

6 years agoTry to detect the character encoding in PDFs and try to translate
Tobi823 [Wed, 19 Sep 2018 10:30:26 +0000 (12:30 +0200)] 
Try to detect the character encoding in PDFs and try to translate
the title from the PDF to UTF-8

6 years agoRemove type declaration for PHP 5 compatibility
Tobi823 [Wed, 19 Sep 2018 09:03:42 +0000 (11:03 +0200)] 
Remove type declaration for PHP 5 compatibility

6 years agoBugfix: Sanitize the title of a saved webpage from invalid UTF-8 characters
Tobi823 [Tue, 18 Sep 2018 13:04:19 +0000 (15:04 +0200)] 
Bugfix: Sanitize the title of a saved webpage from invalid UTF-8 characters

6 years agoMerge pull request #3630 from sviande/archived_at
Jérémy Benoist [Fri, 21 Sep 2018 09:46:58 +0000 (09:46 +0000)] 
Merge pull request #3630 from sviande/archived_at

Entry: add archived_at property and updateArchived method

6 years agoSort archive page by archived at 3630/head
Jeremy Benoist [Fri, 21 Sep 2018 09:18:29 +0000 (11:18 +0200)] 
Sort archive page by archived at

6 years agoCode Style
Sébastien Viande [Fri, 15 Jun 2018 09:30:54 +0000 (11:30 +0200)] 
Code Style

6 years agoEntry: add sort parameter archived
Sébastien Viande [Thu, 26 Apr 2018 05:20:52 +0000 (07:20 +0200)] 
Entry: add sort parameter archived

6 years agoEntry: add archived_at property and updateArchived method
Sébastien Viande [Wed, 11 Apr 2018 09:42:52 +0000 (11:42 +0200)] 
Entry: add archived_at property and updateArchived method

6 years agoMerge remote-tracking branch 'origin/master' into 2.4
Jeremy Benoist [Fri, 21 Sep 2018 08:17:38 +0000 (10:17 +0200)] 
Merge remote-tracking branch 'origin/master' into 2.4

6 years agoMerge pull request #3726 from wallabag/fix-tests
Jérémy Benoist [Fri, 21 Sep 2018 08:16:27 +0000 (08:16 +0000)] 
Merge pull request #3726 from wallabag/fix-tests

Liberation goes https

6 years agoLiberation goes https 3726/head
Jeremy Benoist [Fri, 21 Sep 2018 06:56:20 +0000 (08:56 +0200)] 
Liberation goes https

6 years agoMerge remote-tracking branch 'origin/master' into 2.4
Jeremy Benoist [Sun, 16 Sep 2018 17:45:37 +0000 (19:45 +0200)] 
Merge remote-tracking branch 'origin/master' into 2.4

6 years agoMerge pull request #3719 from wallabag/fix-sort-parameters
Kevin Decherf [Fri, 7 Sep 2018 15:02:39 +0000 (17:02 +0200)] 
Merge pull request #3719 from wallabag/fix-sort-parameters

Fix sort parameters

6 years agoUpdating node to 6.10 3719/head
Jeremy Benoist [Fri, 7 Sep 2018 12:20:02 +0000 (14:20 +0200)] 
Updating node to 6.10

Same as defined in .travis.yml

6 years agoFix tests
Jeremy Benoist [Fri, 7 Sep 2018 12:09:06 +0000 (14:09 +0200)] 
Fix tests

6 years agoJump to the new Scrutinizer PHP analysis engine
Jeremy Benoist [Fri, 7 Sep 2018 11:56:35 +0000 (13:56 +0200)] 
Jump to the new Scrutinizer PHP analysis engine

6 years agoAdd missing parameters
Jeremy Benoist [Fri, 7 Sep 2018 11:56:14 +0000 (13:56 +0200)] 
Add missing parameters

Parameters weren’t passed to the sub function.

6 years agoMerge remote-tracking branch 'origin/master' into 2.4
Jeremy Benoist [Fri, 7 Sep 2018 11:46:30 +0000 (13:46 +0200)] 
Merge remote-tracking branch 'origin/master' into 2.4

6 years agoMerge pull request #3712 from wallabag/refactor-entry-queries
Jérémy Benoist [Fri, 7 Sep 2018 11:43:07 +0000 (11:43 +0000)] 
Merge pull request #3712 from wallabag/refactor-entry-queries

Rename getBuilderByUser and refactor query for untagged entries

6 years agoMerge pull request #3717 from wallabag/php-72
Kevin Decherf [Thu, 6 Sep 2018 09:28:57 +0000 (11:28 +0200)] 
Merge pull request #3717 from wallabag/php-72

PHP 7.2 shouldn't fail

6 years agoPHP 7.2 shouldn't fail 3717/head
Jérémy Benoist [Thu, 6 Sep 2018 05:58:26 +0000 (07:58 +0200)] 
PHP 7.2 shouldn't fail

6 years agophp-cs-fixer 3712/head
Kevin Decherf [Sun, 2 Sep 2018 16:36:04 +0000 (18:36 +0200)] 
php-cs-fixer

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
6 years agoEntryRepository: refactor getBuilderForUntaggedByUser
Kevin Decherf [Sun, 2 Sep 2018 15:44:19 +0000 (17:44 +0200)] 
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>
6 years agoEntryRepository: refactor getBuilderByUser
Kevin Decherf [Sun, 2 Sep 2018 15:34:30 +0000 (17:34 +0200)] 
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>
6 years agoAnnotationRepository: rename getBuilderByUser
Kevin Decherf [Sun, 2 Sep 2018 15:32:32 +0000 (17:32 +0200)] 
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>
6 years agoMerge pull request #3716 from wallabag/csfixer
Jérémy Benoist [Wed, 5 Sep 2018 16:38:20 +0000 (16:38 +0000)] 
Merge pull request #3716 from wallabag/csfixer

php-cs-fixer: native_function_invocation

6 years agophp-cs-fixer 3716/head
Kevin Decherf [Wed, 5 Sep 2018 12:25:32 +0000 (14:25 +0200)] 
php-cs-fixer

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
6 years agoMerge pull request #3707 from wallabag/fix-test-de-at
Jérémy Benoist [Sun, 19 Aug 2018 16:15:11 +0000 (18:15 +0200)] 
Merge pull request #3707 from wallabag/fix-test-de-at

Removing failing test from Travis

6 years agoRemoving failing test from Travis 3707/head
Jeremy Benoist [Sun, 19 Aug 2018 14:38:48 +0000 (16:38 +0200)] 
Removing failing test from Travis

6 years agoMerge pull request #3705 from wallabag/update-release
Jérémy Benoist [Sun, 19 Aug 2018 07:17:40 +0000 (09:17 +0200)] 
Merge pull request #3705 from wallabag/update-release

Update release script

6 years agoMakefile fixes for non GNU systems 3706/head
Olivier Mehani [Sat, 18 Aug 2018 05:39:37 +0000 (15:39 +1000)] 
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>