Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 test | Jeremy Benoist | 2019-05-27 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #3965 from nicofrand/previewPic | Kevin Decherf | 2019-05-26 | 4 | -14/+123 |
|\ \ | |||||
| * | | [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 | 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 | 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 | Kevin Decherf | 2019-05-18 | 3 | -2/+42 |
* | | | 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 | 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 | Jeremy Benoist | 2019-05-13 | 1 | -2/+7 |
| |/ / | |||||
| * | | 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 | Matt Burke | 2019-05-12 | 1 | -3/+0 |
| * | | | Merge pull request #3943 from wallabag/img-referrer | Kevin Decherf | 2019-05-12 | 3 | -1/+3 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | assets: regenerate material.css | Kevin Decherf | 2019-05-10 | 1 | -1/+1 |
| | * | | Enable no-referrer on img tags, enable strict-origin-when-cross-origin by def... | Kevin Decherf | 2019-05-10 | 2 | -0/+2 |
| |/ / | |||||
| * | | Merge pull request #3942 from wallabag/issue-3838 | Jérémy Benoist | 2019-05-09 | 4 | -16/+47 |
| |\ \ | |||||
| | * | | material: add metadata to list view | Kevin Decherf | 2019-05-01 | 4 | -16/+47 |
| |/ / | |||||
| * | | Merge pull request #3937 from wallabag/fix/credential-subdomain | Jérémy Benoist | 2019-04-27 | 17 | -43/+187 |
| |\ \ | |||||
| | * | | 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 |
| |/ / | |||||
* | | | Merge pull request #3956 from wallabag/fix/delete-cascade-oauth2 | Jérémy Benoist | 2019-05-13 | 4 | -0/+99 |
|\ \ \ | |_|/ |/| | | |||||
| * | | 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 |
|\ \ | |||||
| * | | 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 |
| * | | Use Imagick to keep GIF animation | Jeremy Benoist | 2019-05-10 | 2 | -1/+13 |
|/ / | |||||
* | | Merge pull request #3223 from wallabag/rss2atom | Jérémy Benoist | 2019-05-09 | 63 | -590/+787 |
|\ \ | |||||
| * | | 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 |
|\ \ | |||||
| * | | Fix ApiDoc about md5/sha1 | Jérémy Benoist | 2019-04-02 | 1 | -2/+2 |
| * | | Fix index on MySQL | Jeremy Benoist | 2019-04-01 | 2 | -2/+2 |
| * | | Some cleanup | Jeremy Benoist | 2019-04-01 | 5 | -15/+23 |
| * | | Use a better index for hashed_url | Jeremy Benoist | 2019-04-01 | 7 | -23/+21 |
| * | | Keep url in exists endpoint | Jeremy Benoist | 2019-04-01 | 8 | -77/+154 |
| * | | Hash the urls to check if they exist | Thomas Citharel | 2019-04-01 | 7 | -14/+306 |
|/ / |