Merge branch 'Release-2024.32' into Release-2024.38

rshrirohit · rshrirohit · commit ab6433e6bbff · 2024-08-29T09:06:10.000+01:00
diff --git a/DigitalLearningSolutions.Data.Migrations/202408221440_UpdatePrivacyPolicyRecord.cs b/DigitalLearningSolutions.Data.Migrations/202408221440_UpdatePrivacyPolicyRecord.cs
diff --git a/DigitalLearningSolutions.Web/appSettings.UAT.json b/DigitalLearningSolutions.Web/appSettings.UAT.json
@@ -22,11 +22,11 @@
     "UserFeedbackBar": true,
     "ExportQueryRowLimit": 250,
     "MaxBulkUploadRows": 200,
-    "LoginWithLearningHub": false
+    "LoginWithLearningHub": true
   },
   "LearningHubOpenAPIBaseUrl": "https://uks-learninghubnhsuk-openapi-test.azurewebsites.net",
   "FreshdeskAPIConfig": {
-    "GroupId": "80000647007",
+    "GroupId": "80000650208",
     "ProductId": "80000003097"
   }
 }
diff --git a/DigitalLearningSolutions.Web/appsettings.Development.json b/DigitalLearningSolutions.Web/appsettings.Development.json
@@ -22,7 +22,7 @@
     "UserFeedbackBar": true,
     "ExportQueryRowLimit": 250,
     "MaxBulkUploadRows": 200,
-    "LoginWithLearningHub": false
+    "LoginWithLearningHub": true
   },
   "LearningHubOpenAPIBaseUrl": "https://uks-learninghubnhsuk-openapi-test.azurewebsites.net",
   "LearningHubReportAPIConfig": {
diff --git a/DigitalLearningSolutions.Web/appsettings.Production.json b/DigitalLearningSolutions.Web/appsettings.Production.json
@@ -22,7 +22,7 @@
     "UserFeedbackBar": true,
     "ExportQueryRowLimit": 250,
     "MaxBulkUploadRows": 200,
-    "LoginWithLearningHub": false
+    "LoginWithLearningHub": true
   },
   "LearningHubOpenAPIBaseUrl": "https://learninghubnhsuk-openapi-prod.azurewebsites.net",
   "LearningHubReportAPIConfig": {
diff --git a/DigitalLearningSolutions.Web/appsettings.SIT.json b/DigitalLearningSolutions.Web/appsettings.SIT.json
@@ -19,7 +19,7 @@
     "UserFeedbackBar": true,
     "ExportQueryRowLimit": 250,
     "MaxBulkUploadRows": 200,
-    "LoginWithLearningHub": false
+    "LoginWithLearningHub": true
   },
   "LearningHubOpenAPIBaseUrl": "https://uks-learninghubnhsuk-openapi-dev.azurewebsites.net",
   "LearningHubReportAPIConfig": {
diff --git a/DigitalLearningSolutions.Web/appsettings.Test.json b/DigitalLearningSolutions.Web/appsettings.Test.json
@@ -21,7 +21,7 @@
     "UserFeedbackBar": true,
     "ExportQueryRowLimit": 250,
     "MaxBulkUploadRows": 200,
-    "LoginWithLearningHub": false
+    "LoginWithLearningHub": true
   },
   "LearningHubOpenAPIBaseUrl": "https://uks-learninghubnhsuk-openapi-test.azurewebsites.net"
 }
diff --git a/DigitalLearningSolutions.Web/appsettings.UarTest.json b/DigitalLearningSolutions.Web/appsettings.UarTest.json
@@ -22,7 +22,7 @@
     "UserFeedbackBar": true,
     "ExportQueryRowLimit": 250,
     "MaxBulkUploadRows": 200,
-    "LoginWithLearningHub": false
+    "LoginWithLearningHub": true
   },
   "LearningHubOpenAPIBaseUrl": "https://uks-learninghubnhsuk-openapi-test.azurewebsites.net"
 }
diff --git a/DigitalLearningSolutions.Web/appsettings.json b/DigitalLearningSolutions.Web/appsettings.json
@@ -17,7 +17,7 @@
     "UseSignposting": true,
     "PricingPage": true,
     "ShowSelfAssessmentProgressButtons": false,
-    "LoginWithLearningHub": false
+    "LoginWithLearningHub": true
   },
   "LearningHubOpenAPIBaseUrl": "https://uks-learninghubnhsuk-openapi-test.azurewebsites.net",
   "LearningHubOpenAPIKey": "",

Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,11 @@`
`22`	`22`	`"UserFeedbackBar": true,`
`23`	`23`	`"ExportQueryRowLimit": 250,`
`24`	`24`	`"MaxBulkUploadRows": 200,`
`25`		`- "LoginWithLearningHub": false`
	`25`	`+ "LoginWithLearningHub": true`
`26`	`26`	`},`
`27`	`27`	`"LearningHubOpenAPIBaseUrl": "https://uks-learninghubnhsuk-openapi-test.azurewebsites.net",`
`28`	`28`	`"FreshdeskAPIConfig": {`
`29`		`- "GroupId": "80000647007",`
	`29`	`+ "GroupId": "80000650208",`
`30`	`30`	`"ProductId": "80000003097"`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`"UserFeedbackBar": true,`
`22`	`22`	`"ExportQueryRowLimit": 250,`
`23`	`23`	`"MaxBulkUploadRows": 200,`
`24`		`- "LoginWithLearningHub": false`
	`24`	`+ "LoginWithLearningHub": true`
`25`	`25`	`},`
`26`	`26`	`"LearningHubOpenAPIBaseUrl": "https://uks-learninghubnhsuk-openapi-test.azurewebsites.net"`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@`
`22`	`22`	`"UserFeedbackBar": true,`
`23`	`23`	`"ExportQueryRowLimit": 250,`
`24`	`24`	`"MaxBulkUploadRows": 200,`
`25`		`- "LoginWithLearningHub": false`
	`25`	`+ "LoginWithLearningHub": true`
`26`	`26`	`},`
`27`	`27`	`"LearningHubOpenAPIBaseUrl": "https://uks-learninghubnhsuk-openapi-test.azurewebsites.net"`
`28`	`28`	`}`