Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
722f819
Bump @babel/core in /AdminUI/LearningHub.Nhs.AdminUI
dependabot[bot] Feb 10, 2025
66a9385
Bump @babel/preset-env in /AdminUI/LearningHub.Nhs.AdminUI
dependabot[bot] Feb 10, 2025
e29e3cf
Bump @babel/core from 7.26.7 to 7.26.8 in /LearningHub.Nhs.WebUI
dependabot[bot] Feb 10, 2025
f61cb18
Bump @babel/preset-env from 7.26.7 to 7.26.8 in /LearningHub.Nhs.WebUI
dependabot[bot] Feb 10, 2025
dda899a
Update continuous-integration-workflow.yml
binon Feb 10, 2025
d8355d0
Update continuous-integration-workflow.yml
binon Feb 10, 2025
b488736
Update continuous-integration-workflow.yml
binon Feb 10, 2025
2834aca
Update continuous-integration-workflow.yml
binon Feb 10, 2025
54f0c9d
Merge pull request #969 from TechnologyEnhancedLearning/dependabot/np…
binon Feb 10, 2025
07b51a8
Merge pull request #971 from TechnologyEnhancedLearning/dependabot/np…
binon Feb 10, 2025
5237fc1
Merge branch 'Automatic_version_update_dependabot' into dependabot/np…
binon Feb 10, 2025
7b9e694
Merge branch 'Automatic_version_update_dependabot' into dependabot/np…
binon Feb 10, 2025
9d2b4c7
Merge pull request #972 from TechnologyEnhancedLearning/dependabot/np…
binon Feb 11, 2025
4db55ae
Merge pull request #970 from TechnologyEnhancedLearning/dependabot/np…
binon Feb 11, 2025
11aa4d3
Bump sass from 1.84.0 to 1.85.0 in /AdminUI/LearningHub.Nhs.AdminUI (…
dependabot[bot] Feb 14, 2025
e91bbe0
Bump webpack from 5.97.1 to 5.98.0 in /AdminUI/LearningHub.Nhs.AdminU…
dependabot[bot] Feb 14, 2025
fa03a0a
Bump Microsoft.NET.Test.Sdk from 17.12.0 to 17.13.0
dependabot[bot] Feb 14, 2025
dba241e
Bump webpack from 5.97.1 to 5.98.0 in /LearningHub.Nhs.WebUI (#980)
dependabot[bot] Feb 14, 2025
10dfa6d
Bump sass from 1.84.0 to 1.85.0 in /LearningHub.Nhs.WebUI (#981)
dependabot[bot] Feb 14, 2025
c68daea
Bump @babel/preset-env from 7.26.8 to 7.26.9 in /LearningHub.Nhs.WebU…
dependabot[bot] Feb 17, 2025
6aa60b4
Bump @babel/core from 7.26.8 to 7.26.9 in /LearningHub.Nhs.WebUI (#984)
dependabot[bot] Feb 17, 2025
fbf76e6
Bump @babel/preset-env in /AdminUI/LearningHub.Nhs.AdminUI (#986)
dependabot[bot] Feb 17, 2025
c75beee
Bump @babel/core in /AdminUI/LearningHub.Nhs.AdminUI (#987)
dependabot[bot] Feb 17, 2025
97dce4a
Bump @mediakind/mkplayer in /AdminUI/LearningHub.Nhs.AdminUI (#997)
dependabot[bot] Feb 21, 2025
4917355
Bump @mediakind/mkplayer from 1.18.0 to 1.19.0 in /LearningHub.Nhs.We…
dependabot[bot] Feb 21, 2025
f465f3b
Bump sass from 1.85.0 to 1.85.1 in /LearningHub.Nhs.WebUI (#1001)
dependabot[bot] Feb 25, 2025
611695b
Bump sass from 1.85.0 to 1.85.1 in /AdminUI/LearningHub.Nhs.AdminUI (…
dependabot[bot] Feb 25, 2025
b79cf5b
Bump @types/lodash in /AdminUI/LearningHub.Nhs.AdminUI (#1013)
dependabot[bot] Mar 3, 2025
e73bdf9
Bump core-js from 3.40.0 to 3.41.0 in /AdminUI/LearningHub.Nhs.AdminU…
dependabot[bot] Mar 3, 2025
faabfb5
Bump @types/lodash from 4.17.15 to 4.17.16 in /LearningHub.Nhs.WebUI …
dependabot[bot] Mar 3, 2025
80b14af
Bump core-js from 3.40.0 to 3.41.0 in /LearningHub.Nhs.WebUI (#1015)
dependabot[bot] Mar 3, 2025
f736a20
Merge pull request #982 from TechnologyEnhancedLearning/dependabot/nu…
binon Mar 7, 2025
8cea0c7
Merge pull request #1022 from TechnologyEnhancedLearning/Automatic_ve…
AnjuJose011 Mar 7, 2025
e264a6a
TD-5406 : Errors are not Getting Logged in Learning Hub Prod logging …
Swapnamol Mar 10, 2025
22e7f15
reverse deleted resource
OluwatobiAwe Mar 11, 2025
3dd2457
Merge pull request #1024 from TechnologyEnhancedLearning/Develop/Fixe…
swapnamol-abraham Mar 12, 2025
a5696ab
Merge pull request #1027 from TechnologyEnhancedLearning/Develop/Fixe…
AnjuJose011 Mar 17, 2025
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
4 changes: 2 additions & 2 deletions .github/workflows/continuous-integration-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
- name: Add Azure artifact
run: dotnet nuget add source 'https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json' --name 'LearningHubFeed' --username 'kevin.whittaker' --password ${{ secrets.AZURE_DEVOPS_PAT }} --store-password-in-clear-text

- name: Use Node 12.19 with Yarn
- name: Use Node 20 with Yarn
uses: actions/setup-node@v4
with:
node-version: '18'
node-version: '20'
cache: 'npm'

- name: Upgrade npm to the latest version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.18" />
<PackageReference Include="MK.IO" Version="1.6.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.15" />
<PackageReference Include="NLog.Web.AspNetCore" Version="4.15.0" />
<PackageReference Include="System.Data.SqlClient" Version="4.9.0" />
<PackageReference Include="System.Drawing.Common" Version="9.0.1" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.3.1" />
Expand Down
244 changes: 150 additions & 94 deletions AdminUI/LearningHub.Nhs.AdminUI/package-lock.json

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions AdminUI/LearningHub.Nhs.AdminUI/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
"dependencies": {
"@ckeditor/ckeditor5-build-classic": "16.0.0",
"@ckeditor/ckeditor5-vue": "1.0.3",
"@mediakind/mkplayer": "^1.15.0",
"@mediakind/mkplayer": "^1.19.0",
"axios": "^0.19.1",
"babel-polyfill": "^6.26.0",
"bootstrap": "^4.6.2",
"ckeditor4-vue": "^0.2.0",
"concurrently": "^7.6.0",
"core-js": "^3.40.0",
"core-js": "^3.41.0",
"js-cookie": "2.2.1",
"lodash": "4.17.21",
"moment": "^2.30.1",
Expand All @@ -52,16 +52,16 @@
"vuex": "^3.6.2"
},
"devDependencies": {
"@babel/core": "^7.26.7",
"@babel/preset-env": "^7.26.7",
"@babel/preset-env": "^7.26.9",
"@babel/core": "^7.26.9",
"@types/axios": "^0.14.0",
"@types/bootstrap": "4.1.3",
"@types/ckeditor": "4.9.10",
"@types/jest": "27.0.0",
"@types/jquery": "^3.3.32",
"@types/jquery-match-height": "^0.7.8",
"@types/js-cookie": "2.2.1",
"@types/lodash": "4.17.15",
"@types/lodash": "4.17.16",
"@types/openseadragon": "^2.4.5",
"@types/sanitize-html": "^2.13.0",
"@types/vuelidate": "^0.7.22",
Expand All @@ -75,7 +75,7 @@
"css-loader": "^5.2.4",
"file-loader": "^6.2.0",
"jest": "^27.5.1",
"sass": "^1.84.0",
"sass": "^1.85.1",
"sass-loader": "^11.0.1",
"style-loader": "^2.0.0",
"ts-jest": "^27.1.5",
Expand All @@ -84,7 +84,7 @@
"vue-jest": "^3.0.7",
"vue-loader": "^15.11.1",
"vue-template-compiler": "^2.7.16",
"webpack": "^5.97.1",
"webpack": "^5.98.0",
"webpack-cli": "^4.10.0",
"webpack-dev-server": "^3.11.3"
}
Expand Down
2 changes: 1 addition & 1 deletion LearningHub.Nhs.WebUI/LearningHub.Nhs.WebUI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="NLog.Schema" Version="5.3.4" />
<PackageReference Include="NLog.Web.AspNetCore" Version="5.3.15" />
<PackageReference Include="NLog.Web.AspNetCore" Version="4.15.0" />
<PackageReference Include="UK.NHS.CookieBanner" Version="2.0.7" />
</ItemGroup>

Expand Down
Loading
Loading