AlineRinquin
|
cb1498a215
|
Merge pull request #57 from AlineRinquin/sana
addMember envoi de mail ok
|
2022-02-26 12:51:21 +01:00 |
|
Sana EL HIRI
|
21e076b1ee
|
addMember envoi de mail ok
|
2022-02-25 18:52:30 +01:00 |
|
AlineRinquin
|
1d96834459
|
Merge pull request #56 from AlineRinquin/blandine
encore erreur
|
2022-02-25 17:19:34 +01:00 |
|
Blandine Bajard
|
f79b47f3ac
|
encore erreur
|
2022-02-25 17:19:03 +01:00 |
|
AlineRinquin
|
0e4e0f18dc
|
Merge pull request #55 from AlineRinquin/aline
resolve conflicts
|
2022-02-25 17:17:05 +01:00 |
|
AlineRinquin
|
4b17f61207
|
Merge branch 'dev' into aline
|
2022-02-25 17:16:58 +01:00 |
|
AlineRinquin
|
98af9f417e
|
Merge pull request #54 from AlineRinquin/blandine
Blandine
|
2022-02-25 17:15:56 +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 |
|
Blandine Bajard
|
50fd7539ac
|
truc
|
2022-02-25 17:02:25 +01:00 |
|
Blandine Bajard
|
2a10f319ae
|
je sais pas
|
2022-02-25 17:00:35 +01:00 |
|
AlineRinquin
|
a04bef6954
|
Merge pull request #53 from AlineRinquin/aline
koehfozh
|
2022-02-25 16:59:46 +01:00 |
|
AlineRinquin
|
d08399693d
|
koehfozh
|
2022-02-25 16:59:15 +01:00 |
|
AlineRinquin
|
3e814174ed
|
Merge pull request #52 from AlineRinquin/cecile
Cecile
|
2022-02-25 16:58:35 +01:00 |
|
AlineRinquin
|
03ec7ffe92
|
Merge branch 'dev' into cecile
|
2022-02-25 16:58:21 +01:00 |
|
AlineRinquin
|
4e7444f093
|
Merge pull request #51 from AlineRinquin/aline
dasboard pas fini et modif addmembre
|
2022-02-25 16:32:04 +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 |
|
AlineRinquin
|
5907b69046
|
Merge pull request #50 from AlineRinquin/blandine
deconnexion button + nav bar fixed
|
2022-02-25 14:32:57 +01:00 |
|
Blandine Bajard
|
eac32838d6
|
deconnexion button + nav bar fixed
|
2022-02-25 12:52:25 +01:00 |
|
AlineRinquin
|
9e40a5ff68
|
Merge pull request #49 from AlineRinquin/blandine
interceptor et guards
|
2022-02-25 10:56:56 +01:00 |
|
Blandine Bajard
|
771c14e7f2
|
interceptor et guards
|
2022-02-25 10:55:33 +01:00 |
|
AlineRinquin
|
75df7b456a
|
Merge pull request #47 from AlineRinquin/blandine
fixed-update-menu
|
2022-02-25 10:51:04 +01:00 |
|
AlineRinquin
|
cac2d1b5b8
|
Merge pull request #48 from AlineRinquin/sana
Sana
|
2022-02-25 10:50:38 +01:00 |
|
Sana EL HIRI
|
466a146174
|
add member avec role ok account récupère les membre en focntion de la team
|
2022-02-25 09:52:06 +01:00 |
|
Blandine Bajard
|
f8bb12cc3a
|
fixed-update-menu
|
2022-02-24 17:44:28 +01:00 |
|
cecilesimplon93
|
530cd73b3f
|
ça devrait le faire
|
2022-02-24 15:21:36 +01:00 |
|
Sana EL HIRI
|
7784870446
|
Merge branch 'dev' into sana
|
2022-02-24 15:13:53 +01:00 |
|
Sana EL HIRI
|
591411bbaa
|
commit to merge
|
2022-02-24 15:13:21 +01:00 |
|
AlineRinquin
|
1f644da5b9
|
Merge pull request #46 from AlineRinquin/aline
dasboard pas fini
|
2022-02-24 15:07:11 +01:00 |
|
AlineRinquin
|
d0519247e0
|
dasboard pas fini
|
2022-02-24 15:05:47 +01:00 |
|
AlineRinquin
|
6da3c9026d
|
Merge pull request #45 from AlineRinquin/blandine
Blandine
|
2022-02-24 15:02:20 +01:00 |
|
Blandine Bajard
|
6e013f3ffe
|
menus de la semaine terminés
|
2022-02-24 15:01:22 +01:00 |
|
cecilesimplon93
|
c8b13f2de6
|
Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into cecile
|
2022-02-24 15:01:00 +01:00 |
|
Blandine Bajard
|
9c239bdaac
|
menus de la semaine terminé
|
2022-02-24 15:00:33 +01:00 |
|
cecilesimplon93
|
923a7507e9
|
ajout formulaire page-support, pas de ts
|
2022-02-23 20:41:02 +01:00 |
|
Blandine Bajard
|
3515e87f13
|
Merge branch 'blandine' of https://github.com/AlineRinquin/organizee-front into blandine
|
2022-02-18 18:09:24 +01:00 |
|
Blandine Bajard
|
6dc16ea103
|
Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into blandine
|
2022-02-18 18:09:14 +01:00 |
|
Blandine Bajard
|
b2f01ab493
|
merde
|
2022-02-18 18:00:49 +01:00 |
|
Blandine Bajard
|
c55e0e93b1
|
Merge pull request #43 from AlineRinquin/dev
Merge pull request #42 from AlineRinquin/blandine
|
2022-02-18 18:00:07 +01:00 |
|
Blandine Bajard
|
55c72fccc6
|
Merge pull request #42 from AlineRinquin/blandine
menus
|
2022-02-18 17:54:07 +01:00 |
|
Blandine Bajard
|
e40a927044
|
Merge branch 'dev' into blandine
|
2022-02-18 17:53:52 +01:00 |
|
Blandine Bajard
|
388804ae06
|
menus
|
2022-02-18 17:22:17 +01:00 |
|
cecilesimplon93
|
33052f54d1
|
Merge branch 'dev' into cecile
|
2022-02-18 17:10:11 +01:00 |
|
cecilesimplon93
|
76f26627bd
|
mise a jour wend
|
2022-02-18 17:05:29 +01:00 |
|
Sana EL HIRI
|
f9bf388ac7
|
Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into dev
|
2022-02-18 17:03:49 +01:00 |
|
Sana EL HIRI
|
156c9676c0
|
commit to merge
|
2022-02-18 17:00:14 +01:00 |
|
AlineRinquin
|
5a90969f71
|
Merge pull request #41 from AlineRinquin/calendrier
Calendrier
|
2022-02-18 16:38:08 +01:00 |
|
Hedi
|
c9c354360d
|
calendrier full
|
2022-02-18 16:34:29 +01:00 |
|
Hedi
|
83da5729e1
|
calendrier css
|
2022-02-18 16:27:46 +01:00 |
|