aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| * | Cascade delete on oauth2 table when deleting a userJeremy Benoist2019-05-104-0/+98
|/ /
* | Merge pull request #3955 from wallabag/fix/gif-animation-imagickJérémy Benoist2019-05-106-21/+42
|\ \ | | | | | | Use Imagick to keep GIF animation
| * | Fallback to default solution if Imagick failsJeremy Benoist2019-05-101-4/+9
| | |
| * | CSJeremy Benoist2019-05-103-20/+20
| | |
| * | Setup Imagick for TravisJeremy Benoist2019-05-101-0/+4
| | | | | | | | | | | | To avoid error from phpstan about class not found
| * | Use Imagick to keep GIF animationJeremy Benoist2019-05-102-1/+13
|/ / | | | | | | | | If Imagick is available, GIF will be saved using it to keep animation. Otherwise the previous method will be used and the animation won't be kept.
* | Merge pull request #3223 from wallabag/rss2atomJérémy Benoist2019-05-0963-590/+787
|\ \ | | | | | | Changed RSS to Atom feed and improve paging
| * | Handle redirection from previous feedsJeremy Benoist2019-04-262-0/+69
| | |
| * | Fix tests & cs & migrationJeremy Benoist2019-04-2614-69/+126
| | |
| * | Changed RSS to Atom feed and improve pagingThomas Citharel2019-04-2557-564/+635
|/ /
* | Merge pull request #3158 from wallabag/hash-exist-urlJérémy Benoist2019-04-257-23/+398
|\ \ | | | | | | Hash exist url
| * | Fix ApiDoc about md5/sha1Jérémy Benoist2019-04-021-2/+2
| | |
| * | Fix index on MySQLJeremy Benoist2019-04-012-2/+2
| | |
| * | Some cleanupJeremy Benoist2019-04-015-15/+23
| | | | | | | | | | | | Also, do not run the hashed_url migration into a Doctrine migration
| * | Use a better index for hashed_urlJeremy Benoist2019-04-017-23/+21
| | | | | | | | | | | | | | | | | | 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`.
| * | Keep url in exists endpointJeremy Benoist2019-04-018-77/+154
| | | | | | | | | | | | | | | | | | - Add migration - Use md5 instead of sha512 (we don't need security here, just a hash) - Update tests
| * | Hash the urls to check if they existThomas Citharel2019-04-017-14/+306
|/ / | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 23:55:39 +0000