Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/master' into 2.4 | Jeremy Benoist | 2019-04-01 | 4 | -24/+40 |
|\ | |||||
| * | Merge pull request #3909 from wallabag/fix/html-not-defined | Jérémy Benoist | 2019-03-18 | 1 | -7/+6 |
| |\ | | | | | | | Fix PHP warning | ||||
| | * | Fix PHP warning | Jeremy Benoist | 2019-03-18 | 1 | -7/+6 |
| | | | | | | | | | | | | Looks like sometimes (usually from import) the `html` key isn’t available. | ||||
| * | | epub: fix exception when articles have the same title | Kevin Decherf | 2019-03-17 | 1 | -1/+1 |
| |/ | | | | | | | | | | | | | | | | | | | This commit fixes an exception occuring when exporting as epub several articles with the same title. The chapter filename is now derived from title and url. Fixes #3642 Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | material: wrap card actions, remove class hiding of creation date | Kevin Decherf | 2019-03-03 | 1 | -5/+7 |
| | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | Merge pull request #3886 from wallabag/issue-3602 | Jérémy Benoist | 2019-02-25 | 1 | -7/+9 |
| |\ | | | | | | | epub export: fix missing cover image, only for exports of one article | ||||
| | * | epub export: fix missing cover image, only for exports of one article | Kevin Decherf | 2019-02-18 | 1 | -7/+9 |
| | | | | | | | | | | | | | | | | | | Fixes #3602 Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | | EntryRestController: add support of expect parameter to delete action | Kevin Decherf | 2019-02-20 | 1 | -4/+17 |
| |/ | | | | | | | | | | | | | | | | | | | | | The expect parameter enables an application to request the whole entry or only the id when requesting its deletion. `expects` defaults to `entry` to prevent any API breakage. Fixes #3711 Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | CS | Jeremy Benoist | 2019-02-13 | 1 | -1/+1 |
| | | |||||
| * | CS | Jeremy Benoist | 2019-02-11 | 9 | -13/+13 |
| | | |||||
* | | Adding more tests | Jeremy Benoist | 2019-02-27 | 7 | -9/+9 |
| | | |||||
* | | CS | Jeremy Benoist | 2019-02-27 | 6 | -10/+10 |
| | | |||||
* | | Replace continue; with break; to avoid PHP 7.3 warnings | Thomas Citharel | 2019-02-27 | 7 | -9/+9 |
| | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | ||||
* | | Force default_protocol to generate an url input | Jeremy Benoist | 2019-02-08 | 3 | -0/+4 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into 2.4 | Jeremy Benoist | 2019-02-07 | 4 | -6/+6 |
|\| | |||||
| * | Fix broken 2 factor auth logo image | Jonathan Crooke | 2019-01-31 | 1 | -1/+1 |
| | | |||||
| * | Improve checks & add tests | Jeremy Benoist | 2019-01-28 | 1 | -3/+3 |
| | | |||||
| * | status and favourite are actually strings in the import so use == | Tristan Hill | 2019-01-27 | 1 | -2/+2 |
| | | |||||
| * | Add dedicated email for site config issue | Jeremy Benoist | 2019-01-18 | 2 | -2/+2 |
| | | | | | | | | | | Instead of sending an email to the devs, it now creates an issue on GitHub using a zap from zapier. | ||||
* | | Hash backup codes in the database using `password_hash`update-two-factor-bundle | Jeremy Benoist | 2019-01-23 | 4 | -11/+38 |
| | | |||||
* | | CS | Jeremy Benoist | 2019-01-23 | 1 | -3/+1 |
| | | |||||
* | | Change the way to enable 2FA | Jeremy Benoist | 2019-01-23 | 19 | -177/+536 |
| | | | | | | | | And add a step to validate a generated code from the OTP app | ||||
* | | Remove secret from admin | Jeremy Benoist | 2019-01-23 | 1 | -6/+0 |
| | | |||||
* | | Update translation | Jeremy Benoist | 2019-01-23 | 14 | -14/+14 |
| | | |||||
* | | Add backup codes | Jeremy Benoist | 2019-01-23 | 18 | -11/+71 |
| | | |||||
* | | Better translations | Jeremy Benoist | 2019-01-23 | 15 | -35/+76 |
| | | | | | | | | | | | | Replace “Google Authenticator” by “Google Authenticator, Authy or FreeOTP” in all text. Translate how to use the code / qr code. | ||||
* | | Cleanup | Jeremy Benoist | 2019-01-23 | 2 | -3/+1 |
| | | |||||
* | | Fix tests | Jeremy Benoist | 2019-01-23 | 4 | -69/+36 |
| | | |||||
* | | Enable OTP 2FA | Jeremy Benoist | 2019-01-23 | 25 | -162/+346 |
| | | | | | | | | | | | | | | | | | | - Update SchebTwoFactorBundle to version 3 - Enable Google 2fa on the bundle - Disallow ability to use both email and google as 2fa - Update Ocramius Proxy Manager to handle typed function & attributes (from PHP 7) - use `$this->addFlash` shortcut instead of `$this->get('session')->getFlashBag()->add` - update admin to be able to create/reset the 2fa | ||||
* | | Create a dedicated tab to reset data | Jeremy Benoist | 2019-01-23 | 15 | -31/+46 |
| | | |||||
* | | Fix third argument to Route | Jeremy Benoist | 2019-01-22 | 2 | -4/+2 |
| | | |||||
* | | Factorize sendResponse between Api controllers | Jeremy Benoist | 2019-01-22 | 3 | -38/+19 |
| | | | | | | | | And run newer cs fixer | ||||
* | | [wallabag/wallabag#2611] Fix PHPCS lint errors | Craig Roberts | 2019-01-22 | 1 | -6/+0 |
| | | |||||
* | | Fixes [wallabag/wallabag#2611] Add a basic Search REST endpoint | Craig Roberts | 2019-01-22 | 2 | -0/+96 |
| | | | | | | | | | | | | | | - Adds a new `search` key to `src/Wallabag/ApiBundle/Resources/config/routing_rest.yml` - Reuses the `getBuilderForSearchByUser` method from the EntryRepository - Supports, `term`, `page`, and `perPage` query parameters - Some very basic tests | ||||
* | | 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 |
| | | | | | | | | That status was used as `http_status` in ContentProxy->stockEntry | ||||
* | | Move icon into the top menu bar | Jeremy Benoist | 2019-01-19 | 19 | -25/+40 |
| | | | | | | | | | | | | | | Change the way to select a random entry: - select all ids from the given user (with filters) - choose randomly one in php - find that entry | ||||
* | | 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 | 3 | -85/+16 |
| | | | | | | | | Instead of one per type, one for all is ok. | ||||
* | | Fix tests | Jeremy Benoist | 2019-01-19 | 2 | -99/+94 |
| | | |||||
* | | Added random feature | Nicolas Lœuillet | 2019-01-19 | 18 | -10/+169 |
| | | |||||
* | | Enable PHPStan | Jeremy Benoist | 2019-01-18 | 3 | -1/+20 |
| | | | | | | | | | | - Fix error for level 0 & 1 (level 7 has 699 errors...) - Add `updated_at` to site_credential (so the `timestamps()` method applies correctly) | ||||
* | | Add a new endpoint to retrieve information from the wallabag instance | Jeremy Benoist | 2019-01-15 | 1 | -0/+20 |
| | | | | | | | | | | | | | | Useful for api client which required some information. We might add more inside them in the future. The endpoint /api/version should be avoided now as it contains not so much information rather the version. | ||||
* | | CS | Jeremy Benoist | 2019-01-15 | 3 | -3/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into 2.4 | Jeremy Benoist | 2019-01-15 | 41 | -215/+497 |
|\| | |||||
| * | Avoid error when a bad `order` parameter is given | Jeremy Benoist | 2019-01-14 | 2 | -14/+23 |
| | | | | | | | | Only allowed parameter are asc & desc | ||||
| * | Merge pull request #3826 from wallabag/epub-toc | Jérémy Benoist | 2019-01-11 | 16 | -29/+157 |
| |\ | | | | | | | Rework of EPUB/PDF exports |