aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3845 from wallabag/feature/api-info-endpointKevin Decherf2019-01-153-3/+38
|\
| * Add a new endpoint to retrieve information from the wallabag instanceJeremy Benoist2019-01-153-3/+38
|/
* CSJeremy Benoist2019-01-153-3/+3
* Merge remote-tracking branch 'origin/master' into 2.4Jeremy Benoist2019-01-1561-1519/+3823
|\
| * 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
| |\ \
| | * | Validate imported entry to avoid error on importJeremy Benoist2019-01-0310-4/+108
| | |/
| * | Merge pull request #3823 from wallabag/fix-tag-api-leakJérémy Benoist2019-01-035-147/+214
| |\ \ | | |/ | |/|
| | * TagRestController: fix test for tag without entriesKevin Decherf2018-12-301-2/+12
| | * TagRestController: rewrite delete actions to only retrieve tags related to th...Kevin Decherf2018-12-302-11/+28
| | * TagRestController: add tests to ensure that other user's tags are unreachableKevin Decherf2018-12-301-0/+32
| | * 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 #3814 from wallabag/2.3.6-devJérémy Benoist2018-12-173-4/+4
| |\
| | * Jump to 2.3.6-dev and update release processJeremy Benoist2018-12-153-4/+4
| |/
| * Merge pull request #3812 from wallabag/prepare-2.3.5Jérémy Benoist2018-12-143-5/+21
| |\
| | * Prepare 2.3.5 releaseJeremy Benoist2018-12-143-5/+21
| |/
| * Merge pull request #3810 from wallabag/remove-guzzle-site-authenticator-devJérémy Benoist2018-12-141-1/+1
| |\
| | * No more dev for guzzle-site-authenticatorJeremy Benoist2018-12-131-1/+1
| * | Merge pull request #3781 from wallabag/yarn-upJérémy Benoist2018-12-136-1259/+3129
| |\ \ | | |/ | |/|
| | * build: upgrade yarn dependencies, update prod assetsKevin Decherf2018-12-106-1259/+3129
| |/
| * Merge pull request #3783 from wallabag/issue-3780Kevin Decherf2018-11-261-1/+3
| |\
| | * material: decrease size of tags on list viewKevin Decherf2018-11-251-1/+3
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 17:31:55 +0000