Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3985 from wallabag/update-composer | Jérémy Benoist | 2019-05-29 | 5 | -31/+10446 |
|\ | |||||
| * | Typos | Jeremy Benoist | 2019-05-29 | 1 | -2/+17 |
| * | Keep composer.lock | Jeremy Benoist | 2019-05-29 | 5 | -43/+10443 |
|/ | |||||
* | Merge pull request #3984 from wallabag/2.4 | Jérémy Benoist | 2019-05-29 | 206 | -1871/+4701 |
|\ | |||||
| * | Merge pull request #3944 from shtrom/always-hash-exists-url | Jérémy Benoist | 2019-05-28 | 5 | -47/+80 |
| |\ | |||||
| | * | Remove useless methods | Jeremy Benoist | 2019-05-24 | 2 | -28/+2 |
| | * | Change the way to define algorithm for hashing url | Jeremy Benoist | 2019-05-24 | 3 | -11/+11 |
| | * | Add Wallabag\CoreBundle\Helper\UrlHasher | Olivier Mehani | 2019-05-24 | 5 | -21/+79 |
| | * | Delegate findByUrlAndUserId to findByHashedUrlAndUserId | Olivier Mehani | 2019-05-24 | 1 | -11/+3 |
| | * | EntryRestController::getEntriesExistsAction: always find by hashed url | Olivier Mehani | 2019-05-24 | 1 | -31/+40 |
| * | | Merge pull request #3390 from aaa2000/httplug | Jérémy Benoist | 2019-05-28 | 14 | -479/+447 |
| |\ \ | |||||
| | * | | Fix tests after rebase | Jeremy Benoist | 2019-05-28 | 2 | -14/+12 |
| | * | | CS & fix tests | Jeremy Benoist | 2019-05-28 | 1 | -15/+36 |
| | * | | 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 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 |
| |\ \ | | |/ | |/| |