T'JAMPENS QUENTIN p2406187
|
16b6580842
|
Merge branch 'feature/delete-account' into 'dev'
Feature/delete account
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!92
|
2026-03-17 10:09:57 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
4b0b41d194
|
Merge branch 'sytle/eventCard' into 'dev'
Remove task view in EventCard
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!91
|
2026-03-16 14:14:24 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
107647a1a7
|
Merge branch 'features/admin-assign' into 'dev'
Features/admin assign
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!90
|
2026-03-15 15:14:35 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
560f391a03
|
Merge branch 'style/loading' into 'dev'
Update loading on auth
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!89
|
2026-03-13 16:21:08 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
ad696888da
|
Merge branch 'fix/loop-update-requests' into 'dev'
Fix/loop update requests
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!84
|
2026-03-03 11:05:18 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
cfe27d01c9
|
Merge branch 'refactor/profile-page' into 'dev'
Refactor/profile page
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!83
|
2026-02-24 16:30:20 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
ff50056bee
|
Merge branch 'feature/loading-component' into 'dev'
Feature/loading component
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!81
|
2026-02-24 13:48:12 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
d578be5bab
|
Merge branch 'refactor/ToolBar' into 'dev'
Refactor/toolbar
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!80
|
2026-02-24 13:07:38 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
c85490e1c6
|
Merge branch 'style/volunteersPage' into 'dev'
Style/volunteerspage
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!77
|
2026-02-10 14:29:46 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
d57b8195ee
|
Merge branch 'features/registerMember' into 'dev'
Features/registermember
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!76
|
2026-02-10 13:14:37 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
4f5161018c
|
Merge branch 'fix/pendingMembers' into 'dev'
Fix/pendingmembers
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!75
|
2026-02-03 13:40:09 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
d6a2b6a4ab
|
Merge branch 'refac/fetchWrapper' into 'dev'
Refac/fetchwrapper
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!73
|
2026-01-30 13:48:06 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
56964285b9
|
Merge branch 'refac/taskContext' into 'dev'
Refac/taskcontext
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!72
|
2026-01-27 15:22:44 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
ae6d93eb81
|
Merge branch 'EventContext' into 'dev'
Eventcontext
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!71
|
2026-01-27 13:24:31 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
7d9b0df0cd
|
Merge branch 'refac/architecture' into 'dev'
Refac/architecture
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!70
|
2026-01-19 08:20:29 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
4746de72ab
|
Merge branch 'features/manageMember' into 'dev'
Features/managemember
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!63
|
2026-01-13 22:41:01 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
ece83f815d
|
Merge branch 'dev' into 'features/manageMember'
# Conflicts:
# src/utils/users/deleteUser.js
|
2026-01-13 22:40:56 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
12ea78a23a
|
Merge branch 'features/createTask' into 'dev'
Features/createtask
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!62
|
2026-01-13 22:39:08 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
998f3c1c2e
|
Merge branch 'features/linkEventsPage' into 'dev'
Features/linkeventspage
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!59
|
2026-01-12 14:55:28 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
2def96dd18
|
Merge branch 'dev' into 'features/linkEventsPage'
# Conflicts:
# src/pages/Profile/ProfilePage.jsx
|
2026-01-12 14:55:23 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
0d272bb1bf
|
Merge branch 'eventDetail' into 'dev'
Eventdetail
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!57
|
2026-01-11 23:05:54 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
3fd6fa0fa1
|
Merge branch 'dev' into 'eventDetail'
# Conflicts:
# src/components/homePage/calendar.jsx
# src/components/homePage/eventList.jsx
|
2026-01-11 23:05:50 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
0b6340beb2
|
Merge branch 'fix/createEvent' into 'dev'
Add date to event create
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!56
|
2026-01-07 16:09:08 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
153cf72dba
|
Merge branch 'features/linkHomePage' into 'dev'
Features/linkhomepage
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!55
|
2026-01-07 14:20:13 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
1f37939741
|
Merge branch 'dev' into 'features/linkHomePage'
# Conflicts:
# src/components/homePage/eventList.jsx
# src/utils/date/formatDateLetter.js
|
2026-01-07 14:20:09 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
a98af05a5d
|
Merge branch 'features/homePage' into 'dev'
fin de homepage (800 essais)
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!53
|
2026-01-05 10:02:21 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
2b5651775c
|
Merge branch 'features/adminHeader' into 'dev'
Show admin link if user is admin
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!47
|
2025-12-17 14:34:39 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
33fd12515a
|
Merge branch 'features/PageNotFound' into 'dev'
Features/pagenotfound
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!46
|
2025-12-17 14:21:37 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
1ee31e6fd8
|
Merge branch 'features/fixProfilePage' into 'dev'
improve ux
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!45
|
2025-12-17 13:53:14 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
858ac21380
|
Merge branch 'features/volunteerProfile' into 'dev'
Features/volunteerprofile
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!44
|
2025-12-17 13:50:52 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
c4c5f20d86
|
Merge branch 'feature/waitPage' into 'dev'
Create ValidationErrorPage
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!43
|
2025-12-15 15:49:44 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
ddd0180933
|
Merge branch 'feature/createEvent' into 'dev'
Feature/createevent
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!42
|
2025-12-15 14:32:55 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
2373c0402c
|
Merge branch 'features/homePage' into 'dev'
Features/homepage
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!32
|
2025-12-10 09:58:22 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
64b3e9a868
|
Merge branch 'features/feedback' into 'dev'
Show error modal
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!31
|
2025-12-10 09:20:09 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
50fda7076a
|
Merge branch 'features/updateProfile' into 'dev'
Features/updateprofile
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!30
|
2025-12-09 10:50:39 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
e1f6663382
|
Merge branch 'features/darkTheme' into 'dev'
Features/darktheme
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!28
|
2025-12-07 00:55:17 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
10ac3cecc0
|
Merge branch 'features/linkEventsPage' into 'dev'
Features/linkeventspage
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!27
|
2025-12-07 00:30:22 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
191044e520
|
Merge branch 'features/linkVolunteersPage' into 'dev'
Features/linkvolunteerspage
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!26
|
2025-12-05 14:00:13 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
37e4968023
|
Merge branch 'features/vitest' into 'dev'
Add vitest
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!25
|
2025-12-04 10:22:29 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
b099df933f
|
Merge branch 'features/stat' into 'dev'
Features/stat
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!24
|
2025-12-02 13:53:00 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
06565318f4
|
Merge branch 'dev' into 'features/stat'
# Conflicts:
# package-lock.json
# src/router.js
# vite.config.js
|
2025-12-02 13:52:55 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
08554d9ba6
|
Merge branch 'features/modal' into 'dev'
Features/modal
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!23
|
2025-11-30 16:53:43 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
624e8edbe4
|
Merge branch 'feature/auth' into 'dev'
Feature/auth
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!21
|
2025-11-28 08:28:00 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
db4ef74699
|
Merge branch 'dev' into 'feature/auth'
# Conflicts:
# src/router.js
# src/utils/login.js
|
2025-11-28 08:27:56 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
49e40378dd
|
Merge branch 'features/volunteersList' into 'dev'
Features/volunteerslist
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!20
|
2025-11-28 08:14:00 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
7b16033de8
|
Merge branch 'dev' into 'features/volunteersList'
# Conflicts:
# package-lock.json
# src/router.js
|
2025-11-28 08:13:56 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
706fd54ec5
|
Merge branch 'features/profile' into 'dev'
Features/profile
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!18
|
2025-11-28 07:59:16 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
0bf4296319
|
Merge branch 'dev' into 'features/profile'
# Conflicts:
# package-lock.json
# src/index.css
# src/router.js
|
2025-11-28 07:59:09 +00:00 |
|
T'JAMPENS QUENTIN p2406187
|
7eaae67655
|
Merge branch 'features/input' into 'dev'
Features/input
See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!12
|
2025-11-08 17:50:11 +00:00 |
|