Skip to content

Commit 0927f95

Browse files
authored
Merge pull request #51 from experius/feature/NEND-1247
Bugfixes
2 parents 7088590 + d94a756 commit 0927f95

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

Helper/Settings.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ public function getImageFiletypes()
101101
'jpeg',
102102
'png',
103103
'gif',
104-
'webp',
105104
'bmp',
106105
'xpm',
107106
'xbm',
@@ -131,7 +130,6 @@ public function getExtraFiletypes()
131130
'jpeg',
132131
'png',
133132
'gif',
134-
'webp',
135133
'svg',
136134
'pdf',
137135
'doc',
@@ -149,7 +147,6 @@ public function getExtraFiletypes()
149147
'mp3',
150148
'mp4',
151149
'ogg',
152-
'webm',
153150
'bmp'
154151
];
155152

composer.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
{
1212
"name": "Boris van Katwijk",
1313
"email": "[email protected]"
14+
},
15+
{
16+
"name": "Matthijs Iriks",
17+
"email": "[email protected]"
1418
}
1519
],
1620
"minimum-stability": "dev",

etc/adminhtml/di.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
<item name="mp4" xsi:type="string">video/mp4</item>
3131
<item name="ogg" xsi:type="string">video/ogg</item>
3232
<item name="webm" xsi:type="string">video/webm</item>
33+
<item name="ics" xsi:type="string">text/calendar</item>
3334
</item>
3435
<item name="image_allowed" xsi:type="array">
3536
<item name="jpg" xsi:type="string">image/jpg</item>
@@ -98,6 +99,7 @@
9899
<item name="png" xsi:type="string">png</item>
99100
<item name="pdf" xsi:type="string">pdf</item>
100101
<item name="svg" xsi:type="string">svg</item>
102+
<item name="ics" xsi:type="string">ics</item>
101103
</argument>
102104
</arguments>
103105
</type>
@@ -110,6 +112,7 @@
110112
<item name="png" xsi:type="string">png</item>
111113
<item name="pdf" xsi:type="string">pdf</item>
112114
<item name="svg" xsi:type="string">svg</item>
115+
<item name="ics" xsi:type="string">ics</item>
113116
</argument>
114117
</arguments>
115118
</type>

etc/module.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
<module name="Magento_Cms"/>
66
<module name="Magento_Config"/>
77
<module name="Magento_Store"/>
8-
<module name="MediaGalleryUi"/>
9-
<module name="MediaGalleryIntegration"/>
10-
<module name="MediaGallerySyncroization"/>
8+
<module name="Magento_MediaGalleryUi"/>
9+
<module name="Magento_MediaGalleryIntegration"/>
10+
<module name="Magento_MediaGallerySyncroization"/>
1111
</sequence>
1212
</module>
1313
</config>

0 commit comments

Comments
 (0)