4575 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jeremy Benoist	dfd0a7bc5f	Add backup codes	2019-01-23 13:28:03 +01:00
Jeremy Benoist	6e4fc956ab	Better translations ... Replace “Google Authenticator” by “Google Authenticator, Authy or FreeOTP” in all text. Translate how to use the code / qr code.	2019-01-23 13:28:02 +01:00
Jeremy Benoist	43ccf4b178	Cleanup	2019-01-23 13:28:02 +01:00
Jeremy Benoist	2dfbe9e5fa	Fix tests	2019-01-23 13:28:02 +01:00
Jeremy Benoist	edc79ad886	Fix test for custom version of the tidy extension	2019-01-23 13:28:02 +01:00
Jeremy Benoist	a6b242a1fd	Enable OTP 2FA ... - 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	2019-01-23 13:28:02 +01:00
Jeremy Benoist	acd4412080	Create a dedicated tab to reset data	2019-01-23 13:28:01 +01:00
Jérémy Benoist	c6024246b7	Merge pull request #3627 from craig0990/feature/add-search-api-endpoint ... Add a basic Search REST endpoint	2019-01-23 09:19:37 +01:00
Jérémy Benoist	a8f4f7665c	Merge pull request #3864 from wallabag/fix/database-init-version ... Removed hardcoded database version	2019-01-23 09:04:54 +01:00
Jeremy Benoist	e19fc02665	Avoid creating PG database on Travis ... And Travis build on PHP 7.3 should not fail.	2019-01-22 21:43:15 +01:00
Jeremy Benoist	8010425444	Fix third argument to Route	2019-01-22 20:42:25 +01:00
Jeremy Benoist	019e1acc49	Factorize sendResponse between Api controllers ... And run newer cs fixer	2019-01-22 20:42:25 +01:00
Craig Roberts	9133bd02d1	[wallabag/wallabag#2611] Fix PHPCS lint errors	2019-01-22 20:42:25 +01:00
Craig Roberts	b32057980e	Fixes [wallabag/wallabag#2611] Add a basic Search REST endpoint ... - 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	2019-01-22 20:42:24 +01:00
Jeremy Benoist	6113dbbc20	Removed hardcoded database version	2019-01-22 20:38:28 +01:00
Kevin Decherf	3527c30021	Merge pull request #3526 from wallabag/add-random-article ... Add random feature	2019-01-22 18:30:02 +01:00
Jeremy Benoist	fe5850d6e2	Update icon to casino	2019-01-22 17:05:21 +01:00
Jeremy Benoist	091bafeb4c	Handle no random result found	2019-01-19 22:30:50 +01:00
Jeremy Benoist	2491c50b6b	Fix status from Instapaper ... That status was used as `http_status` in ContentProxy->stockEntry	2019-01-19 22:24:52 +01:00
Jeremy Benoist	50f35f0db2	Move icon into the top menu bar ... 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	2019-01-19 22:24:10 +01:00
Jeremy Benoist	9a57653aec	Redirect to the current view instead of homepage	2019-01-19 21:10:16 +01:00
Jeremy Benoist	90a0d086a8	Better icon	2019-01-19 21:10:16 +01:00
Jeremy Benoist	062fad434a	Better random function	2019-01-19 21:09:33 +01:00
Jeremy Benoist	0447a75b06	Use only one method to randomize ... Instead of one per type, one for all is ok.	2019-01-19 21:09:33 +01:00
Jeremy Benoist	f85d220c19	Fix tests	2019-01-19 21:09:33 +01:00
Nicolas Lœuillet	09ef25c3c3	Added random feature	2019-01-19 21:09:32 +01:00
Jérémy Benoist	c73025ad8b	Merge pull request #3858 from wallabag/bump-ocramius ... Bump ocramius/proxy-manager	2019-01-18 16:50:24 +01:00
Jeremy Benoist	963b873626	CS	2019-01-18 16:05:20 +01:00
Jérémy Benoist	6bfbf16eeb	Merge pull request #3859 from wallabag/phpstan ... Enable PHPStan	2019-01-18 15:56:39 +01:00
Jeremy Benoist	1e0d8ad7b7	Enable PHPStan ... - Fix error for level 0 & 1 (level 7 has 699 errors...) - Add `updated_at` to site_credential (so the `timestamps()` method applies correctly)	2019-01-18 15:25:50 +01:00
Thomas Citharel	9666fb70fc	Bump ocramius/proxy-manager ... Signed-off-by: Thomas Citharel <tcit@tcit.fr>	2019-01-17 12:47:24 +01:00
Kevin Decherf	8445ad4790	Merge pull request #3845 from wallabag/feature/api-info-endpoint ... Add a new endpoint to retrieve information from the wallabag instance	2019-01-15 12:22:35 +01:00
Jeremy Benoist	3bd65991ad	Add a new endpoint to retrieve information from the wallabag instance ... 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.	2019-01-15 10:17:11 +01:00
Jeremy Benoist	3afc87426d	CS	2019-01-15 09:49:22 +01:00
Jeremy Benoist	5419a8368e	Merge remote-tracking branch 'origin/master' into 2.4	2019-01-15 09:41:18 +01:00
Jérémy Benoist	f6b9e883c0	Merge pull request #3841 from wallabag/fix/bad-order-api ... Fix bad order parameter in the API	2019-01-14 22:24:40 +01:00
Jeremy Benoist	78e3fafa3f	Avoid error when a bad order parameter is given ... Only allowed parameter are asc & desc	2019-01-14 17:01:21 +01:00
Jeremy Benoist	a5e9a98aa3	Come back to stable version ... Previous one was used because some PHPUnit version where deleted and tests can't be run anymore.	2019-01-14 17:00:32 +01:00
Kevin Decherf	f083836cc4	Merge pull request #3837 from wallabag/2.3.7-dev ... Jump to 2.3.7-dev	2019-01-12 11:19:19 +01:00
Jérémy Benoist	314f647238	Jump to 2.3.7-dev	2019-01-11 22:17:48 +01:00
Jérémy Benoist	c17d1ab033	Merge pull request #3835 from wallabag/prepare-2.3.6 ... Prepare 2.3.6 release	2019-01-11 17:12:13 +01:00
Jeremy Benoist	3bed2e440e	Prepare 2.3.6 release	2019-01-11 14:16:41 +01:00
Jérémy Benoist	3625833b2c	Merge pull request #3826 from wallabag/epub-toc ... Rework of EPUB/PDF exports	2019-01-11 13:34:38 +01:00
Jérémy Benoist	03663530ed	Merge pull request #3831 from wallabag/fix/api-bad-client-id ... Cast client id to avoid PG error	2019-01-10 17:03:03 +01:00
Jérémy Benoist	ca990600da	Merge pull request #3833 from techexo/patch-1 ... Fix settings field inverted	2019-01-10 10:02:34 +01:00
Eloi Coutant	bb8ad42b27	Update entries.html.twig ... Should fix https://github.com/wallabag/wallabag/issues/3832	2019-01-10 04:25:51 +01:00
Eloi Coutant	d4466a37fe	Update entries.html.twig ... Should fix https://github.com/wallabag/wallabag/issues/3832	2019-01-10 04:23:08 +01:00
Jeremy Benoist	3a2d4cf9fd	Cast client id to avoid PG error ... If someone send a malformated client_id when trying to authenticate using the API we got a 500 if wallabag use postgres because the request send a string instead of an integer.	2019-01-09 23:31:14 +01:00
Kevin Decherf	5e1f27767b	EntriesExport: avoid else on $authors ... Signed-off-by: Kevin Decherf <kevin@kdecherf.com>	2019-01-09 16:26:19 +01:00
Kevin Decherf	dac93644e8	EntriesExport: sanitize filename and fix tests ... Filename will now only use a-zA-Z0-9-' and space. Fixes remaining filename issue on #3811 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>	2019-01-08 15:13:35 +01:00