Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| | * | | Fix Intl Locale issue | Jeremy Benoist | 2019-05-13 | 1 | -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-5 | Jérémy Benoist | 2019-05-13 | 1 | -3/+0 |
| |\ \ | | | | | | | | | Remove preview picture from share view page for #1875 | ||||
| | * | | Remove preview picture from share view page for #1875 | Matt Burke | 2019-05-12 | 1 | -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-referrer | Kevin Decherf | 2019-05-12 | 3 | -1/+3 |
| |\ \ \ | | |/ / | |/| | | Enable no-referrer on img tags, enable strict-origin-when-cross-origin by default | ||||
| | * | | assets: regenerate material.css | Kevin Decherf | 2019-05-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| | * | | Enable no-referrer on img tags, enable strict-origin-when-cross-origin by ↵ | Kevin Decherf | 2019-05-10 | 2 | -0/+2 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | default Fixes #3889 Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | | Merge pull request #3942 from wallabag/issue-3838 | Jérémy Benoist | 2019-05-09 | 4 | -16/+47 |
| |\ \ | | | | | | | | | material: add metadata to list view | ||||
| | * | | material: add metadata to list view | Kevin Decherf | 2019-05-01 | 4 | -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-subdomain | Jérémy Benoist | 2019-04-27 | 17 | -43/+187 |
| |\ \ | | | | | | | | | Add ability to match many domains for credentials | ||||
| | * | | Adding more tests to cover different scenario | Jeremy Benoist | 2019-04-24 | 3 | -27/+161 |
| | | | | |||||
| | * | | FIx unrelated failing test | Jeremy Benoist | 2019-04-23 | 1 | -1/+1 |
| | | | | |||||
| | * | | Add ability to match many domains for credentials | Jeremy Benoist | 2019-04-23 | 15 | -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-oauth2 | Jérémy Benoist | 2019-05-13 | 4 | -0/+99 |
|\ \ \ | |_|/ |/| | | Cascade delete on oauth2 table when deleting a user | ||||
| * | | Fix SQLite constraint | Jeremy Benoist | 2019-05-10 | 1 | -3/+3 |
| | | | |||||
| * | | Fix SQLite migration | Jeremy Benoist | 2019-05-10 | 1 | -16/+17 |
| | | | |||||
| * | | Cascade delete on oauth2 table when deleting a user | Jeremy Benoist | 2019-05-10 | 4 | -0/+98 |
|/ / | |||||
* | | Merge pull request #3955 from wallabag/fix/gif-animation-imagick | Jérémy Benoist | 2019-05-10 | 6 | -21/+42 |
|\ \ | | | | | | | Use Imagick to keep GIF animation | ||||
| * | | Fallback to default solution if Imagick fails | Jeremy Benoist | 2019-05-10 | 1 | -4/+9 |
| | | | |||||
| * | | CS | Jeremy Benoist | 2019-05-10 | 3 | -20/+20 |
| | | | |||||
| * | | Setup Imagick for Travis | Jeremy Benoist | 2019-05-10 | 1 | -0/+4 |
| | | | | | | | | | | | | To avoid error from phpstan about class not found | ||||
| * | | Use Imagick to keep GIF animation | Jeremy Benoist | 2019-05-10 | 2 | -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/rss2atom | Jérémy Benoist | 2019-05-09 | 63 | -590/+787 |
|\ \ | | | | | | | Changed RSS to Atom feed and improve paging | ||||
| * | | Handle redirection from previous feeds | Jeremy Benoist | 2019-04-26 | 2 | -0/+69 |
| | | | |||||
| * | | Fix tests & cs & migration | Jeremy Benoist | 2019-04-26 | 14 | -69/+126 |
| | | | |||||
| * | | Changed RSS to Atom feed and improve paging | Thomas Citharel | 2019-04-25 | 57 | -564/+635 |
|/ / | |||||
* | | Merge pull request #3158 from wallabag/hash-exist-url | Jérémy Benoist | 2019-04-25 | 7 | -23/+398 |
|\ \ | | | | | | | Hash exist url |