aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3390 from aaa2000/httplugJérémy Benoist2019-05-2814-479/+447
|\
| * 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 testJeremy Benoist2019-05-271-1/+1
| |/
* | Merge pull request #3965 from nicofrand/previewPicKevin Decherf2019-05-264-14/+123
|\ \
| * | [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 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 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 responseKevin Decherf2019-05-183-2/+42
* | | 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 releaseJeremy Benoist2019-05-142-1/+17
| |/ /
| * | Merge pull request #3964 from wallabag/fix/intlKevin Decherf2019-05-141-2/+7
| |\ \
| | * | Fix Intl Locale issueJeremy Benoist2019-05-131-2/+7
| |/ /
| * | Merge pull request #3922 from burkemw3/patch-5Jérémy Benoist2019-05-131-3/+0
| |\ \
| | * | Remove preview picture from share view page for #1875Matt Burke2019-05-121-3/+0
| * | | Merge pull request #3943 from wallabag/img-referrerKevin Decherf2019-05-123-1/+3
| |\ \ \ | | |/ / | |/| |
| | * | assets: regenerate material.cssKevin Decherf2019-05-101-1/+1
| | * | Enable no-referrer on img tags, enable strict-origin-when-cross-origin by def...Kevin Decherf2019-05-102-0/+2
| |/ /
| * | Merge pull request #3942 from wallabag/issue-3838Jérémy Benoist2019-05-094-16/+47
| |\ \
| | * | material: add metadata to list viewKevin Decherf2019-05-014-16/+47
| |/ /
| * | Merge pull request #3937 from wallabag/fix/credential-subdomainJérémy Benoist2019-04-2717-43/+187
| |\ \
| | * | 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
| |/ /
* | | Merge pull request #3956 from wallabag/fix/delete-cascade-oauth2Jérémy Benoist2019-05-134-0/+99
|\ \ \ | |_|/ |/| |
| * | 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
|\ \
| * | 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
| * | Use Imagick to keep GIF animationJeremy Benoist2019-05-102-1/+13
|/ /
* | Merge pull request #3223 from wallabag/rss2atomJérémy Benoist2019-05-0963-590/+787
|\ \
| * | Handle redirection from previous feedsJeremy Benoist2019-04-262-0/+69