Commit Graph
20 Commits
Author SHA1 Message Date
JOSSERAND GIOVANNI p2405212 6e7d5b5f35 Merge branch 'features/notifications' into 'dev'
change notifications div scroll behavior and max-height and add a call to...

See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!58
2026-01-12 07:48:21 +00:00
JOSSERAND GIOVANNI p2405212 c205fc191a Merge branch 'features/images' into 'dev'
Features/images

See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!40
2025-12-10 14:46:05 +00:00
JOSSERAND GIOVANNI p2405212 89c0f5c9f7 Merge branch 'features/volunteersTollBar' into 'dev'
Features/volunteerstollbar

See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!34
2025-12-10 10:54:45 +00:00
JOSSERAND GIOVANNI p2405212 cac2ef2c3e Merge branch 'dev' into 'features/volunteersTollBar'
# Conflicts:
#   src/pages/Events/EventsPage.jsx
#   src/pages/Volunteers/VolunteerCard.jsx
2025-12-10 10:54:24 +00:00
JOSSERAND GIOVANNI p2405212 a0462450fd Merge branch 'features/searchBar' into 'dev'
Features/searchbar

See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!29
2025-12-07 15:43:47 +00:00
JOSSERAND GIOVANNI p2405212 c233d4cda3 Merge branch 'dev' into 'features/searchBar'
# Conflicts:
#   src/components/Event/Event.jsx
#   src/index.css
#   src/pages/Events/EventsPage.jsx
#   src/utils/getUser.js
#   src/utils/getXSRF.js
#   src/utils/login.js
#   src/utils/register.js
2025-12-07 15:43:03 +00:00
JOSSERAND GIOVANNI p2405212 f63eb6ce2f Merge branch 'dev' into 'features/searchBar'
Dev

See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!22
2025-11-30 13:59:04 +00:00
JOSSERAND GIOVANNI p2405212 062d7fba2b Merge branch 'dev' into 'features/eventsPage'
Merge branch 'features/eventsPage' into 'dev'

See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!17
2025-11-23 18:07:33 +00:00
JOSSERAND GIOVANNI p2405212 36c57cf5bf Merge branch 'features/eventsPage' into 'dev'
Features/eventspage

See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!16
2025-11-23 18:04:24 +00:00
JOSSERAND GIOVANNI p2405212 ca2f813580 Merge branch 'dev' into 'features/eventsPage'
# Conflicts:
#   src/index.css
#   vite.config.js
2025-11-23 18:04:18 +00:00
JOSSERAND GIOVANNI p2405212 2f9bdf0255 Merge branch 'features/filter' into 'features/eventsPage'
Features/filter

See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!15
2025-11-21 10:36:55 +00:00
JOSSERAND GIOVANNI p2405212 66e2019364 Merge branch 'features/getUserNotifications' into 'dev'
add of getUserNotifications function

See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!13
2025-11-16 11:14:40 +00:00
JOSSERAND GIOVANNI p2405212 080ecbbe5f Merge branch 'features/header' into 'dev'
update navlink in header

See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!10
2025-11-07 10:17:40 +00:00
JOSSERAND GIOVANNI p2405212 4239286ddd Merge branch 'features/header' into 'dev'
update navlink in header

See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!9
2025-11-07 10:14:25 +00:00
JOSSERAND GIOVANNI p2405212 ae50614b2a Merge branch 'features/changeBackgroundColor' into 'dev'
change of the background color

See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!8
2025-11-07 08:24:04 +00:00
JOSSERAND GIOVANNI p2405212 cf920a5e76 Merge branch 'features/footer' into 'dev'
add of responsive design for the Footer component

See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!7
2025-11-02 22:49:43 +00:00
JOSSERAND GIOVANNI p2405212 39075e1237 Merge branch 'features/header' into 'dev'
Features/header

See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!6
2025-11-02 22:43:04 +00:00
JOSSERAND GIOVANNI p2405212 5b55ae6994 Merge branch 'features/footer' into 'dev'
Features/footer

See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!4
2025-10-24 12:34:31 +00:00
JOSSERAND GIOVANNI p2405212 756d1e11b1 Merge branch 'dev' into 'features/footer'
# Conflicts:
#   src/index.css
2025-10-24 12:34:24 +00:00
JOSSERAND GIOVANNI p2405212 55957a0ded Merge branch 'features/glassCard' into 'dev'
creation of glassCard css class

See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!2
2025-10-24 08:28:43 +00:00