Commit Graph

4795 Commits

Author SHA1 Message Date
Jeremy Benoist 35359bd3c6
Adding more tests to cover different scenario 2019-04-24 15:28:15 +02:00
Jeremy Benoist ff8f338dc2
FIx unrelated failing test 2019-04-23 22:48:04 +02:00
Jeremy Benoist f45496336f
Add ability to match many domains for credentials
Instead of fetching one domain, we use the same method as in site config (to retrieve the matching file) and handle api.example.org, example.org, .org (yes the last one isn’t useful).
If one of these match, we got it and use it.
2019-04-23 22:39:31 +02:00
Jérémy Benoist 76bc05ebc0
Fix ApiDoc about md5/sha1 2019-04-02 22:59:50 +02:00
Jeremy Benoist 5cc0646e66
Fix index on MySQL 2019-04-01 15:45:17 +02:00
Jeremy Benoist c579ce2306
Some cleanup
Also, do not run the hashed_url migration into a Doctrine migration
2019-04-01 14:34:20 +02:00
Jeremy Benoist 8a64566298
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`.
2019-04-01 13:51:57 +02:00
Jeremy Benoist 9c2b2aae70
Keep url in exists endpoint
- Add migration
- Use md5 instead of sha512 (we don't need security here, just a hash)
- Update tests
2019-04-01 13:24:40 +02:00
Thomas Citharel bfe02a0b48
Hash the urls to check if they exist
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-04-01 13:24:40 +02:00
Jeremy Benoist 3620dae1e6
Merge remote-tracking branch 'origin/master' into 2.4 2019-04-01 13:16:15 +02:00
Jérémy Benoist bfd69c74e5
Merge pull request #3909 from wallabag/fix/html-not-defined
Fix PHP warning
2019-03-18 09:26:33 +01:00
Jérémy Benoist 8ab5dcc467
Merge pull request #3908 from wallabag/epub-issue-3642
epub: fix exception when articles have the same title
2019-03-18 09:26:16 +01:00
Jérémy Benoist 893f107fa1
Merge pull request #3860 from baurmatt/fix/posix_compatibility
Make dev/install/update script posix compatible
2019-03-18 09:25:00 +01:00
Jeremy Benoist 8ca858ee73
Fix PHP warning
Looks like sometimes (usually from import) the `html` key isn’t available.
2019-03-18 06:23:41 +01:00
Kevin Decherf 41d476d7e7 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>
2019-03-17 23:36:10 +01:00
Matthias Baur 7c553a6017
Properly source require.sh
Fixes #3571.
2019-03-12 15:44:38 +01:00
Kevin Decherf a48ff25d4c
Merge pull request #3901 from wallabag/fix-pr-3893
material: fix left padding on non-entry pages introduced by #3893
2019-03-09 12:19:31 +01:00
Kevin Decherf cf0010cf4a material: fix left padding on non-entry pages introduced by #3893
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2019-03-09 00:27:50 +01:00
Jérémy Benoist 13d2fe6d2e
Merge pull request #3897 from wallabag/2.3.8-dev
Jump to 2.3.8-dev
2019-03-04 15:23:06 +01:00
Jeremy Benoist 3d7a1f4caf
Jump to 2.3.8-dev 2019-03-04 13:49:23 +01:00
Jérémy Benoist 36fd8e5fde
Merge pull request #3895 from wallabag/prepare-2.3.7
Prepare 2.3.7 release
2019-03-04 12:06:22 +01:00
Jeremy Benoist f2aa373054
Prepare 2.3.7 release 2019-03-04 09:32:26 +01:00
Kevin Decherf 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
Kevin Decherf 6640a922d1 material: update prod assets
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2019-03-03 19:24:34 +01:00
Kevin Decherf 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
Kevin Decherf 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
Kevin Decherf 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
Kevin Decherf 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
Kevin Decherf 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
Kevin Decherf b886ee923d
Merge pull request #3868 from Nadrieril/fix-3662
Add missing entries in craue_config_setting.
2019-03-02 17:20:18 +01:00
Jeremy Benoist 85403dae04
Disable down for that migration 2019-03-01 20:26:59 +01:00
Jeremy Benoist fcd54e2447
Test each internal settings before creating them 2019-03-01 20:26:58 +01:00
Nadrieril 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
Jérémy Benoist 1e9c710fdd
Merge pull request #3885 from mart-e/script-ignore-root
Allow optional --ignore-root-warning
2019-03-01 20:22:22 +01:00
Jérémy Benoist 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
Jeremy Benoist 8c0ba95307
Adding more tests 2019-02-27 15:01:03 +01:00
Jeremy Benoist ea925bb112
CS 2019-02-27 14:33:26 +01:00
Thomas Citharel 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
Jérémy Benoist 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
Jérémy Benoist 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
Kevin Decherf 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
Kevin Decherf 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
Kevin Decherf 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
Kevin Decherf 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
Martin Trigaux 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
Kevin Decherf b1992b340e
Merge pull request #3882 from wallabag/fix/cors
Fix CORS for API
2019-02-13 15:05:57 +01:00
Jeremy Benoist 44560c7767
CS 2019-02-13 14:06:57 +01:00
Jeremy Benoist 0182cdaec4
CS 2019-02-11 11:57:52 +01:00
Rurik19 a9f61d3dbb
CORS repare for api 2019-02-11 11:57:52 +01:00
Jérémy Benoist 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