aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3864 from wallabag/fix/database-init-versionJérémy Benoist2019-01-232-3/+0
|\
| * Avoid creating PG database on TravisJeremy Benoist2019-01-221-2/+0
| * Removed hardcoded database versionJeremy Benoist2019-01-221-1/+0
|/
* Merge pull request #3526 from wallabag/add-random-articleKevin Decherf2019-01-2224-67/+214
|\
| * Update icon to `casino`Jeremy Benoist2019-01-222-2/+2
| * Handle no random result foundJeremy Benoist2019-01-191-1/+6
| * Fix status from InstapaperJeremy Benoist2019-01-191-1/+0
| * Move icon into the top menu barJeremy Benoist2019-01-1922-28/+57
| * Redirect to the current view instead of homepageJeremy Benoist2019-01-192-19/+18
| * Better iconJeremy Benoist2019-01-191-1/+1
| * Better random functionJeremy Benoist2019-01-191-9/+13
| * Use only one method to randomizeJeremy Benoist2019-01-194-85/+42
| * Fix testsJeremy Benoist2019-01-192-99/+94
| * Added random featureNicolas Lœuillet2019-01-1918-10/+169
|/
* Merge pull request #3858 from wallabag/bump-ocramiusJérémy Benoist2019-01-181-3/+8
|\
| * CSJeremy Benoist2019-01-183-3/+3
| * Bump ocramius/proxy-managerThomas Citharel2019-01-171-3/+8
* | Merge pull request #3859 from wallabag/phpstanJérémy Benoist2019-01-1827-43/+118
|\ \
| * | Enable PHPStanJeremy Benoist2019-01-1827-43/+118
|/ /
* | 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