Commit Graph

5611 Commits

Author SHA1 Message Date
0182cdaec4 CS 2019-02-11 11:57:52 +01:00
a9f61d3dbb CORS repare for api 2019-02-11 11:57:52 +01:00
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
baa5ee2d42 Force default_protocol to generate an url input 2019-02-08 15:03:52 +01:00
18460b2d79 Merge remote-tracking branch 'origin/master' into 2.4 2019-02-07 18:01:15 +01:00
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
7e04bd4ca4 Fix broken 2 factor auth logo image 2019-01-31 22:14:53 +01:00
2e5b3fa361 Merge pull request #3798 from wallabag/update-two-factor-bundle
Enable OTP 2FA
2019-01-30 01:02:27 +01:00
b97123c39f Merge branch 'origin/master' into Weblate. 2019-01-28 11:34:42 +01:00
755753e3ef Merge pull request #3819 from stan3/pocket-import
Fix read & starred status in Pocket import
2019-01-28 11:34:37 +01:00
8d082488e9 Improve checks & add tests 2019-01-28 06:03:16 +01:00
a2e60dd393 status and favourite are actually strings in the import so use == 2019-01-27 18:39:26 +01:00
78e24f8954 Translated using Weblate (Norwegian Bokmål)
Currently translated at 85.7% (6 of 7 strings)
2019-01-27 16:06:14 +01:00
1e4dd73b07 Translated using Weblate (Norwegian Bokmål)
Currently translated at 100.0% (6 of 6 strings)
2019-01-24 12:06:33 +01:00
606ab37b6a Translated using Weblate (English)
Currently translated at 100.0% (6 of 6 strings)
2019-01-24 12:06:32 +01:00
5bd456eda7 Translated using Weblate (Norwegian Bokmål)
Currently translated at 87.5% (35 of 40 strings)
2019-01-24 12:06:31 +01:00
4654a83b64 Hash backup codes in the database using password_hash 2019-01-23 14:43:39 +01:00
7485a272ff Revert PG on Travis about drop/create the database 2019-01-23 13:47:51 +01:00
c416ed485f CS 2019-01-23 13:28:24 +01:00
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
4c0e747940 Remove secret from admin 2019-01-23 13:28:24 +01:00
e073090b8d Update translation 2019-01-23 13:28:24 +01:00
6df8b9c6a9 Fix PG & Travis drop/create database 2019-01-23 13:28:24 +01:00
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
dfd0a7bc5f Add backup codes 2019-01-23 13:28:03 +01:00
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
43ccf4b178 Cleanup 2019-01-23 13:28:02 +01:00
2dfbe9e5fa Fix tests 2019-01-23 13:28:02 +01:00
edc79ad886 Fix test for custom version of the tidy extension 2019-01-23 13:28:02 +01:00
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
acd4412080 Create a dedicated tab to reset data 2019-01-23 13:28:01 +01:00
7005e55f36 Translated using Weblate (Norwegian Bokmål)
Currently translated at 85.7% (6 of 7 strings)
2019-01-23 09:34:53 +01:00
4119dac5b2 Translated using Weblate (English)
Currently translated at 97.1% (34 of 35 strings)
2019-01-23 09:34:53 +01:00
bfa267fc12 Translated using Weblate (Norwegian Bokmål)
Currently translated at 14.7% (65 of 442 strings)
2019-01-23 09:34:52 +01:00
356f0f46a4 Added translation using Weblate (Norwegian Bokmål) 2019-01-23 09:34:29 +01:00
61b7af80f0 Added translation using Weblate (Norwegian Bokmål) 2019-01-23 09:34:19 +01:00
683511c32a Added translation using Weblate (Norwegian Bokmål) 2019-01-23 09:33:37 +01:00
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
a8f4f7665c Merge pull request #3864 from wallabag/fix/database-init-version
Removed hardcoded database version
2019-01-23 09:04:54 +01:00
752e0491ce Translated using Weblate (Norwegian Bokmål)
Currently translated at 88.6% (31 of 35 strings)
2019-01-23 08:55:48 +01:00
b18a16951d Added translation using Weblate (Norwegian Bokmål) 2019-01-23 08:53:37 +01:00
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
8010425444 Fix third argument to Route 2019-01-22 20:42:25 +01:00
019e1acc49 Factorize sendResponse between Api controllers
And run newer cs fixer
2019-01-22 20:42:25 +01:00
9133bd02d1 [wallabag/wallabag#2611] Fix PHPCS lint errors 2019-01-22 20:42:25 +01:00
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
6113dbbc20 Removed hardcoded database version 2019-01-22 20:38:28 +01:00
3527c30021 Merge pull request #3526 from wallabag/add-random-article
Add random feature
2019-01-22 18:30:02 +01:00
fe5850d6e2 Update icon to casino 2019-01-22 17:05:21 +01:00
091bafeb4c Handle no random result found 2019-01-19 22:30:50 +01:00