Skip to content
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.

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

Merge main into manage back button release #394

Merged
merged 28 commits into from
Jan 23, 2025

Conversation

stevesatdfe
Copy link
Contributor

No description provided.

stevesatdfe and others added 28 commits November 26, 2024 09:11
FHB-972: Fix incorrect key vault identifier
Merge main into release merge connect apps
Merge main into connect merge apps
…nect-apps

Merge main release merge connect apps
[FHB-728] Merge connect dashboard into connect
…ferences

FHB-728 : Remove Dashboard References from SuperSolution
Release main into release-merge-connect-apps
…nect-apps

Merge `main` into `release-merge-connect-apps`
[FHB-728] Restore code deleted in merge
# Conflicts:
#	.github/workflows/deploy.yml
…e-connect-apps

Merge main into release merge connect apps
# Conflicts:
#	.github/workflows/build-and-test.yml
#	.github/workflows/deploy.yml
#	src/ui/connect-dashboard-ui/src/FamilyHubs.RequestForSupport.Web/StartupExtensions.cs
#	src/ui/connect-dashboard-ui/src/FamilyHubs.RequestForSupport.Web/gulpfile.js
#	src/ui/connect-dashboard-ui/src/FamilyHubs.RequestForSupport.Web/package-lock.json
#	src/ui/connect-dashboard-ui/src/FamilyHubs.RequestForSupport.Web/wwwroot/js/app.js.map
#	terraform/modules/fhinfrastructurestack/main.tf
…e-connect-apps

Merge main into release merge connect apps
[FHB-1274] Fix tabs on request accepted/declined pages
@stevesatdfe stevesatdfe merged commit 741df7d into release-manage-back-button Jan 23, 2025
116 of 117 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants