Commit Graph

227 Commits

Author SHA1 Message Date
trochas
ecbddd3a58 barre menu en haut + ajustement style 2026-01-11 01:36:32 +01:00
trochas
b9e67589ed merge 2026-01-10 19:55:50 +01:00
trochas
62b9231d38 fix style 2026-01-10 19:50:41 +01:00
Amaël Kesteman
3a74f6b52d Feat: Ajout de la liste des athlètes + correction visuelle detailSession 2026-01-10 18:56:45 +01:00
trochas
e85f76c810 ressourcePanel getAll 2026-01-10 17:38:40 +01:00
trochas
9aeef08e65 subscribe + unsubscribe + edt 2026-01-10 16:50:53 +01:00
Amaël Kesteman
c720bc93ff Feat: restructuration du CSS 2026-01-10 15:28:07 +01:00
trochas
0cdce29e40 correction quelques variable css 2026-01-10 13:29:15 +01:00
trochas
1feda556ff Merge branch 'main' of https://gitlab2.istic.univ-rennes1.fr/tuvu/hackathon 2026-01-10 12:47:11 +01:00
trochas
8d844d2b2f get session de l'user dans edt 2026-01-10 12:47:08 +01:00
Amaël Kesteman
5af249e0ca Feat: ajout du CSS 2026-01-10 11:33:03 +01:00
trochas
fca7362bb7 fix add activite 2026-01-10 11:31:24 +01:00
trochas
864ea784b1 merge 2026-01-09 19:19:18 +01:00
trochas
f8866efc13 add & delet activite 2026-01-09 19:16:59 +01:00
Alexis Leboeuf
9340145200 Add activity should be fixed
Changed type to POST in BE
Changed param type in FE API
2026-01-09 19:16:10 +01:00
Alexis Leboeuf
8ea47c5ca1 Merge remote-tracking branch 'refs/remotes/origin/main' 2026-01-09 18:54:28 +01:00
tuanvu
c234dd3f48 session/id/activites 2026-01-09 18:54:07 +01:00
tuanvu
29d483a2a6 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	back_end/src/main/java/hackathon/FrisbYEE/rest/SessionResource.java
2026-01-09 18:48:54 +01:00
Alexis Leboeuf
8a078410b1 Merge remote-tracking branch 'refs/remotes/origin/main' 2026-01-09 18:47:10 +01:00
tuanvu
aa877339fa session/id/activites 2026-01-09 18:46:39 +01:00
Alexis Leboeuf
8e4d1cce57 Edited doc + removed useless imports 2026-01-09 18:46:29 +01:00
trochas
536f2a7162 Merge branch 'main' of https://gitlab2.istic.univ-rennes1.fr/tuvu/hackathon 2026-01-09 18:45:22 +01:00
trochas
8638e962c9 fix creation session avec activite 2026-01-09 18:45:15 +01:00
Alexis Leboeuf
a4963aed6a Modifying front API to accept new endpoint 2026-01-09 18:20:42 +01:00
Alexis Leboeuf
f79433d0fb Added endpoint to add an existing activity to session 2026-01-09 18:20:04 +01:00
Alexis Leboeuf
f477d94e55 Merge remote-tracking branch 'refs/remotes/origin/main' 2026-01-09 17:55:12 +01:00
Alexis Leboeuf
7067153072 🐛 Fixed Activite creation not sending created object 2026-01-09 17:55:03 +01:00
trochas
aa21d046cf front correction id number|null 2026-01-09 17:49:35 +01:00
Alexis Leboeuf
7a2b72e0b1 🍻 Removed setId in toEntity methods
I need to sleep
2026-01-09 17:26:16 +01:00
Alexis Leboeuf
0036dfa3df Reverted preivous item 2026-01-09 17:21:38 +01:00
Alexis Leboeuf
316bc247c4 Merge remote-tracking branch 'refs/remotes/origin/main' 2026-01-09 17:13:00 +01:00
Alexis Leboeuf
1d99d5f097 Setting null to ids before creation to avoir problems
Postgre was using the given id instead of generating one
2026-01-09 17:12:51 +01:00
trochas
1cbc8f91d8 todo fix session id 2026-01-09 16:33:48 +01:00
Alexis Leboeuf
970844c33e Added ID to Sessions (i forgor again) 2026-01-09 16:31:17 +01:00
Alexis Leboeuf
aa82614227 Merge remote-tracking branch 'refs/remotes/origin/main' 2026-01-09 16:21:58 +01:00
Alexis Leboeuf
247a05f70e Added ID 2026-01-09 16:21:46 +01:00
trochas
58e89779a5 fix loading du coach des sessions 2026-01-09 15:33:48 +01:00
trochas
c2c5c3ff6a Merge branch 'main' of https://gitlab2.istic.univ-rennes1.fr/tuvu/hackathon 2026-01-09 15:25:46 +01:00
tuanvu
b6cffcdb44 j'oublie 2026-01-09 15:25:41 +01:00
trochas
27438f50fb Merge branch 'main' of https://gitlab2.istic.univ-rennes1.fr/tuvu/hackathon 2026-01-09 15:24:30 +01:00
trochas
fce2c22fa7 getSessions 2026-01-09 15:24:27 +01:00
tuanvu
9269989130 getByID 2026-01-09 15:23:21 +01:00
tuanvu
6156df6fef Merge remote-tracking branch 'origin/main' 2026-01-09 14:50:30 +01:00
trochas
5ce2fe71a5 correction id coach bug 2026-01-09 14:50:13 +01:00
Alexis Leboeuf
1cf7f85eea Un jour ca marchera 2026-01-09 14:34:15 +01:00
Alexis Leboeuf
2240487915 Merge remote-tracking branch 'refs/remotes/origin/main' 2026-01-09 14:29:46 +01:00
Alexis Leboeuf
142e51f3e6 Prints de débug
Un jour ca marchera
2026-01-09 14:29:39 +01:00
tuanvu
b806446763 Merge remote-tracking branch 'origin/main' 2026-01-09 14:01:47 +01:00
trochas
38c15dc408 id de l'user courant dans idCoach 2026-01-09 14:01:34 +01:00
trochas
fd2412e7ef fix nom en trop dans coach 2026-01-09 13:54:30 +01:00