aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3998 from ↵Jérémy Benoist2019-06-111-23/+30
|\ | | | | | | | | wallabag/dependabot/composer/doctrine/doctrine-fixtures-bundle-3.2.0 Bump doctrine/doctrine-fixtures-bundle from 3.1.0 to 3.2.0
| * Bump doctrine/doctrine-fixtures-bundle from 3.1.0 to 3.2.0dependabot-preview[bot]2019-06-111-23/+30
|/ | | | | | | | Bumps [doctrine/doctrine-fixtures-bundle](https://github.com/doctrine/DoctrineFixturesBundle) from 3.1.0 to 3.2.0. - [Release notes](https://github.com/doctrine/DoctrineFixturesBundle/releases) - [Changelog](https://github.com/doctrine/DoctrineFixturesBundle/blob/master/CHANGELOG-3.1.md) - [Commits](https://github.com/doctrine/DoctrineFixturesBundle/compare/3.1.0...3.2.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* Show untagged entries count on tag list (#3993)Thomas Citharel2019-06-0618-2/+42
|\ | | | | Show untagged entries count on tag list
| * Remove link when there are no untagged articlesJeremy Benoist2019-06-0617-4/+26
| |
| * Fix typo & CSJeremy Benoist2019-06-052-4/+5
| |
| * Show untagged entries count on tag listKevin Decherf2019-06-054-2/+19
| | | | | | | | | | | | Closes #3235 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #3959 from wallabag/mig-tag-collationJérémy Benoist2019-06-063-1/+80
|\ \ | | | | | | mysql: change collation of tag label
| * | mysql: change collation of tag tableKevin Decherf2019-05-193-1/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge pull request #3994 from wallabag/feature/revoke-feed-tokenKevin Decherf2019-06-0518-13/+85
|\ \ \ | | | | | | | | Add ability to revoke feed token
| * | | Add ability to revoke feed tokenJeremy Benoist2019-06-0518-13/+85
| | |/ | |/|
* | | Merge pull request #3992 from wallabag/feature/menu-quickstartJérémy Benoist2019-06-0516-0/+19
|\ \ \ | |/ / |/| | Add quickstart into the menu
| * | Add quickstart into the menuJeremy Benoist2019-06-0516-0/+19
|/ / | | | | | | Just in case people want to see that page again.
* | Merge pull request #3990 from wallabag/feature/sentryJérémy Benoist2019-06-055-88/+589
|\ \ | | | | | | Add Sentry support
| * | Add Sentry supportJeremy Benoist2019-06-055-88/+589
| | | | | | | | | | | | Only enable in production
* | | Merge pull request #3991 from wallabag/fix/secretJérémy Benoist2019-06-051-1/+1
|\ \ \ | | | | | | | | Try to force people to update the secret
| * | | Try to force people to update the secretJérémy Benoist2019-06-051-1/+1
|/ / /
* | | Merge pull request #3271 from wallabag/store-resolved-urlJérémy Benoist2019-06-055-11/+164
|\ \ \ | |/ / |/| | Add `given_url` in Entry table to check if a redirected url has already added
| * | TyposJeremy Benoist2019-06-051-2/+2
| | |
| * | Use two indexes instead of one for hashed urlsJeremy Benoist2019-06-054-25/+20
| | | | | | | | | | | | | | | 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.
| * | Use hash given url to avoid duplicateJeremy Benoist2019-05-296-131/+133
| | | | | | | | | | | | Using hashed url we can ensure an index on them to ensure it's fast.
| * | Added given_url in entry tableNicolas Lœuillet2019-05-296-2/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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`.
* | | Merge pull request #3987 from wallabag/fix/drop-simplepieJérémy Benoist2019-05-293-18/+16
|\ \ \ | | | | | | | | Drop SimplePie
| * | | Drop SimplePieJeremy Benoist2019-05-293-18/+16
|/ / / | | | | | | | | | | | | 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).
* | | Merge pull request #3986 from wallabag/fix/scrutinizer-issuesJérémy Benoist2019-05-295-7/+7
|\ \ \ | |/ / |/| | Fix some Scrutinizer issues
| * | Fix some Scrutinizer issuesJeremy Benoist2019-05-295-7/+7
|/ /
* | Merge pull request #3985 from wallabag/update-composerJérémy Benoist2019-05-295-31/+10446
|\ \ | | | | | | Keep composer.lock
| * | TyposJeremy Benoist2019-05-291-2/+17
| | |
| * | Keep composer.lockJeremy Benoist2019-05-295-43/+10443
|/ / | | | | | | | | | | | | | | 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.
* | Merge pull request #3984 from wallabag/2.4Jérémy Benoist2019-05-29206-1871/+4701
|\ \ | | | | | | Merge 2.4 into master
| * \ Merge pull request #3944 from shtrom/always-hash-exists-urlJérémy Benoist2019-05-285-47/+80
| |\ \ | | | | | | | | Always hash exists url
| | * | Remove useless methodsJeremy Benoist2019-05-242-28/+2
| | | | | | | | | | | | | | | | Also fix a phpdoc block
| | * | Change the way to define algorithm for hashing urlJeremy Benoist2019-05-243-11/+11
| | | |
| | * | Add Wallabag\CoreBundle\Helper\UrlHasherOlivier Mehani2019-05-245-21/+79
| | | | | | | | | | | | | | | | Signed-off-by: Olivier Mehani <shtrom@ssji.net>
| | * | Delegate findByUrlAndUserId to findByHashedUrlAndUserIdOlivier Mehani2019-05-241-11/+3
| | | | | | | | | | | | | | | | Signed-off-by: Olivier Mehani <shtrom@ssji.net>
| | * | EntryRestController::getEntriesExistsAction: always find by hashed urlOlivier Mehani2019-05-241-31/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Merge pull request #3390 from aaa2000/httplugJérémy Benoist2019-05-2814-479/+447
| |\ \ \ | | | | | | | | | | Use httplug and graby 2.0
| | * | | Fix tests after rebaseJeremy Benoist2019-05-282-14/+12
| | | | |
| | * | | CS & fix testsJeremy Benoist2019-05-281-15/+36
| | | | |
| | * | | Fix some testsJeremy Benoist2019-05-282-39/+24
| | | | |
| | * | | CSJeremy Benoist2019-05-281-1/+1
| | | | |
| | * | | CSJeremy Benoist2019-05-285-8/+7
| | | | |
| | * | | Configure timeoutadev2019-05-282-3/+10
| | | | |
| | * | | Fix because of some breaking changes of Graby 2.0adev2019-05-284-48/+50
| | | | |
| | * | | Use httplugadev2019-05-2810-368/+324
| |/ / /
| * | | Merge remote-tracking branch 'origin/master' into 2.4Jeremy Benoist2019-05-271-1/+1
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #3982 from wallabag/fix/https-test2.3.xJérémy Benoist2019-05-271-1/+1
|\ \ \ \ | | | | | | | | | | Fix http/https test
| * | | | Fix testJeremy Benoist2019-05-271-1/+1
|/ / / /
| * | | Merge pull request #3965 from nicofrand/previewPicKevin Decherf2019-05-264-14/+123
| |\ \ \ | | | | | | | | | | Preview picture: use the 1st pic retrieved if no og:image set
| | * | | [tests] Fix pre-existing tests (preview now imported + records added)nicofrand2019-05-212-2/+2
| | | | |
| | * | | [tests] Set first picture as preview picturenicofrand2019-05-211-0/+84
| | | | |