Skip to content

Merge Tucana Release changes to Test #691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Parent: Merge RC changes into CI
wants to merge 3 commits into from
+7 −3
Closed

Merge Tucana Release changes to Test #691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fd1d3d5
TD-4256: Assessment and Case Resource - Allows to upload unsupported …
Swapnamol Oct 9, 2024
14ea3f8
Modified the script
Swapnamol Oct 9, 2024
990cb29
Merge pull request #639 from TechnologyEnhancedLearning/Develop/Fixes…
Swapnamol Oct 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/Scripts/vuesrc/helpers/fileUpload.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ const MAX_FILE_SIZE = 10 * 1000 * 1000 * 1000; // 10GB

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

const IMAGE_FILE_EXTENSIONS = ['.apng', '.avif', '.bmp', '.cur', '.gif', '.ico', '.jfif', '.jpeg', '.jpg', '.pjp',
'.pjpeg', '.png', '.psd', '.svg', '.tif', '.tiff', '.webp'];
Expand Down
3 changes: 2 additions & 1 deletion WebAPI/LearningHub.Nhs.Database/LearningHub.Nhs.Database.sqlproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,7 @@
<Build Include="Stored Procedures\Resources\GetAchievedCertificatedResourcesWithOptionalPagination.sql" />
<Build Include="Stored Procedures\Hierarchy\GetCatalogues.sql" />
<Build Include="Stored Procedures\Hierarchy\GetCataloguesCount.sql" />
<None Include="Scripts\Post-Deploy\Scripts\UpdateFileTypes.sql" />
</ItemGroup>
<ItemGroup>
<None Include="Scripts\Pre-Deploy\Scripts\Card5766_AuthorTableChanges.PreDeployment.sql" />
Expand Down Expand Up @@ -594,4 +595,4 @@
<ItemGroup>
<None Include="Scripts\Post-Deploy\Scripts\ElfhExternalSystemsImport.sql" />
</ItemGroup>
</Project>
</Project>
4 changes: 3 additions & 1 deletion WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Script.PostDeployment.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,6 @@ UPDATE [resources].[ResourceVersion] SET CertificateEnabled = 0 WHERE VersionSta
:r .\Scripts\InitialiseDataForEmailTemplates.sql
:r .\Scripts\TD-2929_ActivityStatusUpdates.sql
:r .\Scripts\InitialiseDataForEmailTemplates.sql
:r .\Scripts\AttributeData.sql
:r .\Scripts\AttributeData.sql
:r .\Scripts\UpdateFileTypes.sql

1 change: 1 addition & 0 deletions WebAPI/LearningHub.Nhs.Database/Scripts/Post-Deploy/Scripts/UpdateFileTypes.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
update resources.FileType set NotAllowed =1 where Extension='webm'
Loading