aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
...
| * | 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
| * | Merge pull request #3782 from wallabag/issue-3779Kevin Decherf2018-11-262-25/+20
| |\ \
| | * | material: fix missing thumbnail on list viewKevin Decherf2018-11-252-25/+20
| | |/
| * | 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
| * | | Merge pull request #3778 from wallabag/better-releaseJérémy Benoist2018-11-253-13/+12
| |\ \ \ | | |_|/ | |/| |
| | * | Jump to 2.3.5-dev and update release processJeremy Benoist2018-11-253-13/+12
| |/ /
* | | Merge pull request #3799 from wallabag/mruminski-patch-1Jérémy Benoist2018-12-021-2/+2
|\ \ \
| * | | Update messages.pl.ymlMateusz Rumiński2018-12-021-2/+2
|/ / /
* | | Merge pull request #3758 from wallabag/dropping-php5Jérémy Benoist2018-11-2941-337/+325
|\ \ \
| * | | Fix utf8mb4 on vendor tablesJeremy Benoist2018-11-286-24/+107
| * | | Use our own fork for CraueConfigBundleJeremy Benoist2018-11-282-1/+7
| * | | Force PHPUnitJeremy Benoist2018-11-281-7/+3
| * | | CSJeremy Benoist2018-11-284-5/+3
| * | | Fix testsJeremy Benoist2018-11-285-68/+83
| * | | Remove custom Postgres classJeremy Benoist2018-11-289-71/+0
| * | | Update fixturesJeremy Benoist2018-11-289-72/+64
| * | | Jump to unrelease predisJeremy Benoist2018-11-281-1/+1
| * | | CleanupJeremy Benoist2018-11-2812-91/+60
| * | | Fix RulerZBundleJeremy Benoist2018-11-251-1/+1
| * | | Jump to PHP 7.1+Jeremy Benoist2018-11-251-3/+3
|/ / /
* | | Merge remote-tracking branch 'origin/master' into 2.4Jeremy Benoist2018-11-2540-136/+802
|\| |
| * | Merge pull request #3775 from wallabag/prepare-2.3.4Jérémy Benoist2018-11-245-22/+63
| |\ \
| | * | Create a custom swap to avoid errorJeremy Benoist2018-11-231-9/+17
| | * | Use latest bridge to avoid PHPUnit breakJeremy Benoist2018-11-231-1/+1