Skip to content

Upgrade mui to v 7 - #2271

Merged
HaraldWalker merged 12 commits into
masterfrom
upgrade-mui-to-v-7
Sep 15, 2026
Merged

HaraldWalker merged 12 commits into
masterfrom
upgrade-mui-to-v-7

Conversation

@fateme-ramezanpour

@fateme-ramezanpour fateme-ramezanpour commented Sep 7, 2026

Copy link
Copy Markdown
Contributor

Description

This PR addresses issue 2241

Checked the following

  • Pages affected by this change work on mobile
  • Pages affected by this change work when logged out
  • Pages affected by this change work when logged in
  • Pages affected by this change work with custom theme and default theme

What and Why

@fateme-ramezanpour

Copy link
Copy Markdown
Contributor Author

@copilot resolve the merge conflicts in this pull request

# Conflicts:
#	frontend/package.json
#	frontend/yarn.lock

Co-authored-by: fateme-ramezanpour <11225608+fateme-ramezanpour@users.noreply.github.com>

Copilot AI commented Sep 8, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

Resolved the merge conflicts with master in frontend/package.json and frontend/yarn.lock, preserving MUI 7 and the master dependency additions. The merge commit is bdff0f7.

@fateme-ramezanpour
fateme-ramezanpour marked this pull request as ready for review September 9, 2026 08:01
@HaraldWalker

Copy link
Copy Markdown
Contributor

EditProjectOverview.tsx still uses grid2. Wasn't caught as compile error as it is on a dynamic route.

@HaraldWalker HaraldWalker left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One critical issue and one improvement.

Comment thread frontend/src/components/layouts/ContentImageSplitLayout.tsx Outdated
Comment thread frontend/package.json

@HaraldWalker HaraldWalker left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good

@HaraldWalker
HaraldWalker merged commit e8c8cee into master Sep 15, 2026
3 checks passed
@HaraldWalker
HaraldWalker deleted the upgrade-mui-to-v-7 branch September 15, 2026 07:17
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.

3 participants