Commit Graph

5677 Commits

Author SHA1 Message Date
757ca53f63 Merge pull request #3992 from wallabag/feature/menu-quickstart
Add quickstart into the menu
2019-06-05 17:13:21 +02:00
0f2d24feb4 Fix typo & CS 2019-06-05 17:09:05 +02:00
ad51743e8b Show untagged entries count on tag list
Closes #3235

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2019-06-05 17:03:51 +02:00
d010bdd44b Add quickstart into the menu
Just in case people want to see that page again.
2019-06-05 15:51:22 +02:00
7e5b7e029a Merge pull request #3990 from wallabag/feature/sentry
Add Sentry support
2019-06-05 14:41:42 +02:00
4fa63260e4 Merge pull request #3991 from wallabag/fix/secret
Try to force people to update the secret
2019-06-05 14:37:11 +02:00
c822b20835 Try to force people to update the secret 2019-06-05 14:14:17 +02:00
955a3bde17 Add Sentry support
Only enable in production
2019-06-05 13:15:15 +02:00
16e1c07553 Merge pull request #3271 from wallabag/store-resolved-url
Add `given_url` in Entry table to check if a redirected url has already added
2019-06-05 11:38:00 +02:00
d8809f70ea Typos 2019-06-05 10:54:43 +02:00
70df4c3359 Use two indexes instead of one for hashed urls
When using `OR` in a where clause, a composite index can't be used. We should use a `UNION` to take advantages of it.
Instead, create 2 indexes on each hashed urls and make 2 queries to find an url. It'll be faster than the previous solution.
2019-06-05 10:53:15 +02:00
8671da5ead Merge pull request #3987 from wallabag/fix/drop-simplepie
Drop SimplePie
2019-05-29 21:00:36 +02:00
7abda3ba52 Drop SimplePie
It was only used to make an absolute url when downloading images.
The deps is still there (in the `composer.lock`) because Graby use it (not for absolute but for encoding).
2019-05-29 17:05:12 +02:00
f3bfb875e9 Use hash given url to avoid duplicate
Using hashed url we can ensure an index on them to ensure it's fast.
2019-05-29 15:56:20 +02:00
ecd54aa57e Merge pull request #3986 from wallabag/fix/scrutinizer-issues
Fix some Scrutinizer issues
2019-05-29 14:40:01 +02:00
b7fa51ae7d Added given_url in entry table
- Added index on entry table for given_url field
- Fix tests:

    The previous `bit.ly` url redirected to doc.wallabag but that url doesn't exist in the fixtures.
    I used our own internal "redirector" to create a redirect to an url which exist in the fixtures.

Also, updating current migration to use the new `WallabagMigration`.
2019-05-29 13:50:59 +02:00
52e8d93248 Fix some Scrutinizer issues 2019-05-29 12:50:44 +02:00
e9579d6de9 Merge pull request #3985 from wallabag/update-composer
Keep composer.lock
2019-05-29 12:49:32 +02:00
2770b6d77d Typos 2019-05-29 12:02:24 +02:00
6546aca4a3 Keep composer.lock
We initially ignored the `composer.lock` because it generated a lock of rebase on PR when someone updated it and the master updated it too.
Now we have less contributions (sadly) so I think we won't run against that problem.
Also, it'll solve issue about people cloning the master and got angry because composer eat all the available memory to determine packages to install.
It'll also be much easier to make release.
Scrutinizer & Travis will be faster too.
2019-05-29 11:41:07 +02:00
73ec68b1ff Merge pull request #3984 from wallabag/2.4
Merge 2.4 into master
2019-05-29 11:14:00 +02:00
2cbee36a01 Merge pull request #3944 from shtrom/always-hash-exists-url
Always hash exists url
2019-05-28 14:18:33 +02:00
48d136d3a0 Merge pull request #3390 from aaa2000/httplug
Use httplug and graby 2.0
2019-05-28 14:00:22 +02:00
6e68417f03 Fix tests after rebase 2019-05-28 12:02:17 +02:00
36b0d52ee4 CS & fix tests 2019-05-28 11:44:21 +02:00
b6c1e1bacc Fix some tests 2019-05-28 11:44:20 +02:00
a91a3150fb CS 2019-05-28 11:42:27 +02:00
448d99f84e CS 2019-05-28 11:42:27 +02:00
1048c9c4a8 Configure timeout 2019-05-28 11:42:27 +02:00
5f08426201 Fix because of some breaking changes of Graby 2.0 2019-05-28 11:42:27 +02:00
bf9ace0643 Use httplug 2019-05-28 11:40:41 +02:00
92a6683562 Merge remote-tracking branch 'origin/master' into 2.4 2019-05-27 10:46:01 +02:00
2ba365c7c4 Merge pull request #3982 from wallabag/fix/https-test
Fix http/https test
2019-05-27 10:22:03 +02:00
d6cc0b249e Fix test 2019-05-27 09:38:07 +02:00
5c0701ba41 Merge pull request #3965 from nicofrand/previewPic
Preview picture: use the 1st pic retrieved if no og:image set
2019-05-26 17:47:44 +02:00
cc9731bf2b Merge pull request #3980 from wallabag/fix/instapaper-date-import
Fix Instapaper import date order
2019-05-24 16:03:05 +02:00
629a3797bc Remove useless methods
Also fix a phpdoc block
2019-05-24 15:46:28 +02:00
0132ccd2a2 Change the way to define algorithm for hashing url 2019-05-24 15:17:46 +02:00
4a5516376b Add Wallabag\CoreBundle\Helper\UrlHasher
Signed-off-by: Olivier Mehani <shtrom@ssji.net>
2019-05-24 15:17:46 +02:00
d5744bf0df Delegate findByUrlAndUserId to findByHashedUrlAndUserId
Signed-off-by: Olivier Mehani <shtrom@ssji.net>
2019-05-24 15:17:46 +02:00
31e276fc16 EntryRestController::getEntriesExistsAction: always find by hashed url
Simplify the logic from #3158 by hashing all the urls from the request,
and only doing a search by hash. This allows to get performance benefits
from the new indexed hash column even when using older clients that do
not hash the URL in the request.

Fixes: #3158, #3919

Signed-off-by: Olivier Mehani <shtrom@ssji.net>
2019-05-24 15:17:45 +02:00
9ca670c801 Fix Instapaper import date 2019-05-24 14:37:54 +02:00
65b495e75b Merge pull request #3977 from wallabag/fix/7.2-dockerfile
Force PHP version in Dockerfile
2019-05-23 11:57:07 +02:00
c1a1c46e9d Force PHP version in Dockerfile 2019-05-23 08:51:54 +02:00
d99e6423f4 [tests] Fix pre-existing tests (preview now imported + records added) 2019-05-21 20:38:22 +02:00
715fabf8f2 [tests] Set first picture as preview picture 2019-05-21 20:38:22 +02:00
423efadefc Set first picture as preview picture 2019-05-21 20:38:22 +02:00
a2b5d67560 Merge pull request #3960 from wallabag/api-entries-2817
api/entries: add parameter detail to exclude or include content in response
2019-05-21 11:18:19 +02:00
feb239ea10 mysql: change collation of tag table
utf8mb4_unicode_ci considers that 'caché' is equal to 'cache' which
can lead to attaching incorrect tags to entries. This issue is due to
some unicode normalization done by MySQL.

utf8mb4_bin makes no unicode normalization, letting wallabag to consider
'cache' and 'caché' as two different tags.

We change the collation of the whole table as Doctrine does not support
setting a collation on a column for a specific platform (it tries to
apply utf8mb4_bin even for pgsql and sqlite).

Fixes #3302

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2019-05-19 23:37:49 +02:00
2c290747cb api/entries: add parameter detail to exclude or include content in response
detail=metadata will nullify the content field of entries in order to
make smaller responses.

detail=full keeps the former behavior, it sends the content of entries.
It's the default, for backward compatibility.

Fixes #2817

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2019-05-18 18:11:08 +02:00