mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-05-01 06:04:43 +00:00
Code Issues Projects Releases Wiki Activity
5367 commits 14 branches 102 tags 210 MiB
Commit graph

5367 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Weblate
b97123c39f
Merge branch 'origin/master' into Weblate. 2019-01-28 11:34:42 +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
Allan Nordhøy
78e24f8954
Translated using Weblate (Norwegian Bokmål) 
Currently translated at 85.7% (6 of 7 strings)
 2019-01-27 16:06:14 +01:00
Allan Nordhøy
1e4dd73b07
Translated using Weblate (Norwegian Bokmål) 
Currently translated at 100.0% (6 of 6 strings)
 2019-01-24 12:06:33 +01:00
Allan Nordhøy
606ab37b6a
Translated using Weblate (English) 
Currently translated at 100.0% (6 of 6 strings)
 2019-01-24 12:06:32 +01:00
Allan Nordhøy
5bd456eda7
Translated using Weblate (Norwegian Bokmål) 
Currently translated at 87.5% (35 of 40 strings)
 2019-01-24 12:06:31 +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
Allan Nordhøy
7005e55f36
Translated using Weblate (Norwegian Bokmål) 
Currently translated at 85.7% (6 of 7 strings)
 2019-01-23 09:34:53 +01:00
Allan Nordhøy
4119dac5b2
Translated using Weblate (English) 
Currently translated at 97.1% (34 of 35 strings)
 2019-01-23 09:34:53 +01:00
Allan Nordhøy
bfa267fc12
Translated using Weblate (Norwegian Bokmål) 
Currently translated at 14.7% (65 of 442 strings)
 2019-01-23 09:34:52 +01:00
Weblate
356f0f46a4 Added translation using Weblate (Norwegian Bokmål) 2019-01-23 09:34:29 +01:00
Weblate
61b7af80f0 Added translation using Weblate (Norwegian Bokmål) 2019-01-23 09:34:19 +01:00
Weblate
683511c32a Added translation using Weblate (Norwegian Bokmål) 2019-01-23 09:33:37 +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
Allan Nordhøy
752e0491ce
Translated using Weblate (Norwegian Bokmål) 
Currently translated at 88.6% (31 of 35 strings)
 2019-01-23 08:55:48 +01:00
Allan Nordhøy
b18a16951d Added translation using Weblate (Norwegian Bokmål) 2019-01-23 08:53:37 +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