aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* 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 #3909 from wallabag/fix/html-not-definedJérémy Benoist2019-03-181-7/+6
|\
| * Fix PHP warningJeremy Benoist2019-03-181-7/+6
* | Merge pull request #3908 from wallabag/epub-issue-3642Jérémy Benoist2019-03-181-1/+1
|\ \
| * | epub: fix exception when articles have the same titleKevin Decherf2019-03-171-1/+1
| |/
* | Merge pull request #3860 from baurmatt/fix/posix_compatibilityJérémy Benoist2019-03-183-9/+21
|\ \ | |/ |/|
| * Properly source require.shMatthias Baur2019-03-123-9/+21
|/
* Merge pull request #3901 from wallabag/fix-pr-3893Kevin Decherf2019-03-092-2/+2
|\
| * material: fix left padding on non-entry pages introduced by #3893Kevin Decherf2019-03-092-2/+2
|/
* Merge pull request #3897 from wallabag/2.3.8-devJérémy Benoist2019-03-041-1/+1
|\
| * 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 releaseJeremy Benoist2019-03-042-1/+19
|/
* Merge pull request #3894 from wallabag/issue-3851Kevin Decherf2019-03-034-6/+22
|\
| * material: update prod assetsKevin Decherf2019-03-031-1/+1
| * material: add media queries to hide creation date from card actionsKevin Decherf2019-03-031-0/+9
| * material: wrap card actions, remove class hiding of creation dateKevin Decherf2019-03-032-5/+12
|/
* Merge pull request #3893 from wallabag/issue-3877Kevin Decherf2019-03-032-6/+10
|\
| * material: fix left padding of content on medium screensKevin Decherf2019-03-021-1/+7
| * material: move a media query from cards to dedicated scss fileKevin Decherf2019-03-022-6/+4
|/
* Merge pull request #3885 from mart-e/script-ignore-rootJérémy Benoist2019-03-012-9/+22
|\
| * Allow optional --ignore-root-warningMartin Trigaux2019-02-142-9/+22
* | 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 articleKevin Decherf2019-02-181-7/+9
| |/
* | Merge pull request #3887 from wallabag/issue-3711Jérémy Benoist2019-02-252-17/+72
|\ \ | |/ |/|
| * tests: fix broken session clients for rest entry deletion testsKevin Decherf2019-02-201-4/+13
| * EntryRestController: add support of expect parameter to delete actionKevin Decherf2019-02-202-9/+33
| * tests: create entry for testDeleteEntry, fix missing idKevin Decherf2019-02-171-7/+29
|/
* Merge pull request #3882 from wallabag/fix/corsKevin Decherf2019-02-139-16/+16
|\
| * 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 imageJonathan Crooke2019-01-311-1/+1
|/
* Merge pull request #3819 from stan3/pocket-importJérémy Benoist2019-01-282-3/+10
|\
| * Improve checks & add testsJeremy Benoist2019-01-282-3/+10
| * status and favourite are actually strings in the import so use ==Tristan Hill2019-01-271-2/+2
|/
* Merge pull request #3861 from wallabag/fix/siteconfig-emailJérémy Benoist2019-01-182-2/+2
|\
| * Add dedicated email for site config issueJeremy Benoist2019-01-182-2/+2
|/
* Merge pull request #3853 from techexo/patch-2Jérémy Benoist2019-01-171-0/+1
|\
| * Update composer.json to add php-tidy (ext-tidy)Eloi Coutant2019-01-161-0/+1
|/
* Merge pull request #3841 from wallabag/fix/bad-order-apiJérémy Benoist2019-01-144-15/+33
|\
| * Avoid error when a bad `order` parameter is givenJeremy Benoist2019-01-143-14/+32
| * Come back to stable versionJeremy Benoist2019-01-141-1/+1
|/
* Merge pull request #3837 from wallabag/2.3.7-devKevin Decherf2019-01-121-1/+1
|\