aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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 #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 #3909 from wallabag/fix/html-not-definedJérémy Benoist2019-03-181-7/+6
|\ | | | | Fix PHP warning
| * Fix PHP warningJeremy Benoist2019-03-181-7/+6
| | | | | | | | Looks like sometimes (usually from import) the `html` key isn’t available.
* | Merge pull request #3908 from wallabag/epub-issue-3642Jérémy Benoist2019-03-181-1/+1
|\ \ | | | | | | epub: fix exception when articles have the same title
| * | epub: fix exception when articles have the same titleKevin Decherf2019-03-171-1/+1
| |/ | | | | | | | | | | | | | | | | | | This commit fixes an exception occuring when exporting as epub several articles with the same title. The chapter filename is now derived from title and url. Fixes #3642 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #3860 from baurmatt/fix/posix_compatibilityJérémy Benoist2019-03-183-9/+21
|\ \ | |/ |/| Make dev/install/update script posix compatible
| * Properly source require.shMatthias Baur2019-03-123-9/+21
|/ | | | Fixes #3571.
* Merge pull request #3901 from wallabag/fix-pr-3893Kevin Decherf2019-03-092-2/+2
|\ | | | | material: fix left padding on non-entry pages introduced by #3893
| * material: fix left padding on non-entry pages introduced by #3893Kevin Decherf2019-03-092-2/+2
|/ | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* Merge pull request #3897 from wallabag/2.3.8-devJérémy Benoist2019-03-041-1/+1
|\ | | | | Jump to 2.3.8-dev
| * Jump to 2.3.8-devJeremy Benoist2019-03-041-1/+1
|/
* Merge pull request #3895 from wallabag/prepare-2.3.7Jérémy Benoist2019-03-042-1/+19
|\ | | | | Prepare 2.3.7 release
| * Prepare 2.3.7 releaseJeremy Benoist2019-03-042-1/+19
|/
* Merge pull request #3894 from wallabag/issue-3851Kevin Decherf2019-03-034-6/+22
|\ | | | | material: hide creation date from card actions on specific sizes
| * material: update prod assetsKevin Decherf2019-03-031-1/+1
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * material: add media queries to hide creation date from card actionsKevin Decherf2019-03-031-0/+9
| | | | | | | | | | | | | | | | | | Hide the creation date from card actions on specific sizes when there's not enough space for all parts. Fixes #3851 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * material: wrap card actions, remove class hiding of creation dateKevin Decherf2019-03-032-5/+12
|/ | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* Merge pull request #3893 from wallabag/issue-3877Kevin Decherf2019-03-032-6/+10
|\ | | | | material: fix left padding of content on medium screens
| * material: fix left padding of content on medium screensKevin Decherf2019-03-021-1/+7
| | | | | | | | | | | | Fixes #3877 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * material: move a media query from cards to dedicated scss fileKevin Decherf2019-03-022-6/+4
|/ | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* Merge pull request #3885 from mart-e/script-ignore-rootJérémy Benoist2019-03-012-9/+22
|\ | | | | Allow optional --ignore-root-warning
| * Allow optional --ignore-root-warningMartin Trigaux2019-02-142-9/+22
| | | | | | | | | | | | | | | | | | | | | | | | Now both ./install prod --ignore-root-warning ./install --ignore-root-warning prod will work $1 was both used for the environment and the root flag Fixes wallabag/wallabag#3884
* | Merge pull request #3886 from wallabag/issue-3602Jérémy Benoist2019-02-251-7/+9
|\ \ | | | | | | epub export: fix missing cover image, only for exports of one article
| * | epub export: fix missing cover image, only for exports of one articleKevin Decherf2019-02-181-7/+9
| |/ | | | | | | | | | | Fixes #3602 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #3887 from wallabag/issue-3711Jérémy Benoist2019-02-252-17/+72
|\ \ | |/ |/| Add support of expect parameter to change return object when deleting entry
| * tests: fix broken session clients for rest entry deletion testsKevin Decherf2019-02-201-4/+13
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * EntryRestController: add support of expect parameter to delete actionKevin Decherf2019-02-202-9/+33
| | | | | | | | | | | | | | | | | | | | | | The expect parameter enables an application to request the whole entry or only the id when requesting its deletion. `expects` defaults to `entry` to prevent any API breakage. Fixes #3711 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * tests: create entry for testDeleteEntry, fix missing idKevin Decherf2019-02-171-7/+29
|/ | | | | | | | | | | When using the entity manager to retrieve an already stored entry, the id disapears from $entry after the first delete call. This leads to testing a nonexistent endpoint (api/entries/.json) during the second delete call. This change now creates an entry specifically for the test. Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* Merge pull request #3882 from wallabag/fix/corsKevin Decherf2019-02-139-16/+16
|\ | | | | Fix CORS for API
| * CSJeremy Benoist2019-02-131-1/+1
| |
| * CSJeremy Benoist2019-02-119-13/+13
| |
| * CORS repare for apiRurik192019-02-111-4/+4
|/
* Merge pull request #3869 from itsthejb/fix-2factor-email-imageJérémy Benoist2019-02-011-1/+1
|\ | | | | Fix broken 2 factor auth logo image
| * Fix broken 2 factor auth logo imageJonathan Crooke2019-01-311-1/+1
|/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 12:55:43 +0000