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.

Sign up for GitHub

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

Jump to bottom

Sprint 5 #162

Merged
merged 183 commits into from
Dec 3, 2024
Merged

Sprint 5 #162

merged 183 commits into from
Dec 3, 2024

Conversation

rushabhshah02
Copy link
Collaborator

No description provided.

monkey567567 and others added 30 commits November 21, 2024 04:56
@monkey567567
testing
4d932fc
@monkey567567
Merge remote-tracking branch 'origin/sprint-5' into feature/overview
1767825
@monkey567567
shifts clean up works
6f3214f
@rushabhshah02
feat: admins can see total hours worked for all volunteers in users t…
4f2e03e 
…able.

Closes #26 #126
@rushabhshah02
fix: remove background for overview container
ae2914b
@rushabhshah02
fix: comment in users
314a788
@rushabhshah02
Merge remote-tracking branch 'origin/sprint-5' into feature/event-man…
0e99d4f 
…agement
@Anhad928
Fix: Max Volunteer Functionality working
171b2ea
@monkey567567
Merge pull request #127 from UAlberta-CMPUT401/feature/event-management
4ef0f3f 
Feature/event management
@monkey567567
dialog changes
5f775c3
@monkey567567
Merge remote-tracking branch 'origin/sprint-5' into feature/overview
9b88002
@monkey567567
overview changes
b4d5064
@monkey567567
back button
edab482
@monkey567567
quick unused code
ed8f84a
@monkey567567
Merge pull request #128 from UAlberta-CMPUT401/feature/overview
af43987 
Overview changes, signed up shift clean up
@RJ-Gajjar
Adding Edit Password Functionality in Account(Profile) Page
5afe202
@rushabhshah02
feat: sign ups list view #129 #29
26d75fc
@monkey567567
shift fix
81a20d4
@rushabhshah02
fix: layout changes to shift details dialog
df1e46b
@chasejohnson626
feat: signups admin view and remove signups
a2755a8
@rushabhshah02
fix: merge conflicts
a82e951
@chasejohnson626
Merge pull request #130 from UAlberta-CMPUT401/feature/event-management
48bcca7 
Feature/event management
@Anhad928
Fix: Added date field in creating volunteer-shifts
bc747b0
@Anhad928
Merge branch 'feature/event-management' of https://github.com/UAlbert…
11dbc5c 
…a-CMPUT401/f24project-Bleeding-Heart-Art-Space into feature/event-management
@amn-xyz
Update: Sidebar UI and dark theme bg color
bc15bd0
@amn-xyz
Fix: Hover color in light theme for sidebar
7970fd7
@rushabhshah02
fix: Minor Layout/UI changes to event details and volunteer shifts #124
6ff81dd
@RJ-Gajjar
Merge remote-tracking branch 'origin/sprint-5' into feature/auth
8e6d2c6 
Updating (Account)Profile Page
@RJ-Gajjar
Updating Password Change in Account(Profile) Page
7931073
@RJ-Gajjar
Merge pull request #131 from UAlberta-CMPUT401/feature/event-management
52f0459 
Feature/event management
monkey567567 and others added 24 commits December 2, 2024 17:18
@monkey567567
user manual
ea2e7b8
@monkey567567
Merge pull request #154 from UAlberta-CMPUT401/feature/overview
d286fdd 
user manual
@rushabhshah02
ui: notes colour issue fixed
569a070
@rushabhshah02
Merge remote-tracking branch 'origin/sprint-5' into feature/ui-changes
ac13428
@chasejohnson626
Merge pull request #155 from UAlberta-CMPUT401/feature/ui-changes
fae4441 
Feature/UI changes
@chasejohnson626
fix: home menu small
5a01802
@monkey567567
comments
1128460
@monkey567567
Merge remote-tracking branch 'origin/sprint-5' into feature/overview
5a814b8
@RJ-Gajjar
fix: Logo update in light mode
22b3df5
@RJ-Gajjar
Merge remote-tracking branch 'origin/sprint-5' into feature/auth
0f79141 
Merge
@monkey567567
Merge pull request #156 from UAlberta-CMPUT401/feature/overview
7615cdc 
Feature/overview
@chasejohnson626
fix: backend unncessary var
9504c63
@RJ-Gajjar
Merge remote-tracking branch 'origin/sprint-5' into feature/auth
2396e93 
Merge
@RJ-Gajjar
fix: Logo Update in Mobile View
6bcd48f
@chasejohnson626
Merge pull request #157 from UAlberta-CMPUT401/feature/auth
4d32701 
Feature/auth
@chasejohnson626
fix: change add event button to be fixed
73e68a3
@RJ-Gajjar
fix: Login error display change
f4c9e76
@monkey567567
Merge pull request #158 from UAlberta-CMPUT401/feature/auth
17e5b51 
fix: Login error display change
@monkey567567
doc changes
5997228
@monkey567567
Merge pull request #159 from UAlberta-CMPUT401/feature/overview
8ebafb4 
doc changes
@monkey567567
typo
6f2f304
@monkey567567
Merge pull request #160 from UAlberta-CMPUT401/feature/overview
1b89a3f 
typo
@RJ-Gajjar
fix: Signup Error Display Change
bc9001c
@monkey567567
Merge pull request #161 from UAlberta-CMPUT401/feature/auth
3ca748e 
fix: Signup Error Display Change
@monkey567567 monkey567567 self-assigned this Dec 3, 2024
@monkey567567
Copy link
Collaborator

All desired functionalities are in place and the UI has been improved significantly.

monkey567567
monkey567567 reviewed Dec 3, 2024
View reviewed changes
Copy link
Collaborator

@monkey567567 monkey567567 left a comment

Choose a reason for hiding this comment

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

Everything looks well looked after. Functionalities are put into place, mobile view is not perfect but still works quite well.

@monkey567567 monkey567567 merged commit 0352557 into main Dec 3, 2024
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@monkey567567 monkey567567 monkey567567 approved these changes

Assignees

@monkey567567 monkey567567

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@rushabhshah02 @monkey567567 @Anhad928 @RJ-Gajjar @chasejohnson626 @amn-xyz