AlineRinquin
|
174c3fd77f
|
Merge pull request #62 from AlineRinquin/login-message
affichage de message d erreur lors du login
|
2022-02-27 18:07:00 +01:00 |
|
Hedi
|
b0c15f976b
|
affichage de message d erreur lors du login
|
2022-02-27 17:55:42 +01:00 |
|
AlineRinquin
|
547740dd44
|
Merge pull request #61 from AlineRinquin/calendrier
Calendrier
|
2022-02-27 16:38:53 +01:00 |
|
AlineRinquin
|
46a6e3b506
|
Merge pull request #60 from AlineRinquin/isa2
Toutes les fonctionnalités to do list ok
|
2022-02-27 16:28:24 +01:00 |
|
Hedi
|
bd3ee44a1d
|
merge avec dev
|
2022-02-27 15:56:01 +01:00 |
|
HarmandI
|
59b55b35a7
|
Toutes les fonctionnalités to do list ok
|
2022-02-27 15:51:53 +01:00 |
|
Hedi
|
b3b724ecf0
|
update resizing event
|
2022-02-27 15:13:50 +01:00 |
|
AlineRinquin
|
4aa5469a04
|
Merge pull request #59 from AlineRinquin/forgot-reset-password
Forgot reset password
|
2022-02-27 14:53:05 +01:00 |
|
Hedi MJID
|
e997e0541d
|
ajout de la redirection apres le new password
|
2022-02-26 19:35:51 +01:00 |
|
Hedi MJID
|
1d8eb27df0
|
refacto forgot/reset password
|
2022-02-26 19:23:13 +01:00 |
|
AlineRinquin
|
c9d964f7dc
|
Merge pull request #58 from AlineRinquin/aline
Aline
|
2022-02-26 17:50:09 +01:00 |
|
AlineRinquin
|
4386c4b474
|
redirection page acceuil et miseen place de privation d'action si enfant
|
2022-02-26 17:48:12 +01:00 |
|
Hedi MJID
|
9501ab5c47
|
Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into dev
|
2022-02-26 15:03:06 +01:00 |
|
Hedi MJID
|
e7b153e1a0
|
+appmodule - humeur
|
2022-02-26 14:33:18 +01:00 |
|
Hedi MJID
|
9b3c02f6c1
|
tracking files
|
2022-02-26 14:19:27 +01:00 |
|
Hedi MJID
|
c0a89e1868
|
update agenda + team service
|
2022-02-26 14:17:47 +01:00 |
|
AlineRinquin
|
1d4a2c957c
|
Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into aline
|
2022-02-26 12:58:57 +01:00 |
|
AlineRinquin
|
3c16eadc69
|
app module
|
2022-02-26 12:58:39 +01:00 |
|
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
|
55101f50dd
|
Merge pull request #44 from AlineRinquin/cecile
Cecile
|
2022-02-25 10:51:41 +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 |
|