Skip to content

Merge Dev into Main - #178

Merged
Bralc003 merged 135 commits into
mainfrom
dev
May 25, 2026
Merged

Merge Dev into Main#178
Bralc003 merged 135 commits into
mainfrom
dev

Conversation

@Bralc003

Copy link
Copy Markdown
Collaborator

No description provided.

A-Axisa and others added 30 commits May 15, 2026 22:00
…king-status

SHP-215: Remember Marital and Working Status
Log unauthorized user role change attempts
Prevent administrators from changing their own roles to avoid losing access privileges
…ckend-for-changing-user-role

Shp 175/add authentication to backend for changing user role
…e-UI

shp-226/Update-user-settings-page-UI
jshudbrd and others added 27 commits May 24, 2026 15:52
Testing if this works first before applying.
used by UserSettings and RegistrationForm
Remove permission and role permission DB tables
…onsistancy

Shp 229/mobile layout and font consistency
…conflicts

SHP-183/resolve github security conflicts
Fix errors after merging security SPH-183
@Bralc003
Bralc003 requested a review from A-Axisa May 25, 2026 10:09

@A-Axisa A-Axisa left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Looks good!

@Bralc003
Bralc003 merged commit f8dff07 into main May 25, 2026
1 check 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