Commit graph

14 commits

Author SHA1 Message Date
Blandine Bajard
476cc12cc0 trucs de menu et token 2022-03-01 17:32:16 +01:00
AlineRinquin
4b17f61207
Merge branch 'dev' into aline 2022-02-25 17:16:58 +01:00
Blandine Bajard
bae708b85e resoling some mistakes 2022-02-25 17:15:06 +01:00
AlineRinquin
b885324f1f resolve conflicts 2022-02-25 17:14:58 +01:00
AlineRinquin
03ec7ffe92
Merge branch 'dev' into cecile 2022-02-25 16:58:21 +01:00
AlineRinquin
2e36982415
Merge branch 'dev' into aline 2022-02-25 16:31:53 +01:00
AlineRinquin
896c0c5f3a dasboard pas fini et modif addmembre 2022-02-25 16:29:12 +01:00
Blandine Bajard
eac32838d6 deconnexion button + nav bar fixed 2022-02-25 12:52:25 +01:00
AlineRinquin
d0519247e0 dasboard pas fini 2022-02-24 15:05:47 +01:00
cecilesimplon93
76f26627bd mise a jour wend 2022-02-18 17:05:29 +01:00
Blandine Bajard
26032019c5 menu service 2022-02-15 13:57:42 +01:00
Blandine Bajard
0633d6ae6d page d'accueil 2022-01-31 18:18:03 +01:00
AlineRinquin
1ba991e959 header et side-bar 2022-01-19 10:57:26 +01:00
AlineRinquin
6f9112ee91 initialisation de l'application 2022-01-18 17:12:04 +01:00