Merge branch 'master' into feature/VIH-10186-update-client-changes

# Conflicts: # AdminWebsite/AdminWebsite.AcceptanceTests/packages.lock.json
hmcts · Oct 13, 2023 · 98d49e6 · 98d49e6
2 parents d8d4666 + d3f55e4
commit 98d49e6
Show file tree

Hide file tree

Showing 120 changed files with 121 additions and 6,279 deletions.
diff --git a/AdminWebsite/AdminWebsite.AcceptanceTests/AdminWebsite.AcceptanceTests.csproj b/AdminWebsite/AdminWebsite.AcceptanceTests/AdminWebsite.AcceptanceTests.csproj
diff --git a/AdminWebsite/AdminWebsite.AcceptanceTests/Configuration/AdminWebConfig.cs b/AdminWebsite/AdminWebsite.AcceptanceTests/Configuration/AdminWebConfig.cs
diff --git a/AdminWebsite/AdminWebsite.AcceptanceTests/Configuration/AdminWebTestConfig.cs b/AdminWebsite/AdminWebsite.AcceptanceTests/Configuration/AdminWebTestConfig.cs
diff --git a/AdminWebsite/AdminWebsite.AcceptanceTests/Configuration/AdminWebTokens.cs b/AdminWebsite/AdminWebsite.AcceptanceTests/Configuration/AdminWebTokens.cs
diff --git a/AdminWebsite/AdminWebsite.AcceptanceTests/Configuration/AdminWebVhServiceConfig.cs b/AdminWebsite/AdminWebsite.AcceptanceTests/Configuration/AdminWebVhServiceConfig.cs
diff --git a/AdminWebsite/AdminWebsite.AcceptanceTests/Configuration/NotifyConfiguration.cs b/AdminWebsite/AdminWebsite.AcceptanceTests/Configuration/NotifyConfiguration.cs
diff --git a/AdminWebsite/AdminWebsite.AcceptanceTests/Configuration/WowzaConfiguration.cs b/AdminWebsite/AdminWebsite.AcceptanceTests/Configuration/WowzaConfiguration.cs
diff --git a/AdminWebsite/AdminWebsite.AcceptanceTests/Data/AssertConference.cs b/AdminWebsite/AdminWebsite.AcceptanceTests/Data/AssertConference.cs
diff --git a/AdminWebsite/AdminWebsite.AcceptanceTests/Data/AssertHearing.cs b/AdminWebsite/AdminWebsite.AcceptanceTests/Data/AssertHearing.cs
diff --git a/AdminWebsite/AdminWebsite.AcceptanceTests/Data/CallbackEvent.cs b/AdminWebsite/AdminWebsite.AcceptanceTests/Data/CallbackEvent.cs