mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-09-23 12:00:06 +00:00
Code Issues Projects Releases Wiki Activity
6544 commits 10 branches 99 tags 156 MiB
Commit graph

313 commits

Author SHA1 Message Date
Jeremy Benoist
778543311f
Fix tests 2018-06-06 17:34:20 +02:00
Simounet
c15bb5ad72 Fix srcset attribute on images downloaded 2018-06-01 13:49:16 +02:00
Floran Brutel
08d6bedcaa
Allow login by email 2018-04-01 20:57:10 +02:00
Floran Brutel
80d4260a8e
Fix CS in UtilsTest.php 2018-03-31 12:55:27 +02:00
Floran Brutel
739a4024fa
Replace zataz url 2018-03-30 23:09:03 +02:00
Floran Brutel
3be96dcb17
Use https instead of http for bild.de to fix tests 2018-03-29 22:58:40 +02:00
Nicolas Lœuillet
5614df19cf Fixed tests 2018-01-12 11:19:11 +01:00
Kevin Decherf
b8568662bd php-cs 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2017-12-31 13:19:26 +01:00
Kevin Decherf
e0a862b626 Add test to prevent regression for #3534 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2017-12-31 00:56:40 +01:00
Jeremy Benoist
5661e8d42a
Fix countable in tests 2017-12-18 13:29:34 +01:00
Jeremy Benoist
4b6942d2d8
Add missing TestCase namespace 2017-12-18 13:29:33 +01:00
Jeremy Benoist
26e2f07419
Fix typo 2017-12-18 13:29:33 +01:00
Jeremy Benoist
bd91bd5c32
Use namespaced PHPUnit classes 2017-12-18 13:29:33 +01:00
Kevin Decherf
300f293cb1 Add test on EntryControllerTest for #3442 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2017-12-13 22:44:31 +01:00
Christophe VERGNE
a40a8038d3
Fix All RSS not accessible if not logged in + Tests 2017-12-11 16:04:06 +01:00
Jérémy Benoist
ceff312db8
Merge pull request #3401 from aaa2000/migration-initial 
Add an initial doctrine migration
 2017-11-25 12:28:41 +01:00
Jérémy Benoist
f818f64145
Merge pull request #3431 from wallabag/disable-site-credentials 
Disable controller access if feature disabled
 2017-11-22 15:11:25 +01:00
Jeremy Benoist
ef2b4041fb
Disable controller access if feature disabled 
If `restricted_access` is disabled, accessing `/site-credentials/` must be disabled.
 2017-11-22 10:00:45 +01:00
adev
2680b0bc8c Fix installation command 2017-11-21 21:35:17 +01:00
Nicolas Lœuillet
95b7d92ea5
Merge pull request #3425 from wallabag/add-setting-for-headers 
Added internal setting to enable/disable headers storage
 2017-11-21 13:26:24 +01:00
Jeremy Benoist
709e21a3f4
Define storeArticleHeaders false by default 
Fix tests which must use `$storeArticleHeaders`.
Fix CS
 2017-11-21 10:37:36 +01:00
Jeremy Benoist
64a5a6cfc5
CS 2017-11-21 10:30:35 +01:00
Nicolas Lœuillet
8a21985474 Added internal setting to enable/disable headers storage 2017-11-20 18:47:48 +01:00
Kevin Decherf
eae8138b33 Fix phpcs 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2017-11-19 15:26:13 +01:00
Kevin Decherf
97444566db Update EntryControllerTest to handle origin_url 
Set an origin_url in testEditUpdate
Test origin_url deletion in testEditRemoveOriginUrl

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2017-11-19 15:02:11 +01:00
Kevin Decherf
e50e45d6fa Twig: add removeSchemeAndWww filter 
This twig filter removes scheme (only http and https are supported) and
pass the result to removeWww filter to also remove 'www.' at the
beginning of an url.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2017-11-19 15:02:11 +01:00
adev
cc79712738 Fix phpcs 2017-11-11 23:55:13 +01:00
adev
d81bf605af Fix tests 2017-11-11 23:37:57 +01:00
Jeremy Benoist
f645d371ce
Fix MondeDiplo https url 2017-10-10 10:20:57 +02:00
Jeremy Benoist
f40c88eb1f
Jump to Symfony 3.3 & update others deps 
Also update tests urls
 2017-10-09 16:45:12 +02:00
