aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3798 from wallabag/update-two-factor-bundleKevin Decherf2019-01-3041-233/+1094
|\
| * Hash backup codes in the database using `password_hash`update-two-factor-bundleJeremy Benoist2019-01-234-11/+38
| * Revert PG on Travis about drop/create the databaseJeremy Benoist2019-01-232-9/+1
| * CSJeremy Benoist2019-01-231-3/+1
| * Change the way to enable 2FAJeremy Benoist2019-01-2320-290/+617
| * Remove secret from adminJeremy Benoist2019-01-231-6/+0
| * Update translationJeremy Benoist2019-01-2314-14/+14
| * Fix PG & Travis drop/create databaseJeremy Benoist2019-01-233-5/+13
| * Add SQLite & PG migrationJeremy Benoist2019-01-231-5/+41
| * Add backup codesJeremy Benoist2019-01-2321-14/+96
| * Better translationsJeremy Benoist2019-01-2315-35/+76
| * CleanupJeremy Benoist2019-01-232-3/+1
| * Fix testsJeremy Benoist2019-01-234-69/+36
| * Fix test for custom version of the tidy extensionJeremy Benoist2019-01-231-7/+7
| * Enable OTP 2FAJeremy Benoist2019-01-2336-177/+553
| * Create a dedicated tab to reset dataJeremy Benoist2019-01-2315-31/+46
|/
* Merge pull request #3627 from craig0990/feature/add-search-api-endpoint2.4Jérémy Benoist2019-01-235-21/+159
|\
| * Fix third argument to RouteJeremy Benoist2019-01-222-4/+2
| * Factorize sendResponse between Api controllersJeremy Benoist2019-01-224-41/+21
| * [wallabag/wallabag#2611] Fix PHPCS lint errorsCraig Roberts2019-01-222-11/+2
| * Fixes [wallabag/wallabag#2611] Add a basic Search REST endpointCraig Roberts2019-01-223-0/+169
* | 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
| |\