Commit Graph
375 Commits
Author SHA1 Message Date
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
Giovanni 007ba0b758 ? 2026-01-11 23:26:11 +01:00
Giovanni 69e7fdb35c correct created_at attribute of notifications 2026-01-11 23:24:15 +01:00
Giovanni b0d7d3c0af update notifications css 2026-01-11 20:05:20 +01:00
Antoine Ordonneau a028340cc1 fix admin et eventdetail 2026-01-11 12:56:14 +01:00
Giovanni c906cb733e multiplex user notifications over a single private channel 2026-01-11 12:10:44 +01:00
Giovanni 5fb97ccd90 split notification listeners into separate files 2026-01-09 14:39:19 +01:00
Giovanni c462385b91 change notifications div scroll behavior and max-height and add a call to update function on deleting a notification 2026-01-08 15:08:26 +01:00
Giovanni 42748ad722 add read notifications route and update notifications behavior 2026-01-08 15:00:43 +01: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 b58a1a321d Add date to event create 2026-01-07 17:04:10 +01: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 d6cff2d474 Format date 2026-01-07 15:18:52 +01:00
T'JAMPENS QUENTIN p2406187 ca03ef147e Fetch events from homepage 2026-01-07 15:15:27 +01:00
T'JAMPENS QUENTIN p2406187 5d7a79f82a link homepage calendar to backend 2026-01-07 15:15:02 +01:00
T'JAMPENS QUENTIN p2406187 d98c6db3c2 Uncomment links 2026-01-07 14:55:57 +01:00
T'JAMPENS QUENTIN p2406187 929ef5fa82 Link hompeage eventlist to backend 2026-01-07 14:55:57 +01:00
T'JAMPENS QUENTIN p2406187 0f0c51cfbd Uncomment links 2026-01-07 14:55:17 +01:00
T'JAMPENS QUENTIN p2406187 7f5be9ea32 Link hompeage eventlist to backend 2026-01-07 14:55:17 +01:00
p2405951 a90d52b44b récupération modifs dev sur new branch 2026-01-06 09:32:20 +01:00
ORDONNEAU ANTOINE p2405376 c5a89fb49f Merge branch 'dev' into 'eventDetail'
Dev

See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!54
2026-01-05 15:06:55 +00:00
Antoine Ordonneau 4a5e2210c8 resolve merge conflict 2026-01-05 16:06:32 +01:00
Antoine Ordonneau 1936151267 fix visuel homepage 2026-01-05 12:09:01 +01:00
Antoine Ordonneau 68d2db0ed3 correction erreur responsive 2026-01-05 11:15:17 +01: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
Antoine Ordonneau 3fc095b3eb fin de homepage (800 essais) 2026-01-05 11:01:42 +01:00
Antoine Ordonneau 31e494bb36 merge dev 2026-01-05 09:37:07 +01:00
T'JAMPENS QUENTIN p2406187 cab258ff51 Remove .env from repo 2026-01-05 09:30:17 +01:00
T'JAMPENS QUENTIN p2406187 e19e6844f4 fix errors 2026-01-05 09:28:58 +01:00
LEBLOND MALO p2405951 ef5ed65526 Merge branch 'features/homePage' into 'dev'
Features/homepage (encore)

See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!51
2025-12-27 16:57:44 +00:00
p2405951 6ac1522be8 resolve conflicts 2025-12-27 17:55:31 +01:00
Antoine Ordonneau 2df24024d7 correction eventDetail 2025-12-27 17:51:12 +01:00
p2405951 fb53e49c77 add minimum responsive before merge 2025-12-27 17:49:37 +01:00
p2405951 919b978f57 withdraw auth for test 2025-12-27 17:30:25 +01:00
Antoine Ordonneau add476f097 test fix 2025-12-27 15:44:54 +01:00
Antoine Ordonneau 86a918337a fix package 2025-12-27 15:40:05 +01:00
Antoine Ordonneau 3fb60e9214 fix 2025-12-19 16:06:09 +01:00
Antoine Ordonneau 3e43a67116 fix pour merge 2025-12-19 15:50:15 +01:00
Antoine Ordonneau 32bde03254 correction erreur et découpage en composant 2025-12-19 15:32:43 +01:00
Giovanni 21259f2838 update notification routes call 2025-12-17 17:22:10 +01:00
T'JAMPENS QUENTIN p2406187 e43ff5c269 Fix .gitignore 2025-12-17 16:59:13 +01:00
T'JAMPENS QUENTIN p2406187 6bcc7e4496 Redirect if user is not admin 2025-12-17 16:57:16 +01:00
LEBLOND MALO p2405951 12c91b070a Merge branch 'features/admin' into 'dev'
Features/admin

See merge request sae-but2/2025-26/gestion-benevoles-association/Frontend!48
2025-12-17 15:22:21 +00:00
p2405951 d899379297 merge dev into admin 2025-12-17 16:20:46 +01:00
p2405951 c0ad7f3146 adapt incompleteEvents responsive 2025-12-17 16:12:32 +01: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 ef948432d1 Show admin link if user is admin 2025-12-17 15:33:37 +01: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 c2f4c9fa55 Redirect to 404 page if user not found 2025-12-17 15:20:51 +01:00