Commit graph

27 commits

Author SHA1 Message Date
Hedi
4f624bf33f initialisation du calendrier 2022-02-18 16:08:47 +01:00
Hedi
cce97527b5 modif 2022-02-18 14:27:37 +01:00
AlineRinquin
2596418c94 fix conflicts 2022-02-18 10:59:57 +01:00
Hedi
53119ea28a package 2022-02-18 10:56:09 +01:00
AlineRinquin
6504d28c4b
Merge branch 'dev' into cecile 2022-02-18 10:39:22 +01:00
Sana EL HIRI
0d4ac5606b card membre 2022-02-16 19:18:24 +01:00
cecilesimplon93
72d0c77dd3 finalisation humeurs, mise en place plan du site 2022-02-16 17:50:53 +01:00
cecilesimplon93
50ef04ca86 page 404 et début choix humeur 2022-02-15 15:46:31 +01:00
Blandine Bajard
6e68de9f3a token service 2022-02-15 15:18:07 +01:00
AlineRinquin
42b5ac19ef
Merge branch 'dev' into sana 2022-02-14 16:38:15 +01:00
Sana EL HIRI
5df5d379f8 avancées tickets account et membre 2 2022-02-14 16:33:26 +01:00
Sana EL HIRI
e53a9a062d Team crud Ok connection Back Ok 2022-02-14 11:47:09 +01:00
Hedi MJID
3f2bfd26c6 fix pb avec le app.module 2022-02-11 16:08:59 +01:00
AlineRinquin
ceaec59c0d
Merge branch 'dev' into page404 2022-02-11 11:50:57 +01:00
Sana EL HIRI
ae1fc13951 removed merge conflicts 2022-02-09 17:55:44 +01:00
cecilesimplon93
3be268bfdb page-not-found semble ok 2022-02-02 16:28:52 +01:00
AlineRinquin
52ff29ca30
Merge pull request #17 from AlineRinquin/isa
ToDoList version1 front
2022-01-31 09:22:43 +01:00
HarmandI
9287f531d2 ToDoList version1 front 2022-01-30 20:23:15 +01:00
Blandine Bajard
7102d73f89 reset-password terminé 2022-01-23 09:18:57 +01:00
Sana EL HIRI
efa5bb8d22 Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into dev 2022-01-21 15:10:38 +01:00
Sana EL HIRI
1ffd4ad2ee dev 2022-01-21 15:10:24 +01:00
AlineRinquin
f330dc901a
Merge branch 'dev' into aline 2022-01-21 14:54:29 +01:00
AlineRinquin
cde96f2bb6 fonctionalitée ajout contact ok 2022-01-21 14:02:57 +01:00
Sana EL HIRI
a344348b7a creation-team incomplet 2022-01-20 17:58:46 +01:00
AlineRinquin
68e1df8eb7 authentification / signup /signin 2022-01-19 16:14:55 +01:00
AlineRinquin
6f9112ee91 initialisation de l'application 2022-01-18 17:12:04 +01:00
AlineRinquin
b9f9f5fb3f initial commit 2022-01-18 16:11:37 +01:00