aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | |
| | * | Set first picture as preview picturenicofrand2019-05-212-12/+37
| | | |
| * | | Merge pull request #3980 from wallabag/fix/instapaper-date-importJérémy Benoist2019-05-241-0/+4
| |\ \ \ | | |_|/ | |/| | Fix Instapaper import date order
| | * | Fix Instapaper import dateJeremy Benoist2019-05-241-0/+4
| |/ /
| * | Merge pull request #3977 from wallabag/fix/7.2-dockerfileJérémy Benoist2019-05-231-1/+1
| |\ \ | | |/ | |/| Force PHP version in Dockerfile
| | * Force PHP version in DockerfileJérémy Benoist2019-05-231-1/+1
| |/
| * Merge pull request #3960 from wallabag/api-entries-2817Jérémy Benoist2019-05-213-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 responseKevin Decherf2019-05-183-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>
| * | CSJeremy Benoist2019-05-151-2/+4
| | |
| * | Merge remote-tracking branch 'origin/master' into 2.4Jeremy Benoist2019-05-1526-64/+253
| |\ \ | |/ / |/| |
* | | Merge pull request #3966 from wallabag/prepare-2.3.8Jérémy Benoist2019-05-142-1/+17
|\ \ \ | | | | | | | | Prepare 2.3.8 release
| * | | Prepare 2.3.8 releaseJeremy Benoist2019-05-142-1/+17
|/ / /
* | | Merge pull request #3964 from wallabag/fix/intlKevin Decherf2019-05-141-2/+7
|\ \ \ | | | | | | | | Fix Intl Locale issue
| * | | Fix Intl Locale issueJeremy Benoist2019-05-131-2/+7
|/ / / | | | | | | | | | | | | | | | | | | | | | Some issue appeared after the release of PHP 7.2.17 about Intl Memory Leak / infinite loop. To fix it we should upgrade to Symfony 3.4 (which is done in wallabag 2.4) but for the 2.3 branch, we'll use a temporary fix for the Locale issue.
* | | Merge pull request #3922 from burkemw3/patch-5Jérémy Benoist2019-05-131-3/+0
|\ \ \ | | | | | | | | Remove preview picture from share view page for #1875
| * | | Remove preview picture from share view page for #1875Matt Burke2019-05-121-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Essentially, same as commit 038fccd for single entry views. From that commit: > Showing the preview picture usually leads to showing a duplicate > image, and frequently leads to showing duplicate images directly > adjacent to each other.
* | | | Merge pull request #3943 from wallabag/img-referrerKevin Decherf2019-05-123-1/+3
|\ \ \ \ | |/ / / |/| | | Enable no-referrer on img tags, enable strict-origin-when-cross-origin by default
| * | | assets: regenerate material.cssKevin Decherf2019-05-101-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | | Enable no-referrer on img tags, enable strict-origin-when-cross-origin by ↵Kevin Decherf2019-05-102-0/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | default Fixes #3889 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | | Merge pull request #3942 from wallabag/issue-3838Jérémy Benoist2019-05-094-16/+47
|\ \ \ | | | | | | | | material: add metadata to list view
| * | | material: add metadata to list viewKevin Decherf2019-05-014-16/+47
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Add reading time and creation date to rows of list view. Refactor styles using a sass mixin. Fixes #3838 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | | Merge pull request #3937 from wallabag/fix/credential-subdomainJérémy Benoist2019-04-2717-43/+187
|\ \ \ | | | | | | | | Add ability to match many domains for credentials
| * | | Adding more tests to cover different scenarioJeremy Benoist2019-04-243-27/+161
| | | |
| * | | FIx unrelated failing testJeremy Benoist2019-04-231-1/+1
| | | |
| * | | Add ability to match many domains for credentialsJeremy Benoist2019-04-2315-26/+36
|/ / / | | | | | | | | | | | | 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.
| * | Merge pull request #3956 from wallabag/fix/delete-cascade-oauth2Jérémy Benoist2019-05-134-0/+99
| |\ \ | | |/ | |/| Cascade delete on oauth2 table when deleting a user
| | * Fix SQLite constraintJeremy Benoist2019-05-101-3/+3
| | |
| | * Fix SQLite migrationJeremy Benoist2019-05-101-16/+17
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 03:08:47 +0000