4759 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jeremy Benoist	ea925bb112	CS	2019-02-27 14:33:26 +01:00
Thomas Citharel	3784688a88	Replace continue; with break; to avoid PHP 7.3 warnings ... Signed-off-by: Thomas Citharel <tcit@tcit.fr>	2019-02-27 14:29:14 +01:00
Jérémy Benoist	d5154ee2ae	Merge pull request #3886 from wallabag/issue-3602 ... epub export: fix missing cover image, only for exports of one article	2019-02-25 14:03:41 +01:00
Jérémy Benoist	4de99d1ab1	Merge pull request #3887 from wallabag/issue-3711 ... Add support of expect parameter to change return object when deleting entry	2019-02-25 10:56:07 +01:00
Kevin Decherf	12a97c3522	tests: fix broken session clients for rest entry deletion tests ... Signed-off-by: Kevin Decherf <kevin@kdecherf.com>	2019-02-20 15:57:56 +01:00
Kevin Decherf	508302042f	EntryRestController: add support of expect parameter to delete action ... 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>	2019-02-20 15:57:50 +01:00
Kevin Decherf	9a7a0e1e6b	epub export: fix missing cover image, only for exports of one article ... Fixes #3602 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>	2019-02-18 00:16:05 +01:00
Kevin Decherf	4e0ed3368d	tests: create entry for testDeleteEntry, fix missing id ... When using the entity manager to retrieve an already stored entry, the id disapears from $entry after the first delete call. This leads to testing a nonexistent endpoint (api/entries/.json) during the second delete call. This change now creates an entry specifically for the test. Signed-off-by: Kevin Decherf <kevin@kdecherf.com>	2019-02-17 15:25:21 +01:00
Martin Trigaux	c01bda038e	Allow optional --ignore-root-warning ... Now both ./install prod --ignore-root-warning ./install --ignore-root-warning prod will work $1 was both used for the environment and the root flag Fixes wallabag/wallabag#3884	2019-02-14 16:42:57 +05:30
Kevin Decherf	b1992b340e	Merge pull request #3882 from wallabag/fix/cors ... Fix CORS for API	2019-02-13 15:05:57 +01:00
Jeremy Benoist	44560c7767	CS	2019-02-13 14:06:57 +01:00
Jeremy Benoist	0182cdaec4	CS	2019-02-11 11:57:52 +01:00
Rurik19	a9f61d3dbb	CORS repare for api	2019-02-11 11:57:52 +01:00
Jérémy Benoist	a86c3f1759	Merge pull request #3879 from wallabag/fix/url-default-protocol ... Force default_protocol to generate an url input	2019-02-08 15:39:51 +01:00
Jeremy Benoist	baa5ee2d42	Force default_protocol to generate an url input	2019-02-08 15:03:52 +01:00
Jeremy Benoist	18460b2d79	Merge remote-tracking branch 'origin/master' into 2.4	2019-02-07 18:01:15 +01:00
Jérémy Benoist	47e4784110	Merge pull request #3869 from itsthejb/fix-2factor-email-image ... Fix broken 2 factor auth logo image	2019-02-01 12:58:31 +01:00
Jonathan Crooke	7e04bd4ca4	Fix broken 2 factor auth logo image	2019-01-31 22:14:53 +01:00
Kevin Decherf	2e5b3fa361	Merge pull request #3798 from wallabag/update-two-factor-bundle ... Enable OTP 2FA	2019-01-30 01:02:27 +01:00
Jérémy Benoist	755753e3ef	Merge pull request #3819 from stan3/pocket-import ... Fix read & starred status in Pocket import	2019-01-28 11:34:37 +01:00
Jeremy Benoist	8d082488e9	Improve checks & add tests	2019-01-28 06:03:16 +01:00
Tristan Hill	a2e60dd393	status and favourite are actually strings in the import so use ==	2019-01-27 18:39:26 +01:00
Jeremy Benoist	4654a83b64	Hash backup codes in the database using password_hash	2019-01-23 14:43:39 +01:00
Jeremy Benoist	7485a272ff	Revert PG on Travis about drop/create the database	2019-01-23 13:47:51 +01:00
Jeremy Benoist	c416ed485f	CS	2019-01-23 13:28:24 +01:00
Jeremy Benoist	a0c5eb003f	Change the way to enable 2FA ... And add a step to validate a generated code from the OTP app	2019-01-23 13:28:24 +01:00
Jeremy Benoist	4c0e747940	Remove secret from admin	2019-01-23 13:28:24 +01:00
Jeremy Benoist	e073090b8d	Update translation	2019-01-23 13:28:24 +01:00
Jeremy Benoist	6df8b9c6a9	Fix PG & Travis drop/create database	2019-01-23 13:28:24 +01:00
Jeremy Benoist	842af5c357	Add SQLite & PG migration ... Also remove the forced `server_version` from dbal config to avoid an hard overriding across all database.	2019-01-23 13:28:23 +01:00
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