Giovanni/SAE-BUT2
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,016 Commits 1 Branch 0 Tags
b8420f08cd9d40b17d95dc38af471b15455109dc
Commit Graph
1016 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Giovanni 5f58404bf9 merge dev into features/notifications 2026-01-12 08:44:18 +01:00
T'JAMPENS QUENTIN p2406187 bb369c629b Display data 2026-01-12 00:51:57 +01:00
T'JAMPENS QUENTIN p2406187 101a3bc7b1 Change eventDetails path 2026-01-12 00:28:54 +01:00
T'JAMPENS QUENTIN p2406187 f2db26150c Fix 2026-01-12 00:26:55 +01:00
Giovanni 6da4880f0d Merge branch 'dev' into features/notifications 
# Conflicts:
#	package-lock.json
#	package.json
#	src/components/Header/Header.jsx
 2026-01-12 00:15:16 +01: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
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
JOSSERAND GIOVANNI p2405212 46a4ac9c15 Merge branch 'features/notifications' into 'dev' 
add reverb container, unread attribute in notification pivot table and private...

See merge request sae-but2/2025-26/gestion-benevoles-association/backend!18
 2026-01-11 22:22:26 +00:00
Giovanni 60012c63c3 merge dev into features/notifications 2026-01-11 23:09:57 +01:00
Giovanni c3122072da correct some issues 2026-01-11 20:10:39 +01:00
Giovanni b0d7d3c0af update notifications css 2026-01-11 20:05:20 +01:00
Giovanni ab1df4d692 Create unassignUser, unassignSelf methods and Bruno requests. Add call events when needed 2026-01-11 19:03:58 +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 234717b23c multiplex user notifications over a single private channel 2026-01-11 12:09:58 +01:00
Giovanni 9fd72c6ea4 multiplex user notifications over a single private channel 2026-01-11 12:06:27 +01:00
Giovanni 9b70b09173 rename admins-private to users.registration 2026-01-09 14:41:10 +01:00
Giovanni 5fb97ccd90 split notification listeners into separate files 2026-01-09 14:39:19 +01:00
p2405951 2b8487432f --allow_empty 2026-01-09 09:35:21 +01:00
p2405951 b4a5283547 fix bug && test 2026-01-09 09:23:56 +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
Giovanni 69d6a77ff1 untrack public/index.html 2026-01-08 14:59:03 +01:00
Giovanni 475a1c7052 set the notification getting system by created_at desc order 2026-01-08 14:51:21 +01:00
Giovanni c49a5e558f add readNotifications route and bruno's request 2026-01-08 14:10:17 +01:00
Giovanni 51791a3b34 add readNotifications route and bruno's request 2026-01-08 14:04:53 +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
Giovanni 2790026475 add reverb container, unread attribute in notification pivot table and private channel and event for new register 2026-01-07 16:50:51 +01:00
LEBLOND MALO p2405951 ed37808d33 Merge branch 'features/backup' into 'dev' 
Features/backup

See merge request sae-but2/2025-26/gestion-benevoles-association/backend!16
 2026-01-07 15:33:33 +00:00
p2405951 f066aa88f0 Nettoyage des backups 2026-01-07 16:30:33 +01:00
p2405951 3451f75b37 recup modif dev 2026-01-07 16:04:12 +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