Jeremy Benoist
33264c2d02
Fix tests 2017-09-06 22:49:16 +02:00
Jeremy Benoist
7c04b7396a
Multiple tag search was broken from API 
First, the setParameter() were done on the same parameter which in fact
just duplicated the condition in the SQL query (like `where t.label =
'test' and t.label = 'test'`.

Changed the parameter doesn't help because the query was then wrong.

Changing the way to match associated tags for an entry and it worked.
 2017-09-06 22:49:15 +02:00
Kevin Decherf
7036d91fe7 Tag: render tags case-insensitive by storing them in lowercase 
Fixes #2502

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2017-08-27 16:51:23 +02:00
Nicolas Hart
511f1ce1e8 Add reload entry command 2017-08-21 10:45:48 +02:00
Nicolas Hart
f7a4b44136 add search argument and limit option to list users command 2017-07-31 23:20:41 +02:00
Nicolas Hart
af31cfed76 Add list user command 2017-07-30 22:04:29 +02:00
Nicolas Hart
e1b33efb3d Better rendering for all core commands 2017-07-29 11:09:02 +02:00
Jeremy Benoist
c6c45673af
Put the final URL in data test 2017-07-24 11:13:53 +02:00
Jeremy Benoist
c18a2476b6
CS 2017-07-03 13:56:39 +02:00
Jeremy Benoist
d0ec2ddd23
Fix validateAndSetPreviewPicture 
Which wasn't covered by a test!
 2017-07-03 13:45:04 +02:00
Jeremy Benoist
a05b61159e
Fix PATCH method 
The PATCH method for the entry should only update what user sent to us and not the whole entry as it was before.
Also, sending tags when patching an entry will now remove all current tags & assocatied new ones.
 2017-07-03 13:45:04 +02:00
Jeremy Benoist
38520658ad
Fix tests 2017-07-03 07:30:54 +02:00
Jeremy Benoist
f808b01692
Add a real configuration for CS-Fixer 2017-07-01 09:52:38 +02:00
Jeremy Benoist
11b8695663
Fix tests 2017-06-21 11:44:35 +02:00
Jeremy Benoist
18c38dffc6
Add RSS tags feeds 2017-06-21 11:44:35 +02:00
Jérémy Benoist
80784b782b Merge pull request #2683 from wallabag/credentials-in-db 
Store credentials in DB
 2017-06-20 16:40:48 +02:00
Thomas Citharel
bead8b42da
Fix reviews 
Encrypt username too
Redirect to list after saving credentials
Fix typos

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-06-20 16:03:39 +02:00
Jeremy Benoist
906424c1b6
Crypt site credential password 2017-06-20 16:03:35 +02:00
Jeremy Benoist
9de9f1e5ce
Add a live test for restricted article 
It is not aimed to test if we can get the full article (since we aren't using real login/password)
but mostly to test the full work (with authentication, etc.)

Do not clean fixtured to avoid SQLite to re-use id for entry tag relation 😓
 2017-06-20 16:03:20 +02:00
Jeremy Benoist
b8427f22f0
Add menu access to site credentials CRUD 2017-06-20 16:03:14 +02:00
Thomas Citharel
41d45c6122 Fix empty language and preview pics 2017-06-12 16:46:33 +02:00
Jeremy Benoist
e8911f7c09
Add isPublic filter on entries 2017-06-10 15:00:52 +02:00
Jérémy Benoist
679aaf0836 Merge pull request #3173 from wallabag/domain-name-param 
remove craueconfig domain name setting and add a proper one in parame…
 2017-06-10 11:36:03 +02:00
Jeremy Benoist
1f7018e1fe
Cleanup test 
Looks like we didn't ALWAYS get a value for language from 20minutes.
Ahem.
 2017-06-09 11:52:41 +02:00
Jeremy Benoist
80e49ba7b0
Convert - to _ in language 
Mostly to increase language supports
 2017-06-09 11:42:09 +02:00
Jeremy Benoist
42f3bb2c63
Use Locale instead of Language 2017-06-09 11:28:04 +02:00
Jeremy Benoist
1a94252831
Promote https 2017-06-09 10:07:27 +02:00
Jeremy Benoist
0d349ea670
Validate language & preview picture fields 
Instead of saving the value of each field right into the content without any validation, it seems better to validate them.
This might sounds obvious now we say that.
 2017-06-08 21:51:46 +02:00
Jeremy Benoist
80f4d85ac9
Review 2017-06-08 19:15:33 +02:00
Jeremy Benoist
eb570e49c8
CS 2017-06-07 23:31:14 +02:00
Jérémy Benoist
4e4a5b534f Merge pull request #3184 from wallabag/better-way-image-extension 
Use an alternative way to detect images
 2017-06-07 13:41:25 +02:00
Jeremy Benoist
577c0b6dd8
Use an alternative way to detect image 
When parsing content to retrieve images to save locally, we only check for the content-type of the image response.
In some case, that value is empty.
Now we’re also checking for the first few bytes of the content as an alternative to detect if it’s an image wallabag can handle.
We might get higher image supports using that alternative method.
 2017-06-05 22:54:02 +02:00
Thomas Citharel
0d8ecb82a3 Fix review 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-06-04 17:57:40 +02:00
Thomas Citharel
d143fa243d Add show user command 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-06-02 16:53:03 +02:00
Jérémy Benoist
a687c8d915 Merge pull request #2708 from jcharaoui/import-disablecontentupdate 
Import disableContentUpdate
 2017-06-02 11:26:37 +02:00
Jeremy Benoist
fcad69a427
Replace images with & 
Images with `&` in the path weren’t well replaced because they might be with `&amp;` in the html instead.

Replacing `&` with `&amp;` fix the problem.
 2017-06-01 22:50:33 +02:00
Jeremy Benoist
6acadf8e98
Rewrote code & fix tests 2017-06-01 11:31:45 +02:00
Jeremy Benoist
d5c2cc54b5
Fix tests 2017-06-01 09:49:15 +02:00
Jerome Charaoui
d0e9b3d640
Add disableContentUpdate import option 
This commit also decouples the "import" and "update" functions inside
ContentProxy. If a content array is available, it must be passed to the
new importEntry method.
 2017-06-01 09:48:14 +02:00
Jerome Charaoui
7aba665e48
Avoid returning objects passed by reference. 
Objects are always passed by reference, so it doesn't make sense to
return an object which is passed by reference as it will always be the
same object. This change makes the code a bit more readable.
 2017-06-01 09:43:01 +02:00
Jérémy Benoist
2a0eec07a5 Merge pull request #3137 from aaa2000/isolated-tests 
Isolated tests
 2017-06-01 07:58:17 +02:00
adev
7ab5eb9508 Isolated tests 
Use https://github.com/dmaicher/doctrine-test-bundle to have test isolation.
 2017-05-31 16:03:54 +02:00
Jeremy Benoist
695af58857
Fix tests following rebase 2017-05-31 14:00:15 +02:00
Jeremy Benoist
38a04dee34
CS 2017-05-31 14:00:15 +02:00
Jeremy Benoist
f0378b4d7c
Forced date can now be a timestamp too 
Add adding more tests for forced content
 2017-05-31 14:00:15 +02:00
Jeremy Benoist
0d6cfb884c
Remove htmlawed and use graby instead 
Instead of using htmlawed (which is already used in graby) use graby directly (which require some refacto on graby side).
Still needs some tests.
 2017-05-31 14:00:15 +02:00
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
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
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
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
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
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
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
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
Jeremy Benoist
1b1647175d
Add some tests 2017-05-09 12:12:23 +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
Bertrand Dunogier
662db41bae Changed parsing of login_extra_fields in guzzle auth 2017-05-04 21:45:06 +02:00
Nicolas Lœuillet
a162b1a99b
Changed export test 2017-05-03 10:53:10 +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
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
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
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
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
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
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
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
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
5a619812ca
Merge remote-tracking branch 'origin/master' into 2.2 2016-11-03 16:41:29 +01:00