Commit Graph

4925 Commits

Author SHA1 Message Date
36fd8e5fde Merge pull request #3895 from wallabag/prepare-2.3.7
Prepare 2.3.7 release
2019-03-04 12:06:22 +01:00
f2aa373054 Prepare 2.3.7 release 2019-03-04 09:32:26 +01:00
4ae4fa7b89 Merge pull request #3894 from wallabag/issue-3851
material: hide creation date from card actions on specific sizes
2019-03-03 20:22:30 +01:00
6640a922d1 material: update prod assets
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2019-03-03 19:24:34 +01:00
246cc9ac93 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>
2019-03-03 19:22:32 +01:00
f1f1efb5de material: wrap card actions, remove class hiding of creation date
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2019-03-03 19:22:32 +01:00
806635f7d5 Merge pull request #3893 from wallabag/issue-3877
material: fix left padding of content on medium screens
2019-03-03 19:22:03 +01:00
05232afe32 material: fix left padding of content on medium screens
Fixes #3877

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2019-03-02 23:46:00 +01:00
fb7dedf36c material: move a media query from cards to dedicated scss file
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2019-03-02 22:48:43 +01:00
b886ee923d Merge pull request #3868 from Nadrieril/fix-3662
Add missing entries in craue_config_setting.
2019-03-02 17:20:18 +01:00
85403dae04 Disable down for that migration 2019-03-01 20:26:59 +01:00
fcd54e2447 Test each internal settings before creating them 2019-03-01 20:26:58 +01:00
c2efb5a306 Add missing entries in craue_config_setting.
Should fix https://github.com/wallabag/wallabag/issues/3662
2019-03-01 20:26:58 +01:00
1e9c710fdd Merge pull request #3885 from mart-e/script-ignore-root
Allow optional --ignore-root-warning
2019-03-01 20:22:22 +01:00
fc4c1f50b4 Merge pull request #3857 from wallabag/php73
Replace continue; with break; to avoid PHP 7.3 warnings
2019-02-27 15:31:57 +01:00
8c0ba95307 Adding more tests 2019-02-27 15:01:03 +01:00
ea925bb112 CS 2019-02-27 14:33:26 +01:00
3784688a88 Replace continue; with break; to avoid PHP 7.3 warnings
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-02-27 14:29:14 +01:00
d5154ee2ae Merge pull request #3886 from wallabag/issue-3602
epub export: fix missing cover image, only for exports of one article
2019-02-25 14:03:41 +01:00
4de99d1ab1 Merge pull request #3887 from wallabag/issue-3711
Add support of expect parameter to change return object when deleting entry
2019-02-25 10:56:07 +01:00
12a97c3522 tests: fix broken session clients for rest entry deletion tests
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2019-02-20 15:57:56 +01:00
508302042f 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>
2019-02-20 15:57:50 +01:00
9a7a0e1e6b epub export: fix missing cover image, only for exports of one article
Fixes #3602

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2019-02-18 00:16:05 +01:00
4e0ed3368d 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>
2019-02-17 15:25:21 +01:00
c01bda038e 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
2019-02-14 16:42:57 +05:30
b1992b340e Merge pull request #3882 from wallabag/fix/cors
Fix CORS for API
2019-02-13 15:05:57 +01:00
44560c7767 CS 2019-02-13 14:06:57 +01:00
0182cdaec4 CS 2019-02-11 11:57:52 +01:00
a9f61d3dbb CORS repare for api 2019-02-11 11:57:52 +01:00
a86c3f1759 Merge pull request #3879 from wallabag/fix/url-default-protocol
Force default_protocol to generate an url input
2019-02-08 15:39:51 +01:00
baa5ee2d42 Force default_protocol to generate an url input 2019-02-08 15:03:52 +01:00
18460b2d79 Merge remote-tracking branch 'origin/master' into 2.4 2019-02-07 18:01:15 +01:00
47e4784110 Merge pull request #3869 from itsthejb/fix-2factor-email-image
Fix broken 2 factor auth logo image
2019-02-01 12:58:31 +01:00
7e04bd4ca4 Fix broken 2 factor auth logo image 2019-01-31 22:14:53 +01:00
2e5b3fa361 Merge pull request #3798 from wallabag/update-two-factor-bundle
Enable OTP 2FA
2019-01-30 01:02:27 +01:00
755753e3ef Merge pull request #3819 from stan3/pocket-import
Fix read & starred status in Pocket import
2019-01-28 11:34:37 +01:00
8d082488e9 Improve checks & add tests 2019-01-28 06:03:16 +01:00
a2e60dd393 status and favourite are actually strings in the import so use == 2019-01-27 18:39:26 +01:00
4654a83b64 Hash backup codes in the database using password_hash 2019-01-23 14:43:39 +01:00
7485a272ff Revert PG on Travis about drop/create the database 2019-01-23 13:47:51 +01:00
c416ed485f CS 2019-01-23 13:28:24 +01:00
a0c5eb003f Change the way to enable 2FA
And add a step to validate a generated code from the OTP app
2019-01-23 13:28:24 +01:00
4c0e747940 Remove secret from admin 2019-01-23 13:28:24 +01:00
e073090b8d Update translation 2019-01-23 13:28:24 +01:00
6df8b9c6a9 Fix PG & Travis drop/create database 2019-01-23 13:28:24 +01:00
842af5c357 Add SQLite & PG migration
Also remove the forced `server_version` from dbal config to avoid an
hard overriding across all database.
2019-01-23 13:28:23 +01:00
dfd0a7bc5f Add backup codes 2019-01-23 13:28:03 +01:00
6e4fc956ab Better translations
Replace “Google Authenticator” by “Google Authenticator, Authy or FreeOTP” in all text.

Translate how to use the code / qr code.
2019-01-23 13:28:02 +01:00
43ccf4b178 Cleanup 2019-01-23 13:28:02 +01:00
2dfbe9e5fa Fix tests 2019-01-23 13:28:02 +01:00