mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-27 03:21:01 +00:00
Code Issues Projects Releases Wiki Activity
4280 commits 12 branches 100 tags 170 MiB
Commit graph

352 commits

Author SHA1 Message Date
Jeremy Benoist
74a75f7d43
Use graby ContentExtractor to clean html 
It might be better to re-use some graby functionalities to clean html instead of building a new system.
 2017-05-31 14:00:15 +02:00
Jeremy Benoist
fb436e8ca0
Add support for authors 2017-05-31 13:59:45 +02:00
Jeremy Benoist
e668a8124c
Allow other fields to be send using API 
Entry API can now have these new fields:
- content
- language
- preview_picture
- published_at

Re-use the ContentProxy to be able to do the same using the web UI (in the future).
htmLawed is used to clean stuff from content, I hope it’ll be enough to avoid security breach.

Lower content validation when we want to update an entry with content already defined. Before, language & content_type were required. If there weren’t provided, we re-fetched the content using graby. I think these fields aren’t required for an entry to be created. So I removed them.
Which means some import from the v1 export won’t be re-fetched since they provide content, url & title.

Also, remove liberation link from Readability import to avoid overlaping import (from wallabag v1, which had the same link)
 2017-05-31 13:59:45 +02:00
Nicolas Lœuillet
4423b88c5b Merge pull request #3168 from wallabag/instapaper-tags-import 
Add support for tag in Instapaper import
 2017-05-31 12:32:09 +02:00
Nicolas Lœuillet
d61fd8be4f Merge pull request #3138 from Kdecherf/2835-tags 
Ignore ActionMarkAsRead when removing tag from entry
 2017-05-31 11:48:42 +02:00
Nicolas Lœuillet
3f8578ded3 Merge pull request #3161 from wallabag/scrutinizer-2.3 
Fix some Scrutinizer issues
 2017-05-31 11:46:41 +02:00
Jeremy Benoist
31485bddb9
Ensure retrieved data are fresh 2017-05-31 11:11:02 +02:00
Jeremy Benoist
bad7df8c00
CS & improve tags assertions 2017-05-31 10:38:15 +02:00
Jeremy Benoist
7a8ed3cee1
Add support for tag in Instapaper import 2017-05-31 10:38:00 +02:00
Nicolas Lœuillet
7aa5607f29 Merge pull request #3143 from wallabag/fix-wllbg2-import 
Fixed is_starred for wallabag v2 import
 2017-05-31 09:08:34 +02:00
Kevin Decherf
5dbf3f2326 TagController: ignore ActionMarkAsRead when removing tag from entry 
Fixes #2835

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2017-05-31 00:36:46 +02:00
Jeremy Benoist
047fdc767a
Add tests 2017-05-30 20:27:44 +02:00
Jérémy Benoist
2150576d86 Merge pull request #3065 from wallabag/api-creation-endpoint 
Register through API
 2017-05-30 15:26:11 +02:00
Jeremy Benoist
26650fdbf8
Use a better way to set input for command 
Actually use the correct to way handle that

http://symfony.com/doc/current/components/console/helpers/questionhelper.html#testing-a-command-that-expects-input
 2017-05-30 12:47:28 +02:00
Jeremy Benoist
d181bd7285
Merge remote-tracking branch 'origin/master' into 2.3 2017-05-30 09:59:06 +02:00
Jeremy Benoist
fe6461e4aa
Avoid side effect on other tests 2017-05-30 09:57:57 +02:00
Jeremy Benoist
d069bff4f6
Remove unknown validation_groups 
The Profile validation_groups does not exist and then for validation to be skipped (like password length)
 2017-05-30 08:04:11 +02:00
Jeremy Benoist
5709ecb368
Re-use NewUserType to validate registration 
The only ugly things is how we handle error by generating the view and then parse the content to retrieve all errors…

Fix exposition fields in User entity
 2017-05-30 07:56:01 +02:00
