Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #3990 from wallabag/feature/sentry | Jérémy Benoist | 2019-06-05 | 5 | -88/+589 | |
|\ \ | | | | | | | Add Sentry support | |||||
| * | | Add Sentry support | Jeremy Benoist | 2019-06-05 | 5 | -88/+589 | |
| | | | | | | | | | | | | Only enable in production | |||||
* | | | Merge pull request #3991 from wallabag/fix/secret | Jérémy Benoist | 2019-06-05 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Try to force people to update the secret | |||||
| * | | | Try to force people to update the secret | Jérémy Benoist | 2019-06-05 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #3271 from wallabag/store-resolved-url | Jérémy Benoist | 2019-06-05 | 5 | -11/+164 | |
|\ \ \ | |/ / |/| | | Add `given_url` in Entry table to check if a redirected url has already added | |||||
| * | | Typos | Jeremy Benoist | 2019-06-05 | 1 | -2/+2 | |
| | | | ||||||
| * | | Use two indexes instead of one for hashed urls | Jeremy Benoist | 2019-06-05 | 4 | -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 duplicate | Jeremy Benoist | 2019-05-29 | 6 | -131/+133 | |
| | | | | | | | | | | | | Using hashed url we can ensure an index on them to ensure it's fast. | |||||
| * | | Added given_url in entry table | Nicolas Lœuillet | 2019-05-29 | 6 | -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-simplepie | Jérémy Benoist | 2019-05-29 | 3 | -18/+16 | |
|\ \ \ | | | | | | | | | Drop SimplePie | |||||
| * | | | Drop SimplePie | Jeremy Benoist | 2019-05-29 | 3 | -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-issues | Jérémy Benoist | 2019-05-29 | 5 | -7/+7 | |
|\ \ \ | |/ / |/| | | Fix some Scrutinizer issues | |||||
| * | | Fix some Scrutinizer issues | Jeremy Benoist | 2019-05-29 | 5 | -7/+7 | |
|/ / | ||||||
* | | Merge pull request #3985 from wallabag/update-composer | Jérémy Benoist | 2019-05-29 | 5 | -31/+10446 | |
|\ \ | | | | | | | Keep composer.lock | |||||
| * | | Typos | Jeremy Benoist | 2019-05-29 | 1 | -2/+17 | |
| | | | ||||||
| * | | Keep composer.lock | Jeremy Benoist | 2019-05-29 | 5 | -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.4 | Jérémy Benoist | 2019-05-29 | 206 | -1871/+4701 | |
|\ \ | | | | | | | Merge 2.4 into master | |||||
| * \ | Merge pull request #3944 from shtrom/always-hash-exists-url | Jérémy Benoist | 2019-05-28 | 5 | -47/+80 | |
| |\ \ | | | | | | | | | Always hash exists url | |||||
| | * | | Remove useless methods | Jeremy Benoist | 2019-05-24 | 2 | -28/+2 | |
| | | | | | | | | | | | | | | | | Also fix a phpdoc block | |||||
| | * | | Change the way to define algorithm for hashing url | Jeremy Benoist | 2019-05-24 | 3 | -11/+11 | |
| | | | | ||||||
| | * | | Add Wallabag\CoreBundle\Helper\UrlHasher | Olivier Mehani | 2019-05-24 | 5 | -21/+79 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Olivier Mehani <shtrom@ssji.net> | |||||
| | * | | Delegate findByUrlAndUserId to findByHashedUrlAndUserId | Olivier Mehani | 2019-05-24 | 1 | -11/+3 | |
| | | | | | | | | | | | | | | | | Signed-off-by: Olivier Mehani <shtrom@ssji.net> | |||||
| | * | | EntryRestController::getEntriesExistsAction: always find by hashed url | Olivier Mehani | 2019-05-24 | 1 | -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/httplug | Jérémy Benoist | 2019-05-28 | 14 | -479/+447 | |
| |\ \ \ | | | | | | | | | | | Use httplug and graby 2.0 | |||||
| | * | | | Fix tests after rebase | Jeremy Benoist | 2019-05-28 | 2 | -14/+12 | |
| | | | | | ||||||
| | * | | | CS & fix tests | Jeremy Benoist | 2019-05-28 | 1 | -15/+36 | |
| | | | | | ||||||
| | * | | | Fix some tests | Jeremy Benoist | 2019-05-28 | 2 | -39/+24 | |
| | | | | | ||||||
| | * | | | CS | Jeremy Benoist | 2019-05-28 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | CS | Jeremy Benoist | 2019-05-28 | 5 | -8/+7 | |
| | | | | | ||||||
| | * | | | Configure timeout | adev | 2019-05-28 | 2 | -3/+10 | |
| | | | | | ||||||
| | * | | | Fix because of some breaking changes of Graby 2.0 | adev | 2019-05-28 | 4 | -48/+50 | |
| | | | | | ||||||
| | * | | | Use httplug | adev | 2019-05-28 | 10 | -368/+324 | |
| |/ / / | ||||||
| * | | | Merge remote-tracking branch 'origin/master' into 2.4 | Jeremy Benoist | 2019-05-27 | 1 | -1/+1 | |
| |\ \ \ | |/ / / |/| | | | ||||||
* | | | | Merge pull request #3982 from wallabag/fix/https-test2.3.x | Jérémy Benoist | 2019-05-27 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Fix http/https test | |||||
| * | | | | Fix test | Jeremy Benoist | 2019-05-27 | 1 | -1/+1 | |
|/ / / / | ||||||
| * | | | Merge pull request #3965 from nicofrand/previewPic | Kevin Decherf | 2019-05-26 | 4 | -14/+123 | |
| |\ \ \ | | | | | | | | | | | Preview picture: use the 1st pic retrieved if no og:image set | |||||
| | * | | | [tests] Fix pre-existing tests (preview now imported + records added) | nicofrand | 2019-05-21 | 2 | -2/+2 | |
| | | | | | ||||||
| | * | | | [tests] Set first picture as preview picture | nicofrand | 2019-05-21 | 1 | -0/+84 | |
| | | | | | ||||||
| | * | | | Set first picture as preview picture | nicofrand | 2019-05-21 | 2 | -12/+37 | |
| | | | | | ||||||
| * | | | | Merge pull request #3980 from wallabag/fix/instapaper-date-import | Jérémy Benoist | 2019-05-24 | 1 | -0/+4 | |
| |\ \ \ \ | | |_|/ / | |/| | | | Fix Instapaper import date order | |||||
| | * | | | Fix Instapaper import date | Jeremy Benoist | 2019-05-24 | 1 | -0/+4 | |
| |/ / / | ||||||
| * | | | Merge pull request #3977 from wallabag/fix/7.2-dockerfile | Jérémy Benoist | 2019-05-23 | 1 | -1/+1 | |
| |\ \ \ | | |/ / | |/| | | Force PHP version in Dockerfile | |||||
| | * | | Force PHP version in Dockerfile | Jérémy Benoist | 2019-05-23 | 1 | -1/+1 | |
| |/ / | ||||||
| * | | Merge pull request #3960 from wallabag/api-entries-2817 | Jérémy Benoist | 2019-05-21 | 3 | -2/+42 | |
| |\ \ | | | | | | | | | api/entries: add parameter detail to exclude or include content in response | |||||
| | * | | api/entries: add parameter detail to exclude or include content in response | Kevin Decherf | 2019-05-18 | 3 | -2/+42 | |
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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> | |||||
| * | | CS | Jeremy Benoist | 2019-05-15 | 1 | -2/+4 | |
| | | | ||||||
| * | | Merge remote-tracking branch 'origin/master' into 2.4 | Jeremy Benoist | 2019-05-15 | 26 | -64/+253 | |
| |\ \ | |/ / |/| | | ||||||
* | | | Merge pull request #3966 from wallabag/prepare-2.3.8 | Jérémy Benoist | 2019-05-14 | 2 | -1/+17 | |
|\ \ \ | | | | | | | | | Prepare 2.3.8 release | |||||
| * | | | Prepare 2.3.8 release | Jeremy Benoist | 2019-05-14 | 2 | -1/+17 | |
|/ / / | ||||||
* | | | Merge pull request #3964 from wallabag/fix/intl | Kevin Decherf | 2019-05-14 | 1 | -2/+7 | |
|\ \ \ | | | | | | | | | Fix Intl Locale issue |