aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into 2.4Jeremy Benoist2019-01-1541-215/+497
|\
| * Avoid error when a bad `order` parameter is givenJeremy Benoist2019-01-142-14/+23
| * Merge pull request #3826 from wallabag/epub-tocJérémy Benoist2019-01-1116-29/+157
| |\
| | * EntriesExport: avoid else on $authorsKevin Decherf2019-01-091-4/+2
| | * EntriesExport: sanitize filename and fix testsKevin Decherf2019-01-081-10/+18
| | * 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-102-1/+20
| |\ \
| | * | Cast client id to avoid PG errorJeremy Benoist2019-01-092-1/+20
| * | | 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-071-4/+3
| |\ \ \ | | |/ / | |/| |
| | * | Counting two characters together as a word in CJKlizyn2019-01-061-1/+1
| | * | Improve reading time testsJeremy Benoist2019-01-041-3/+2
| | * | fix incorrect reading time calculation for entries with CJK characterslizyn2018-12-251-1/+1
| | |/
| * | Merge pull request #3816 from wallabag/validate-import-entryJérémy Benoist2019-01-0410-4/+108
| |\ \
| | * | Validate imported entry to avoid error on importJeremy Benoist2019-01-0310-4/+108
| | |/
| * | TagRestController: rewrite delete actions to only retrieve tags related to th...Kevin Decherf2018-12-302-11/+28
| * | TagRepository: refactor query builder for queries by userIdKevin Decherf2018-12-301-16/+20
| * | fixtures: refactor EntryData, TagData, add a new tagKevin Decherf2018-12-292-118/+122
| |/
| * Merge pull request #3782 from wallabag/issue-3779Kevin Decherf2018-11-261-6/+5
| |\
| | * material: fix missing thumbnail on list viewKevin Decherf2018-11-251-6/+5
| * | Merge pull request #3784 from giuppi/masterJérémy Benoist2018-11-261-1/+1
| |\ \
| | * | Fix Android app login issuegiuppi2018-11-251-1/+1
| | |/
| * | Merge pull request #3765 from burkemw3/patch-2Jérémy Benoist2018-11-262-7/+0
| |\ \ | | |/ | |/|
| | * Remove preview picture from single entry view page for #1875Matt Burke2018-11-242-7/+0
* | | Update messages.pl.ymlMateusz Rumiński2018-12-021-2/+2
* | | Fix utf8mb4 on vendor tablesJeremy Benoist2018-11-283-0/+48
* | | CSJeremy Benoist2018-11-282-2/+0
* | | Remove custom Postgres classJeremy Benoist2018-11-282-63/+0
* | | Update fixturesJeremy Benoist2018-11-288-66/+58
* | | CleanupJeremy Benoist2018-11-281-1/+1
* | | Fix RulerZBundleJeremy Benoist2018-11-251-1/+1
* | | Merge remote-tracking branch 'origin/master' into 2.4Jeremy Benoist2018-11-2520-56/+220
|\| |
| * | Card no preview replaced by wallabag logoSimounet2018-11-211-5/+2
| * | Update messages.en.ymlEloi Coutant2018-11-161-3/+3
| * | Update messages.fr.ymlEloi Coutant2018-11-161-1/+1
| * | Update messages.fr.ymlEloi Coutant2018-11-161-3/+3
| * | Add rel=noopener to target=_blank linksMatt Burke2018-11-076-25/+25
| |/
| * Merge pull request #3764 from shtrom/fix-matches-notmatches-languageKevin Decherf2018-11-018-13/+13
| |\
| | * fixup! fixup! Fix documentation wording for matches/notmatches tagging rulesOlivier Mehani2018-11-018-8/+8
| | * fixup! Fix documentation wording for matches/notmatches tagging rulesOlivier Mehani2018-11-018-8/+8
| | * Fix documentation wording for matches/notmatches tagging rulesOlivier Mehani2018-10-318-13/+13