]> git.immae.eu Git - github/wallabag/wallabag.git/log
github/wallabag/wallabag.git
5 years agoUse a better index for hashed_url
Jeremy Benoist [Mon, 1 Apr 2019 11:51:57 +0000 (13:51 +0200)] 
Use a better index for hashed_url

It'll most often be used in addition to the `user_id`.
Also, automatically generate the hash when saving the url.
Switch from `md5` to `sha1`.

5 years agoKeep url in exists endpoint
Jeremy Benoist [Mon, 1 Apr 2019 09:50:33 +0000 (11:50 +0200)] 
Keep url in exists endpoint

- Add migration
- Use md5 instead of sha512 (we don't need security here, just a hash)
- Update tests

5 years agoHash the urls to check if they exist
Thomas Citharel [Sun, 28 May 2017 12:53:04 +0000 (14:53 +0200)] 
Hash the urls to check if they exist

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
5 years agoMerge remote-tracking branch 'origin/master' into 2.4
Jeremy Benoist [Mon, 1 Apr 2019 11:16:15 +0000 (13:16 +0200)] 
Merge remote-tracking branch 'origin/master' into 2.4

5 years agoMerge pull request #3909 from wallabag/fix/html-not-defined
Jérémy Benoist [Mon, 18 Mar 2019 08:26:33 +0000 (09:26 +0100)] 
Merge pull request #3909 from wallabag/fix/html-not-defined

Fix PHP warning

5 years agoMerge pull request #3908 from wallabag/epub-issue-3642
Jérémy Benoist [Mon, 18 Mar 2019 08:26:16 +0000 (09:26 +0100)] 
Merge pull request #3908 from wallabag/epub-issue-3642

epub: fix exception when articles have the same title

5 years agoMerge pull request #3860 from baurmatt/fix/posix_compatibility
Jérémy Benoist [Mon, 18 Mar 2019 08:25:00 +0000 (09:25 +0100)] 
Merge pull request #3860 from baurmatt/fix/posix_compatibility

Make dev/install/update script posix compatible

5 years agoFix PHP warning 3909/head
Jeremy Benoist [Mon, 18 Mar 2019 05:23:41 +0000 (06:23 +0100)] 
Fix PHP warning

Looks like sometimes (usually from import) the `html` key isn’t available.

5 years agoepub: fix exception when articles have the same title 3908/head
Kevin Decherf [Sun, 17 Mar 2019 22:36:10 +0000 (23:36 +0100)] 
epub: fix exception when articles have the same title

This commit fixes an exception occuring when exporting as epub several
articles with the same title. The chapter filename is now derived from
title and url.

Fixes #3642

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
5 years agoProperly source require.sh 3860/head
Matthias Baur [Thu, 17 Jan 2019 19:04:57 +0000 (20:04 +0100)] 
Properly source require.sh

Fixes #3571.

5 years agoMerge pull request #3901 from wallabag/fix-pr-3893
Kevin Decherf [Sat, 9 Mar 2019 11:19:31 +0000 (12:19 +0100)] 
Merge pull request #3901 from wallabag/fix-pr-3893

material: fix left padding on non-entry pages introduced by #3893

5 years agomaterial: fix left padding on non-entry pages introduced by #3893 3901/head
Kevin Decherf [Fri, 8 Mar 2019 23:27:50 +0000 (00:27 +0100)] 
material: fix left padding on non-entry pages introduced by #3893

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
5 years agoMerge pull request #3897 from wallabag/2.3.8-dev
Jérémy Benoist [Mon, 4 Mar 2019 14:23:06 +0000 (15:23 +0100)] 
Merge pull request #3897 from wallabag/2.3.8-dev

Jump to 2.3.8-dev

5 years agoJump to 2.3.8-dev 3897/head
Jeremy Benoist [Mon, 4 Mar 2019 12:49:23 +0000 (13:49 +0100)] 
Jump to 2.3.8-dev

5 years agoMerge pull request #3895 from wallabag/prepare-2.3.7
Jérémy Benoist [Mon, 4 Mar 2019 11:06:22 +0000 (12:06 +0100)] 
Merge pull request #3895 from wallabag/prepare-2.3.7

Prepare 2.3.7 release

5 years agoPrepare 2.3.7 release 3895/head
Jeremy Benoist [Mon, 4 Mar 2019 08:32:26 +0000 (09:32 +0100)] 
Prepare 2.3.7 release

5 years agoMerge pull request #3894 from wallabag/issue-3851
Kevin Decherf [Sun, 3 Mar 2019 19:22:30 +0000 (20:22 +0100)] 
Merge pull request #3894 from wallabag/issue-3851

material: hide creation date from card actions on specific sizes

5 years agomaterial: update prod assets 3894/head
Kevin Decherf [Sun, 3 Mar 2019 18:24:34 +0000 (19:24 +0100)] 
material: update prod assets

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
5 years agomaterial: add media queries to hide creation date from card actions
Kevin Decherf [Sun, 3 Mar 2019 01:16:19 +0000 (02:16 +0100)] 
material: add media queries to hide creation date from card actions

Hide the creation date from card actions on specific sizes when there's
not enough space for all parts.

Fixes #3851

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
5 years agomaterial: wrap card actions, remove class hiding of creation date
Kevin Decherf [Sun, 3 Mar 2019 01:13:14 +0000 (02:13 +0100)] 
material: wrap card actions, remove class hiding of creation date

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
5 years agoMerge pull request #3893 from wallabag/issue-3877
Kevin Decherf [Sun, 3 Mar 2019 18:22:03 +0000 (19:22 +0100)] 
Merge pull request #3893 from wallabag/issue-3877

material: fix left padding of content on medium screens

5 years agomaterial: fix left padding of content on medium screens 3893/head
Kevin Decherf [Sat, 2 Mar 2019 22:46:00 +0000 (23:46 +0100)] 
material: fix left padding of content on medium screens

Fixes #3877

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
5 years agomaterial: move a media query from cards to dedicated scss file
Kevin Decherf [Sat, 2 Mar 2019 21:48:43 +0000 (22:48 +0100)] 
material: move a media query from cards to dedicated scss file

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
5 years agoMerge pull request #3868 from Nadrieril/fix-3662
Kevin Decherf [Sat, 2 Mar 2019 16:20:18 +0000 (17:20 +0100)] 
Merge pull request #3868 from Nadrieril/fix-3662

Add missing entries in craue_config_setting.

5 years agoDisable down for that migration 3868/head
Jeremy Benoist [Fri, 1 Mar 2019 19:26:51 +0000 (20:26 +0100)] 
Disable down for that migration

5 years agoTest each internal settings before creating them
Jeremy Benoist [Wed, 27 Feb 2019 12:39:17 +0000 (13:39 +0100)] 
Test each internal settings before creating them

5 years agoAdd missing entries in craue_config_setting.
Nadrieril [Tue, 29 Jan 2019 13:24:38 +0000 (14:24 +0100)] 
Add missing entries in craue_config_setting.

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

5 years agoMerge pull request #3885 from mart-e/script-ignore-root
Jérémy Benoist [Fri, 1 Mar 2019 19:22:22 +0000 (20:22 +0100)] 
Merge pull request #3885 from mart-e/script-ignore-root

Allow optional --ignore-root-warning

5 years agoMerge pull request #3857 from wallabag/php73
Jérémy Benoist [Wed, 27 Feb 2019 14:31:57 +0000 (15:31 +0100)] 
Merge pull request #3857 from wallabag/php73

Replace continue; with break; to avoid PHP 7.3 warnings

5 years agoAdding more tests 3857/head
Jeremy Benoist [Wed, 27 Feb 2019 13:59:50 +0000 (14:59 +0100)] 
Adding more tests

5 years agoCS
Jeremy Benoist [Wed, 27 Feb 2019 13:33:26 +0000 (14:33 +0100)] 
CS

5 years agoReplace continue; with break; to avoid PHP 7.3 warnings
Thomas Citharel [Sat, 12 Jan 2019 12:09:36 +0000 (13:09 +0100)] 
Replace continue; with break; to avoid PHP 7.3 warnings

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
5 years agoMerge pull request #3886 from wallabag/issue-3602
Jérémy Benoist [Mon, 25 Feb 2019 13:03:41 +0000 (14:03 +0100)] 
Merge pull request #3886 from wallabag/issue-3602

epub export: fix missing cover image, only for exports of one article

5 years agoMerge pull request #3887 from wallabag/issue-3711
Jérémy Benoist [Mon, 25 Feb 2019 09:56:07 +0000 (10:56 +0100)] 
Merge pull request #3887 from wallabag/issue-3711

Add support of expect parameter to change return object when deleting entry

5 years agotests: fix broken session clients for rest entry deletion tests 3887/head
Kevin Decherf [Sun, 17 Feb 2019 17:19:51 +0000 (18:19 +0100)] 
tests: fix broken session clients for rest entry deletion tests

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
5 years agoEntryRestController: add support of expect parameter to delete action
Kevin Decherf [Sun, 17 Feb 2019 14:30:42 +0000 (15:30 +0100)] 
EntryRestController: add support of expect parameter to delete action

The expect parameter enables an application to request the whole entry
or only the id when requesting its deletion.

`expects` defaults to `entry` to prevent any API breakage.

Fixes #3711

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
5 years agoepub export: fix missing cover image, only for exports of one article 3886/head
Kevin Decherf [Sat, 16 Feb 2019 19:37:20 +0000 (20:37 +0100)] 
epub export: fix missing cover image, only for exports of one article

Fixes #3602

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
5 years agotests: create entry for testDeleteEntry, fix missing id
Kevin Decherf [Sun, 17 Feb 2019 14:25:21 +0000 (15:25 +0100)] 
tests: create entry for testDeleteEntry, fix missing id

When using the entity manager to retrieve an already stored entry, the
id disapears from $entry after the first delete call. This leads to
testing a nonexistent endpoint (api/entries/.json) during the second
delete call.

This change now creates an entry specifically for the test.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
5 years agoAllow optional --ignore-root-warning 3885/head
Martin Trigaux [Thu, 14 Feb 2019 11:10:51 +0000 (16:40 +0530)] 
Allow optional --ignore-root-warning

Now both
./install prod --ignore-root-warning
./install --ignore-root-warning prod

will work

$1 was both used for the environment and the root flag

Fixes wallabag/wallabag#3884

5 years agoMerge pull request #3882 from wallabag/fix/cors
Kevin Decherf [Wed, 13 Feb 2019 14:05:57 +0000 (15:05 +0100)] 
Merge pull request #3882 from wallabag/fix/cors

Fix CORS for API

5 years agoCS 3882/head
Jeremy Benoist [Wed, 13 Feb 2019 13:06:57 +0000 (14:06 +0100)] 
CS

5 years agoCS
Jeremy Benoist [Mon, 11 Feb 2019 10:50:24 +0000 (11:50 +0100)] 
CS

5 years agoCORS repare for api
Rurik19 [Wed, 4 Oct 2017 09:19:09 +0000 (12:19 +0300)] 
CORS repare for api

5 years agoMerge pull request #3879 from wallabag/fix/url-default-protocol
Jérémy Benoist [Fri, 8 Feb 2019 14:39:51 +0000 (15:39 +0100)] 
Merge pull request #3879 from wallabag/fix/url-default-protocol

Force default_protocol to generate an url input

5 years agoForce default_protocol to generate an url input 3879/head
Jeremy Benoist [Fri, 8 Feb 2019 14:03:52 +0000 (15:03 +0100)] 
Force default_protocol to generate an url input

5 years agoMerge remote-tracking branch 'origin/master' into 2.4
Jeremy Benoist [Thu, 7 Feb 2019 17:01:15 +0000 (18:01 +0100)] 
Merge remote-tracking branch 'origin/master' into 2.4

5 years agoMerge pull request #3869 from itsthejb/fix-2factor-email-image 3368/head
Jérémy Benoist [Fri, 1 Feb 2019 11:58:31 +0000 (12:58 +0100)] 
Merge pull request #3869 from itsthejb/fix-2factor-email-image

Fix broken 2 factor auth logo image

5 years agoFix broken 2 factor auth logo image 3869/head
Jonathan Crooke [Thu, 31 Jan 2019 21:14:53 +0000 (22:14 +0100)] 
Fix broken 2 factor auth logo image

5 years agoMerge pull request #3798 from wallabag/update-two-factor-bundle
Kevin Decherf [Wed, 30 Jan 2019 00:02:27 +0000 (01:02 +0100)] 
Merge pull request #3798 from wallabag/update-two-factor-bundle

Enable OTP 2FA

5 years agoMerge pull request #3819 from stan3/pocket-import
Jérémy Benoist [Mon, 28 Jan 2019 10:34:37 +0000 (11:34 +0100)] 
Merge pull request #3819 from stan3/pocket-import

Fix read & starred status in Pocket import

5 years agoImprove checks & add tests 3819/head
Jeremy Benoist [Mon, 28 Jan 2019 05:03:16 +0000 (06:03 +0100)] 
Improve checks & add tests

5 years agostatus and favourite are actually strings in the import so use ==
Tristan Hill [Sat, 22 Dec 2018 11:36:13 +0000 (11:36 +0000)] 
status and favourite are actually strings in the import so use ==

5 years agoHash backup codes in the database using `password_hash` update-two-factor-bundle 3798/head
Jeremy Benoist [Wed, 23 Jan 2019 13:43:39 +0000 (14:43 +0100)] 
Hash backup codes in the database using `password_hash`

5 years agoRevert PG on Travis about drop/create the database
Jeremy Benoist [Wed, 23 Jan 2019 12:47:51 +0000 (13:47 +0100)] 
Revert PG on Travis about drop/create the database

5 years agoCS
Jeremy Benoist [Sat, 19 Jan 2019 19:19:56 +0000 (20:19 +0100)] 
CS

5 years agoChange the way to enable 2FA
Jeremy Benoist [Fri, 18 Jan 2019 21:46:44 +0000 (22:46 +0100)] 
Change the way to enable 2FA

And add a step to validate a generated code from the OTP app

5 years agoRemove secret from admin
Jeremy Benoist [Fri, 7 Dec 2018 17:01:06 +0000 (18:01 +0100)] 
Remove secret from admin

5 years agoUpdate translation
Jeremy Benoist [Fri, 7 Dec 2018 17:00:57 +0000 (18:00 +0100)] 
Update translation

5 years agoFix PG & Travis drop/create database
Jeremy Benoist [Wed, 5 Dec 2018 13:29:46 +0000 (14:29 +0100)] 
Fix PG & Travis drop/create database

5 years agoAdd SQLite & PG migration
Jeremy Benoist [Wed, 5 Dec 2018 10:39:51 +0000 (11:39 +0100)] 
Add SQLite & PG migration

Also remove the forced `server_version` from dbal config to avoid an
hard overriding across all database.

5 years agoAdd backup codes
Jeremy Benoist [Mon, 3 Dec 2018 05:51:06 +0000 (06:51 +0100)] 
Add backup codes

5 years agoBetter translations
Jeremy Benoist [Mon, 3 Dec 2018 05:15:57 +0000 (06:15 +0100)] 
Better translations

Replace “Google Authenticator” by “Google Authenticator, Authy or FreeOTP” in all text.

Translate how to use the code / qr code.

5 years agoCleanup
Jeremy Benoist [Sun, 2 Dec 2018 17:47:34 +0000 (18:47 +0100)] 
Cleanup

5 years agoFix tests
Jeremy Benoist [Sun, 2 Dec 2018 17:39:02 +0000 (18:39 +0100)] 
Fix tests

5 years agoFix test for custom version of the tidy extension
Jeremy Benoist [Sun, 2 Dec 2018 16:25:56 +0000 (17:25 +0100)] 
Fix test for custom version of the tidy extension

5 years agoEnable OTP 2FA
Jeremy Benoist [Sun, 2 Dec 2018 11:43:05 +0000 (12:43 +0100)] 
Enable OTP 2FA

- Update SchebTwoFactorBundle to version 3
- Enable Google 2fa on the bundle
- Disallow ability to use both email and google as 2fa
- Update Ocramius Proxy Manager to handle typed function & attributes (from PHP 7)
- use `$this->addFlash` shortcut instead of `$this->get('session')->getFlashBag()->add`
- update admin to be able to create/reset the 2fa

5 years agoCreate a dedicated tab to reset data
Jeremy Benoist [Sun, 2 Dec 2018 07:54:54 +0000 (08:54 +0100)] 
Create a dedicated tab to reset data

5 years agoMerge pull request #3627 from craig0990/feature/add-search-api-endpoint 2.4
Jérémy Benoist [Wed, 23 Jan 2019 08:19:37 +0000 (09:19 +0100)] 
Merge pull request #3627 from craig0990/feature/add-search-api-endpoint

Add a basic Search REST endpoint

5 years agoMerge pull request #3864 from wallabag/fix/database-init-version
Jérémy Benoist [Wed, 23 Jan 2019 08:04:54 +0000 (09:04 +0100)] 
Merge pull request #3864 from wallabag/fix/database-init-version

Removed hardcoded database version

5 years agoAvoid creating PG database on Travis 3864/head
Jeremy Benoist [Tue, 22 Jan 2019 20:10:28 +0000 (21:10 +0100)] 
Avoid creating PG database on Travis

And Travis build on PHP 7.3 should not fail.

5 years agoFix third argument to Route 3627/head
Jeremy Benoist [Wed, 24 Oct 2018 18:29:33 +0000 (20:29 +0200)] 
Fix third argument to Route

5 years agoFactorize sendResponse between Api controllers
Jeremy Benoist [Wed, 24 Oct 2018 18:11:45 +0000 (20:11 +0200)] 
Factorize sendResponse between Api controllers

And run newer cs fixer

5 years ago[wallabag/wallabag#2611] Fix PHPCS lint errors
Craig Roberts [Tue, 10 Apr 2018 11:50:26 +0000 (19:50 +0800)] 
[wallabag/wallabag#2611] Fix PHPCS lint errors

5 years agoFixes [wallabag/wallabag#2611] Add a basic Search REST endpoint
Craig Roberts [Mon, 9 Apr 2018 09:24:45 +0000 (17:24 +0800)] 
Fixes [wallabag/wallabag#2611] Add a basic Search REST endpoint

- Adds a new `search` key to `src/Wallabag/ApiBundle/Resources/config/routing_rest.yml`
- Reuses the `getBuilderForSearchByUser` method from the EntryRepository
- Supports, `term`, `page`, and `perPage` query parameters
- Some very basic tests

5 years agoRemoved hardcoded database version
Jeremy Benoist [Tue, 22 Jan 2019 19:38:28 +0000 (20:38 +0100)] 
Removed hardcoded database version

5 years agoMerge pull request #3526 from wallabag/add-random-article
Kevin Decherf [Tue, 22 Jan 2019 17:30:02 +0000 (18:30 +0100)] 
Merge pull request #3526 from wallabag/add-random-article

Add random feature

5 years agoUpdate icon to `casino` 3526/head
Jeremy Benoist [Mon, 21 Jan 2019 09:20:19 +0000 (10:20 +0100)] 
Update icon to `casino`

5 years agoHandle no random result found
Jeremy Benoist [Sat, 19 Jan 2019 21:30:50 +0000 (22:30 +0100)] 
Handle no random result found

5 years agoFix status from Instapaper
Jeremy Benoist [Sat, 19 Jan 2019 21:24:52 +0000 (22:24 +0100)] 
Fix status from Instapaper

That status was used as `http_status` in ContentProxy->stockEntry

5 years agoMove icon into the top menu bar
Jeremy Benoist [Sat, 19 Jan 2019 21:08:29 +0000 (22:08 +0100)] 
Move icon into the top menu bar

Change the way to select a random entry:
- select all ids from the given user (with filters)
- choose randomly one in php
- find that entry

5 years agoRedirect to the current view instead of homepage
Jeremy Benoist [Fri, 12 Oct 2018 20:13:33 +0000 (22:13 +0200)] 
Redirect to the current view instead of homepage

5 years agoBetter icon
Jeremy Benoist [Fri, 12 Oct 2018 20:13:14 +0000 (22:13 +0200)] 
Better icon

5 years agoBetter random function
Jeremy Benoist [Fri, 12 Oct 2018 19:41:28 +0000 (21:41 +0200)] 
Better random function

5 years agoUse only one method to randomize
Jeremy Benoist [Fri, 12 Oct 2018 19:41:05 +0000 (21:41 +0200)] 
Use only one method to randomize

Instead of one per type, one for all is ok.

5 years agoFix tests
Jeremy Benoist [Fri, 12 Oct 2018 13:01:19 +0000 (15:01 +0200)] 
Fix tests

5 years agoAdded random feature
Nicolas Lœuillet [Fri, 22 Dec 2017 14:44:00 +0000 (15:44 +0100)] 
Added random feature

5 years agoMerge pull request #3858 from wallabag/bump-ocramius
Jérémy Benoist [Fri, 18 Jan 2019 15:50:24 +0000 (16:50 +0100)] 
Merge pull request #3858 from wallabag/bump-ocramius

Bump ocramius/proxy-manager

5 years agoCS 3858/head
Jeremy Benoist [Fri, 18 Jan 2019 15:05:20 +0000 (16:05 +0100)] 
CS

5 years agoMerge pull request #3859 from wallabag/phpstan
Jérémy Benoist [Fri, 18 Jan 2019 14:56:39 +0000 (15:56 +0100)] 
Merge pull request #3859 from wallabag/phpstan

Enable PHPStan

5 years agoEnable PHPStan 3859/head
Jeremy Benoist [Thu, 17 Jan 2019 13:28:05 +0000 (14:28 +0100)] 
Enable PHPStan

- Fix error for level 0 & 1 (level 7 has 699 errors...)
- Add `updated_at` to site_credential (so the `timestamps()` method applies correctly)

5 years agoMerge pull request #3861 from wallabag/fix/siteconfig-email
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

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

5 years agoBump ocramius/proxy-manager
Thomas Citharel [Sat, 12 Jan 2019 12:10:51 +0000 (13:10 +0100)] 
Bump ocramius/proxy-manager

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
5 years 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)

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

5 years agoMerge pull request #3845 from wallabag/feature/api-info-endpoint
Kevin Decherf [Tue, 15 Jan 2019 11:22:35 +0000 (12:22 +0100)] 
Merge pull request #3845 from wallabag/feature/api-info-endpoint

Add a new endpoint to retrieve information from the wallabag instance

5 years agoAdd a new endpoint to retrieve information from the wallabag instance 3845/head
Jeremy Benoist [Tue, 15 Jan 2019 09:17:11 +0000 (10:17 +0100)] 
Add a new endpoint to retrieve information from the wallabag instance

Useful for api client which required some information.
We might add more inside them in the future.

The endpoint /api/version should be avoided now as it contains not so much information rather the version.

5 years agoCS
Jeremy Benoist [Tue, 15 Jan 2019 08:49:22 +0000 (09:49 +0100)] 
CS

5 years agoMerge remote-tracking branch 'origin/master' into 2.4
Jeremy Benoist [Tue, 15 Jan 2019 08:41:18 +0000 (09:41 +0100)] 
Merge remote-tracking branch 'origin/master' into 2.4

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