Thomas Citharel
de8d2a9005 CS 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-05-28 12:59:48 +02:00
Thomas Citharel
6bc6fb1f60 Move Tags assigner to a separate file 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-05-27 22:08:14 +02:00
Damien Cassou
ac1509a66b
Fix documentation URL for "How can I help to fix that?" 2017-05-24 12:57:46 +02:00
Jeremy Benoist
216dee4d8a
Fix SO tests 
SO switched to http yesterday
 2017-05-24 12:13:25 +02:00
Jeremy Benoist
be085c3d18
Ensure download_images_enabled is disabled 
Even if the tests fail, that config must stay disabled after the test.
Otherwise it might timeout on other test (because it'll try to save all other images)
 2017-05-19 13:10:46 +02:00
Jeremy Benoist
4ab0d25f65
Merge remote-tracking branch 'origin/master' into 2.3 2017-05-19 11:25:19 +02:00
Nicolas Lœuillet
a1146b6551
Added tests on logs records 2017-05-12 15:01:18 +02:00
Nicolas Lœuillet
3554364bed
Fixed tests 2017-05-12 13:47:53 +02:00
Nicolas Lœuillet
1517d5772d Replaced json_array with array 
And fixed failing test due to @j0k3r :trollface:
 2017-05-11 14:59:53 +02:00
Nicolas Lœuillet
dda6a6addc
Added headers field in Entry 2017-05-11 14:18:21 +02:00
Jérémy Benoist
09edbff336 Merge pull request #3101 from wallabag/credentials-new-extrafields 
Skip auth when no credentials are found
 2017-05-10 10:58:19 +02:00
Thomas Citharel
91ba9a5975 Merge pull request #3095 from aaa2000/api-error-on-fail-fetch-content 
Create a new entry via API even when its content can't be retrieved
 2017-05-10 09:38:55 +02:00
adev
a9357a8311 Remove the created entry to avoid side effects on other tests 2017-05-09 23:19:24 +02:00
Jeremy Benoist
1594a79fc5
Retrieve tag / tags value from query or request 
It allows to request to delete a tag using query string instead of body parameter (which seems to be the standard).
Instead of breaking the previous behavior, I used a generic way to retrieve parameter (which looks into request attributes, query parameters and request parameters)
 2017-05-09 23:15:25 +02:00
Jeremy Benoist
94b232bbb8
Skip auth when no credentials are found 
If we can’t find a credential for the current host, even if it required login, we won’t add them and website will be fetched without any login.
 2017-05-09 22:53:42 +02:00
Jérémy Benoist
0eb8220204 Merge pull request #2751 from bdunogier/2.2-guzzle_subscribers_improvement 
Improved Guzzle subscribers extensibility
 2017-05-09 17:10:03 +02:00
Nicolas Lœuillet
a2ae05a61c Merge pull request #3076 from wallabag/hotfix/2979 
Disable negative numbers in filters
 2017-05-09 13:56:44 +02:00
Jeremy Benoist
54c2d164a3
Merge remote-tracking branch 'origin/master' into 2.3 2017-05-09 13:55:31 +02:00
Jeremy Benoist
1b1647175d
Add some tests 2017-05-09 12:12:23 +02:00
adev
b60a666df2 Fix API pagination is broken if perPage is custom value 
Fix #2720
 2017-05-08 16:27:16 +02:00
adev
08f29ae7b6 Create a new entry via API even when its content can't be retrieved 
Fix #2988
 2017-05-08 14:57:25 +02:00
Jérémy Benoist
43f81a62e9 Merge pull request #3088 from wallabag/execute-migrations-after-install 
Added migrations execution after fresh install
 2017-05-05 17:42:42 +02:00
Jérémy Benoist
ab742ee9c6 Merge pull request #2920 from wallabag/cleanduplicatescommand 
Clean Duplicates Command
 2017-05-05 17:42:18 +02:00
Nicolas Lœuillet
4eeb29ff78
Fixed test 2017-05-05 15:20:58 +02:00
Nicolas Lœuillet
7d2d1d6859
Added migrations execution after fresh install 2017-05-05 15:14:58 +02:00
Nicolas Lœuillet
89f108b45a
Fixed @j0k3r review 2017-05-05 14:54:03 +02:00
Nicolas Lœuillet
d09fe4d233
Added test for deduplication 2017-05-05 14:33:36 +02:00
Nicolas Lœuillet
6980304968 Merge pull request #3053 from wallabag/api-bulk-add 
Added API endpoint to handle a list of URL
 2017-05-05 13:56:34 +02:00
Jeremy Benoist
72db15ca5d
Little refacto and send 400 on reaching urls limit 2017-05-05 12:05:50 +02:00
Bertrand Dunogier
662db41bae Changed parsing of login_extra_fields in guzzle auth 2017-05-04 21:45:06 +02:00
Nicolas Lœuillet
cebed9c01f Merge pull request #3080 from wallabag/use-username-to-import 
Use username to import
 2017-05-04 15:19:16 +02:00
Thomas Citharel
d1e5059ea0 Use username to import 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>

add docs

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

use username as default

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

rename user to username

typo

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-05-04 14:41:42 +02:00
Thomas Citharel
6b76ae3d1f Merge pull request #3060 from wallabag/search-users 
Search & paginate users
 2017-05-04 14:35:14 +02:00
Nicolas Lœuillet
9c09c253fe Merge pull request #3047 from wallabag/add-notmatches-operator 
Added notmatches operator for tagging rule
 2017-05-03 11:53:01 +02:00
Nicolas Lœuillet
a162b1a99b
Changed export test 2017-05-03 10:53:10 +02:00
Thomas Citharel
d01dc5a81e rename index to list 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-05-02 15:28:39 +02:00
Thomas Citharel
a2daa32d0c Fix tests 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-05-02 15:28:39 +02:00
Thomas Citharel
3d57d625f8 Add basic tests 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-05-01 13:04:31 +02:00
Nicolas Lœuillet
efd351c98f Added limit 2017-05-01 09:26:12 +02:00
Jeremy Benoist
7fa844a349 Fix tests (for real this time) 2017-05-01 09:26:12 +02:00
Jeremy Benoist
719ba257d3 Fix tests 2017-05-01 09:26:12 +02:00
Nicolas Lœuillet
a7abcc7b7a Splitted the endpoint in two 2017-05-01 09:26:12 +02:00
Nicolas Lœuillet
1eca7831a6 Added API endpoint to handle a list of URL 
By passing an array, you can add / delete URL in mass (bulk request)
 2017-05-01 09:25:34 +02:00
Jeremy Benoist
dcbebc17aa
Fix tests 2017-04-29 12:58:39 +02:00
Nicolas Lœuillet
80299ed282
Added endpoint to handle URL list to add/delete tags 2017-04-24 12:24:17 +02:00
Nicolas Lœuillet
d1fc590211
Added API endpoint to handle a list of URL and to add/delete tags 2017-04-24 11:12:41 +02:00
Nicolas Lœuillet
fdd725f58c Added notmatches operator for tagging rule 2017-04-20 15:17:02 +02:00
Nicolas Lœuillet
e9c80c99bd
Added test for multiple authors 2017-04-10 17:58:27 +02:00
Nicolas Lœuillet
7b0b3622ab Added author of article 2017-04-09 15:24:51 +02:00
Nicolas Lœuillet
5e9009ce86 Added publication date 2017-04-05 22:22:52 +02:00
Nicolas Lœuillet
73f28afb19
Renamed countAllEntriesByUsername method 2017-03-31 10:46:47 +02:00
Thomas Citharel
6da1aebc94 Allow to remove all archived entries 
Since we still support fucking SQLite, we need to retrieve all tags & annotations for archived entries before deleting them.

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-03-31 10:46:05 +02:00
Jérémy Benoist
fa884b30ba Merge pull request #3021 from wallabag/rename-method 
Rename method
 2017-03-30 16:40:18 +02:00
Thomas Citharel
273b6f0658 Rename method from *username to *user 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-03-30 16:07:48 +02:00
Jeremy Benoist
7d1d961267
Merge remote-tracking branch 'origin/master' into 2.3 2017-03-28 14:07:42 +02:00
Thomas Citharel
ca9a83ee51 return id of article instead of true if entry exists 2017-02-24 11:31:31 +01:00
Nicolas Lœuillet
b45b6b6707
Import: we now skip messages when user is null 2017-02-20 09:16:02 +01:00
Kevin Decherf
eac09b48b0 Search by term: extend to entries url 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2017-02-16 21:47:52 +01:00
Thomas Citharel
3b0380f049 Fix phpcs and tests 2017-01-24 20:42:02 +01:00
Thomas Citharel
a607b7a9c0 add filepath test 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-01-22 13:19:46 +01:00
Thomas Citharel
8303b037fb add cli export 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-01-22 12:51:14 +01:00
Jeremy Benoist
72e634b06c
Fix registration.submit test 2017-01-10 18:50:45 +01:00
Jeremy Benoist
3d71d40349
Avoid false preview image 
If the website doesn't provide an og_image, the value will be false and so it'll be saved like that in the database.
We prefer to leave it as null instead of false.
 2017-01-10 17:42:36 +01:00
Nicolas Lœuillet
8527238846 Merge pull request #2702 from wallabag/add-index-uuid 
Added index on entry.uuid
 2016-12-29 10:54:07 +01:00
Nicolas Lœuillet
7239082a5e
Renamed uuid to uid 2016-12-29 10:09:44 +01:00
Nicolas Lœuillet
c8de7ab94c
Fixed export by tags with a tag which contains space 2016-12-27 21:26:53 +01:00
Nicolas Lœuillet
89cd670abf Changed uuid type in database 2016-12-25 10:51:25 +01:00
Nicolas Lœuillet
8137515171 Fixed index on entry.uuid and changed uuid field type 2016-12-25 10:51:25 +01:00
Jeremy Benoist
24879db1f7
Add default value for list_mode 2016-12-12 17:41:03 +01:00
Nicolas Lœuillet
558d5199b9 Merge pull request #2680 from wallabag/taggingrule-255 
Limit rule to 255
 2016-12-06 21:00:24 +01:00
Jerome Charaoui
a2c1b94e82 Revert switch to KernelTestCase for ContentProxyTest 
Define the error string manually inside the test class instead of
fetching it from app config.
 2016-12-03 09:50:36 -05:00
Jeremy Benoist
5aa0294cca
Limit rule to 255 
To avoid database error
 2016-12-03 11:10:39 +01:00
Jerome Charaoui
cd82ace70a Add missing CoreKernelTestCase class 2016-12-03 00:26:57 -05:00
Jerome Charaoui
dba1e0b188 Fix WallabagV1Controller test 
Account for URL redirection in refreshed entry.
 2016-12-03 00:14:06 -05:00
Jerome Charaoui
fc2b7bda53 Fix ContentProxy tests 2016-12-03 00:14:06 -05:00
Nicolas Lœuillet
56a7ce17f3 Hide article text on mobile with list mode 2016-11-28 14:27:58 +01:00
Nicolas Lœuillet
8f3ff39ca3 Added test for list view 2016-11-28 14:27:58 +01:00
Nicolas Lœuillet
34ea7be622 Merge pull request #2663 from wallabag/remove-fosuser-attributes 
Removed FOSUser attributes removed in alpha4
 2016-11-28 14:27:31 +01:00
Nicolas Lœuillet
cda0662311
Removed FOSUser attributes removed in alpha4 
See https://github.com/FriendsOfSymfony/FOSUserBundle/blob/master/Upgrade.md\#200-alpha3-to-200-alpha4
 2016-11-28 12:44:17 +01:00
Nicolas Lœuillet
6bb0866cf5 Merge pull request #2659 from akovalyov/bugfix/non-latin-characters-in-reading-time-calculation 
Fix incorrect reading time calculation for entries in non-latin languages.
 2016-11-28 09:23:04 +01:00
Andrew Kovalyov
5b6888b13f Fix incorrect reading time calculation for entries in languages with 
non-latin chars subset.
 2016-11-28 01:15:06 +02:00
Kevin Decherf
00fc2b44f4 Enforce lowercase on domain name filter 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2016-11-26 19:52:50 +01:00
Jeremy Benoist
5066c3e066
Re-use FOSUser master branch 2016-11-22 21:25:05 +01:00
Bertrand Dunogier
7aab0ecf2f Added authentication for restricted access articles 
Fix #438. Thank you so much @bdunogier
 2016-11-22 14:01:46 +01:00
Jeremy Benoist
5cd0857e3c
Return 304 when content isn't reloaded using the API 
Previously it was a 400 but this is more related to a real error.
Using the API user should only know the content got reloaded or not.
If reloaded: 200 otherwise: 304.
 2016-11-22 10:45:19 +01:00
Jeremy Benoist
56da73969a
Return an explicit error if reload fail 2016-11-20 16:25:13 +01:00
Jeremy Benoist
70584b42aa
Fixing tests 2016-11-20 15:15:13 +01:00
Jeremy Benoist
0a6f4568b5
Add ability to reload entry from API 2016-11-20 13:08:41 +01:00
Jeremy Benoist
edd2472faa
Fix tests 2016-11-20 09:39:26 +01:00
Jeremy Benoist
8670250a26
Add RSS pagination 
Following https://tools.ietf.org/html/rfc5005#page-4
 2016-11-20 09:39:26 +01:00
Nicolas Lœuillet
995c204428 Added shortcut 2016-11-19 20:05:16 +01:00
Nicolas Lœuillet
32f455c131 Added tests 2016-11-19 20:05:16 +01:00
Jeremy Benoist
68003139e1
Merge remote-tracking branch 'origin/master' into 2.2 
# Conflicts:
#	.editorconfig
#	docs/de/index.rst
#	docs/de/user/import.rst
#	docs/en/index.rst
#	docs/en/user/configuration.rst
#	docs/en/user/import.rst
#	docs/fr/index.rst
#	docs/fr/user/import.rst
#	src/Wallabag/CoreBundle/Command/InstallCommand.php
#	src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
#	src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
#	web/bundles/wallabagcore/themes/baggy/css/style.min.css
#	web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
#	web/bundles/wallabagcore/themes/material/css/style.min.css
#	web/bundles/wallabagcore/themes/material/js/material.min.js
 2016-11-19 15:30:49 +01:00
Nicolas Lœuillet
d215273c65
Check if status code is OK 2016-11-18 23:05:02 +01:00
Nicolas Lœuillet
10b3509757
Added http_status in Entry entity 2016-11-18 15:09:21 +01:00
Jeremy Benoist
5cc367b83a
Fix tests 2016-11-17 19:58:10 +01:00
Jeremy Benoist
d8a35aba49
Put log in the most common failure tests 
So we’ll quickly be able to see what kind of test is failing when viewing Travis
 2016-11-17 19:30:50 +01:00
Nicolas Lœuillet
540a9bc4a2 Added help on config screen 2016-11-17 09:22:39 +01:00
Jeremy Benoist
e6b133c60c
CS 2016-11-16 23:10:01 +01:00
Jeremy Benoist
00bf45b6f2
Update unit test for Redirect 2016-11-16 23:07:34 +01:00
Nicolas Lœuillet
54fd55fda1
Tried to fix tests 2016-11-16 23:07:34 +01:00
Nicolas Lœuillet
65cd8a4a9a
Added tests 2016-11-16 23:07:34 +01:00
Nicolas Lœuillet
a42f38d9fb
Added a configuration to define the redirection after archiving an entry 
Fix #496
 2016-11-16 23:07:34 +01:00
Jeremy Benoist
94060509b8
Use more explicit check 2016-11-07 08:36:52 +01:00
Jeremy Benoist
e92fbdc852
Fix tests 2016-11-06 09:58:07 +01:00
Jeremy Benoist
9ab024b4f5
Add Pinboard import 2016-11-04 22:44:31 +01:00
Jeremy Benoist
5a619812ca
Merge remote-tracking branch 'origin/master' into 2.2 2016-11-03 16:41:29 +01:00
Jeremy Benoist
7816eb622d
Add entry.saved event to import & rest 2016-11-02 07:10:23 +01:00
Jeremy Benoist
e0597476d1
Use custom event instead of Doctrine ones 
This give us ability to use Entry ID to determine where to store images and it’s then more easy to remove them when we remove the entry.
 2016-11-01 14:49:02 +01:00
Jeremy Benoist
d1495dd0a4
Ability to enable/disable downloading images 
This will speed up the test suite because it won’t download everything when we add new entry…
Add a custom test with downloading image enabled
 2016-10-30 21:30:45 +01:00
Jeremy Benoist
e1632cea0e
Fix tests 2016-10-30 20:43:37 +01:00
Jeremy Benoist
41ada277f0
Add instance url to the downloaded images 2016-10-30 19:50:00 +01:00
Jeremy Benoist
48656e0eaa
Fixing tests 2016-10-30 11:27:09 +01:00
Jeremy Benoist
7f55941856
Use doctrine event to download images 2016-10-30 10:48:29 +01:00
Nicolas Lœuillet
794ac861cb
Added test for export by filtering with tag 2016-10-29 14:03:55 +02:00
Nicolas Lœuillet
900c844861
Exploded WallabagRestController into many controllers 
Fix #2503
 2016-10-28 14:46:30 +02:00
Nicolas Lœuillet
f24ea59ea4
Fixed migration and added tests 2016-10-28 10:55:39 +02:00
Jeremy Benoist
64a8781e45
Merge remote-tracking branch 'origin/master' into 2.2 2016-10-24 12:03:17 +02:00
Jeremy Benoist
9313ea9d44 Merge pull request #2401 from wallabag/reset-account 
Reset account
 2016-10-24 11:57:51 +02:00
Jeremy Benoist
206bade58a
Add ability to reset some datas 
- annotations
- tags
- entries
 2016-10-22 13:13:06 +02:00
Jeremy Benoist
aa4741091f
Add test on /api/annotations 
Fix controller forward in WallabagRestController.
Update PHPDoc so it is sorted the same way as others one
Duplicate all annotations test to use both api & normal way
Also, make annotation tests independent to each other
 2016-10-22 12:09:20 +02:00
Nicolas Lœuillet
e5edb6e127
PHP CS 2016-10-22 09:06:07 +02:00
Thomas Citharel
0c271b9eb0
fix cs and phpdoc 2016-10-22 09:06:07 +02:00
Nicolas Lœuillet
f99ddbc6f8 Merge pull request #2481 from wallabag/some-fixes 
Some fixes
 2016-10-21 15:15:41 +02:00
Jeremy Benoist
f6798f69c3
This test doesn’t require an internet connection 2016-10-20 23:26:16 +02:00
Jeremy Benoist
9095497191
Fix test 2016-10-20 23:03:37 +02:00
Jeremy Benoist
2297d60f10
If reload content failed, don’t update it 
In case user wants a fresh version of the current one and the website isn’t available, don’t erase it with a boring message saying wallabag wasn’t able to refresh the content.
 2016-10-20 22:49:46 +02:00
Jeremy Benoist
b1b561da51 Merge pull request #2372 from pmartin/api-get-entry-as-epub 
API: ability to export entry in all available format (epub, pdf, etc...)
 2016-10-12 14:06:33 +02:00
Jeremy Benoist
e4cf672ccf
Merge remote-tracking branch 'origin/master' into 2.2 2016-10-11 21:01:30 +02:00
Jeremy Benoist
a0a4ce3135
Lock deps for FOSUser 
We’ll wait until the final release will be out and other related project will be update to support it.
Meanwhile we can safely lock to a previous version.
 2016-10-11 18:59:08 +02:00
Jeremy Benoist
e40bed3607
Avoid error when Redis isn't here in tests 2016-10-10 16:34:57 +02:00
Jeremy Benoist
876d77a67d
Better display and description 
Confirmation message isn’t required since it is written in the delete description
 2016-10-08 20:25:42 +02:00