Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3798 from wallabag/update-two-factor-bundle | Kevin Decherf | 2019-01-30 | 41 | -233/+1094 |
|\ | |||||
| * | Hash backup codes in the database using `password_hash`update-two-factor-bundle | Jeremy Benoist | 2019-01-23 | 4 | -11/+38 |
| * | Revert PG on Travis about drop/create the database | Jeremy Benoist | 2019-01-23 | 2 | -9/+1 |
| * | CS | Jeremy Benoist | 2019-01-23 | 1 | -3/+1 |
| * | Change the way to enable 2FA | Jeremy Benoist | 2019-01-23 | 20 | -290/+617 |
| * | Remove secret from admin | Jeremy Benoist | 2019-01-23 | 1 | -6/+0 |
| * | Update translation | Jeremy Benoist | 2019-01-23 | 14 | -14/+14 |
| * | Fix PG & Travis drop/create database | Jeremy Benoist | 2019-01-23 | 3 | -5/+13 |
| * | Add SQLite & PG migration | Jeremy Benoist | 2019-01-23 | 1 | -5/+41 |
| * | Add backup codes | Jeremy Benoist | 2019-01-23 | 21 | -14/+96 |
| * | Better translations | Jeremy Benoist | 2019-01-23 | 15 | -35/+76 |
| * | Cleanup | Jeremy Benoist | 2019-01-23 | 2 | -3/+1 |
| * | Fix tests | Jeremy Benoist | 2019-01-23 | 4 | -69/+36 |
| * | Fix test for custom version of the tidy extension | Jeremy Benoist | 2019-01-23 | 1 | -7/+7 |
| * | Enable OTP 2FA | Jeremy Benoist | 2019-01-23 | 36 | -177/+553 |
| * | Create a dedicated tab to reset data | Jeremy Benoist | 2019-01-23 | 15 | -31/+46 |
|/ | |||||
* | Merge pull request #3627 from craig0990/feature/add-search-api-endpoint2.4 | Jérémy Benoist | 2019-01-23 | 5 | -21/+159 |
|\ | |||||
| * | Fix third argument to Route | Jeremy Benoist | 2019-01-22 | 2 | -4/+2 |
| * | Factorize sendResponse between Api controllers | Jeremy Benoist | 2019-01-22 | 4 | -41/+21 |
| * | [wallabag/wallabag#2611] Fix PHPCS lint errors | Craig Roberts | 2019-01-22 | 2 | -11/+2 |
| * | Fixes [wallabag/wallabag#2611] Add a basic Search REST endpoint | Craig Roberts | 2019-01-22 | 3 | -0/+169 |
* | | Merge pull request #3864 from wallabag/fix/database-init-version | Jérémy Benoist | 2019-01-23 | 2 | -3/+0 |
|\ \ | |/ |/| | |||||
| * | Avoid creating PG database on Travis | Jeremy Benoist | 2019-01-22 | 1 | -2/+0 |
| * | Removed hardcoded database version | Jeremy Benoist | 2019-01-22 | 1 | -1/+0 |
|/ | |||||
* | Merge pull request #3526 from wallabag/add-random-article | Kevin Decherf | 2019-01-22 | 24 | -67/+214 |
|\ | |||||
| * | Update icon to `casino` | Jeremy Benoist | 2019-01-22 | 2 | -2/+2 |
| * | Handle no random result found | Jeremy Benoist | 2019-01-19 | 1 | -1/+6 |
| * | Fix status from Instapaper | Jeremy Benoist | 2019-01-19 | 1 | -1/+0 |
| * | Move icon into the top menu bar | Jeremy Benoist | 2019-01-19 | 22 | -28/+57 |
| * | Redirect to the current view instead of homepage | Jeremy Benoist | 2019-01-19 | 2 | -19/+18 |
| * | Better icon | Jeremy Benoist | 2019-01-19 | 1 | -1/+1 |
| * | Better random function | Jeremy Benoist | 2019-01-19 | 1 | -9/+13 |
| * | Use only one method to randomize | Jeremy Benoist | 2019-01-19 | 4 | -85/+42 |
| * | Fix tests | Jeremy Benoist | 2019-01-19 | 2 | -99/+94 |
| * | Added random feature | Nicolas Lœuillet | 2019-01-19 | 18 | -10/+169 |
|/ | |||||
* | Merge pull request #3858 from wallabag/bump-ocramius | Jérémy Benoist | 2019-01-18 | 1 | -3/+8 |
|\ | |||||
| * | CS | Jeremy Benoist | 2019-01-18 | 3 | -3/+3 |
| * | Bump ocramius/proxy-manager | Thomas Citharel | 2019-01-17 | 1 | -3/+8 |
* | | Merge pull request #3859 from wallabag/phpstan | Jérémy Benoist | 2019-01-18 | 27 | -43/+118 |
|\ \ | |||||
| * | | Enable PHPStan | Jeremy Benoist | 2019-01-18 | 27 | -43/+118 |
|/ / | |||||
* | | Merge pull request #3845 from wallabag/feature/api-info-endpoint | Kevin Decherf | 2019-01-15 | 3 | -3/+38 |
|\ \ | |||||
| * | | Add a new endpoint to retrieve information from the wallabag instance | Jeremy Benoist | 2019-01-15 | 3 | -3/+38 |
|/ / | |||||
* | | CS | Jeremy Benoist | 2019-01-15 | 3 | -3/+3 |
* | | Merge remote-tracking branch 'origin/master' into 2.4 | Jeremy Benoist | 2019-01-15 | 61 | -1519/+3823 |
|\ \ | |/ |/| | |||||
| * | Merge pull request #3841 from wallabag/fix/bad-order-api | Jérémy Benoist | 2019-01-14 | 4 | -15/+33 |
| |\ | |||||
| | * | Avoid error when a bad `order` parameter is given | Jeremy Benoist | 2019-01-14 | 3 | -14/+32 |
| | * | Come back to stable version | Jeremy Benoist | 2019-01-14 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #3837 from wallabag/2.3.7-dev | Kevin Decherf | 2019-01-12 | 1 | -1/+1 |
| |\ | |||||
| | * | Jump to 2.3.7-dev | Jérémy Benoist | 2019-01-11 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #3835 from wallabag/prepare-2.3.6 | Jérémy Benoist | 2019-01-11 | 2 | -1/+15 |
| |\ |