aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * Jump to 2.3.7-devJérémy Benoist2019-01-111-1/+1
|/
* Merge pull request #3835 from wallabag/prepare-2.3.6Jérémy Benoist2019-01-112-1/+15
|\
| * Prepare 2.3.6 releaseJeremy Benoist2019-01-112-1/+15
|/
* Merge pull request #3826 from wallabag/epub-tocJérémy Benoist2019-01-1117-32/+165
|\
| * EntriesExport: avoid else on $authorsKevin Decherf2019-01-091-4/+2
| * EntriesExport: sanitize filename and fix testsKevin Decherf2019-01-082-13/+26
| * EntriesExport/pdf: move notice to the end, add metadata coverKevin Decherf2019-01-071-8/+25
| * Add translationsKevin Decherf2019-01-0714-1/+88
| * EntriesExport/epub: add metadata to each entry's coverKevin Decherf2019-01-071-1/+16
| * EntriesExport: change authors and title when not single entry exportKevin Decherf2019-01-072-2/+5
| * EntriesExport/epub: revert c779373f, move exportinfo to the end of the bookKevin Decherf2019-01-071-1/+3
| * EntriesExport/epub: use sha1 sums for filenames, fix and rename title chaptersKevin Decherf2019-01-071-6/+6
| * EntriesExport/epub: remove TOC pageKevin Decherf2019-01-071-2/+0
* | Merge pull request #3831 from wallabag/fix/api-bad-client-idJérémy Benoist2019-01-103-1/+34
|\ \
| * | Cast client id to avoid PG errorJeremy Benoist2019-01-093-1/+34
* | | Merge pull request #3833 from techexo/patch-1Jérémy Benoist2019-01-102-4/+4
|\ \ \ | |_|/ |/| |
| * | Update entries.html.twigEloi Coutant2019-01-101-2/+2
| * | Update entries.html.twigEloi Coutant2019-01-101-2/+2
|/ /
* | Merge pull request #3827 from wallabag/epub-quoteKevin Decherf2019-01-071-2/+8
|\ \
| * | EntriesExport/epub: replace epub identifier with unique urnKevin Decherf2019-01-061-2/+8
* | | Merge pull request #3820 from lizyn/bugfix/incorrect-calculation-of-CJK-chara...Jérémy Benoist2019-01-079-10/+63
|\ \ \ | |/ / |/| |
| * | Counting two characters together as a word in CJKlizyn2019-01-064-5/+5
| * | Improve reading time testsJeremy Benoist2019-01-049-9/+41
| * | fix incorrect reading time calculation for entries with CJK characterslizyn2018-12-254-1/+22
| |/
* | Merge pull request #3816 from wallabag/validate-import-entryJérémy Benoist2019-01-0410-4/+108
|\ \