Skip to content

Commit 5672130

Browse files
authored
Merge pull request #692 from TechnologyEnhancedLearning/MergeRctoTucana1
Merge rcto tucana1
2 parents ba725bb + c8882f4 commit 5672130

File tree

4 files changed

+6
-2
lines changed

4 files changed

+6
-2
lines changed

LearningHub.Nhs.WebUI/Scripts/vuesrc/helpers/fileUpload.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ const MAX_FILE_SIZE = 10 * 1000 * 1000 * 1000; // 10GB
4949

5050
// This list should correspond to the disallowed extensions contained in the FileType table
5151
const BLOCKED_FILE_EXTENSIONS = ['.app', '.asp', '.aspx', '.dll', '.dmg', '.exe', '.flv', '.f4v', '.js', '.jsp',
52-
'.php', '.shtm', '.shtml', '.swf'];
52+
'.php', '.shtm', '.shtml', '.swf','.webm'];
5353

5454
const IMAGE_FILE_EXTENSIONS = ['.apng', '.avif', '.bmp', '.cur', '.gif', '.ico', '.jfif', '.jpeg', '.jpg', '.pjp',
5555
'.pjpeg', '.png', '.psd', '.svg', '.tif', '.tiff', '.webp'];

WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,7 @@
533533
<Build Include="Stored Procedures\Resources\GetScormContentServerDetailsForLHExternalReference.sql" />
534534
<Build Include="Tables\Resource\ScormResourceReferenceEvent.sql" />
535535
<Build Include="Tables\Resource\ScormResourceReferenceEventType.sql" />
536+
<None Include="Scripts\Post-Deploy\Scripts\UpdateFileTypes.sql" />
536537
</ItemGroup>
537538
<ItemGroup>
538539
<None Include="Scripts\Pre-Deploy\Scripts\Card5766_AuthorTableChanges.PreDeployment.sql" />

WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Script.PostDeployment.sql

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,6 @@ UPDATE [resources].[ResourceVersion] SET CertificateEnabled = 0 WHERE VersionSta
8282
:r .\Scripts\TD-2929_ActivityStatusUpdates.sql
8383
:r .\Scripts\InitialiseDataForEmailTemplates.sql
8484
:r .\Scripts\AttributeData.sql
85-
:r .\Scripts\PPSXFileType.sql
85+
:r .\Scripts\PPSXFileType.sql
86+
:r .\Scripts\UpdateFileTypes.sql
87+
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
update resources.FileType set NotAllowed =1 where Extension='webm'

0 commit comments

Comments
 (0)