Commit Graph

45 Commits

Author SHA1 Message Date
Sana EL HIRI
4184e613da commit to merge 2022-02-14 16:44:34 +01:00
AlineRinquin
7bed54db11
Merge pull request #23 from AlineRinquin/aline
fonction delete ok
2022-02-14 15:52:26 +01:00
AlineRinquin
4144bc5f3e fonction delete ok 2022-02-14 15:51:13 +01:00
Blandine Bajard
d89214db19 component meteo 2022-02-14 12:59:15 +01:00
Blandine Bajard
2f5705e766 page d'accueil fixed 2022-02-14 12:25:49 +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
cecilesimplon93
f26ce2eaf2 page404 2022-02-11 11:10:13 +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
Blandine Bajard
0633d6ae6d page d'accueil 2022-01-31 18:18:03 +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
88fd522f00 css component header 2022-01-25 17:46:18 +01:00
Blandine Bajard
5df6f6f46e css component signin 2022-01-25 17:18:51 +01:00
AlineRinquin
a545bf5a25
Merge pull request #15 from AlineRinquin/aline
ajout des commentaires manquants sur le code
2022-01-23 15:18:13 +01:00
AlineRinquin
595ead0e74 ajout des commentaires manquants sur le code 2022-01-23 15:17:39 +01:00
AlineRinquin
de17b0d925
Merge pull request #14 from AlineRinquin/blandine
Blandine
2022-01-23 15:14:35 +01:00
AlineRinquin
a723a02a56 Fonctionn modifier contact ok 2022-01-23 15:08:17 +01:00
Blandine Bajard
79a6165196 css signup 2022-01-23 12:00:11 +01:00
Blandine Bajard
7102d73f89 reset-password terminé 2022-01-23 09:18:57 +01:00
AlineRinquin
0390c45886 recup du stach et fonctionalitée modifier contact 2022-01-22 14:57:04 +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
6623310501
Merge branch 'dev' into cecile 2022-01-21 15:04:53 +01:00
AlineRinquin
241b71e566
Merge pull request #10 from AlineRinquin/sana
creation-team connection back ok
2022-01-21 14:59:46 +01:00
AlineRinquin
0550e1b239
Merge pull request #9 from AlineRinquin/blandine
Blandine
2022-01-21 14:58:50 +01:00
cecilesimplon93
080a694838 page 404 2022-01-21 14:55:35 +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
50f5b00b52 creation-team connection back ok 2022-01-21 12:56:22 +01:00
Blandine Bajard
20459365ee corrections 2022-01-21 12:54:22 +01:00
Blandine Bajard
22af2a20ba ok 2022-01-21 12:45:59 +01:00
Blandine Bajard
b994e6be58 reset password en cours 2022-01-21 12:30:05 +01:00
AlineRinquin
219636bc75
Merge branch 'dev' into blandine 2022-01-21 09:49:16 +01:00
AlineRinquin
a650aaf3d8
Merge branch 'dev' into sana 2022-01-21 09:45:22 +01:00
AlineRinquin
60a12b50ad
Merge pull request #4 from AlineRinquin/isa
Isa
2022-01-21 09:43:52 +01:00
HarmandI
5904f64103 début add Member 2022-01-20 18:01:32 +01:00
Sana EL HIRI
a344348b7a creation-team incomplet 2022-01-20 17:58:46 +01:00
Blandine Bajard
673887a81c forgot-pwd + signup 2022-01-20 17:58:18 +01:00
AlineRinquin
4a55d75da7 mise en place du html et lien vers le back de repertoire 2022-01-20 17:30:17 +01:00
AlineRinquin
68e1df8eb7 authentification / signup /signin 2022-01-19 16:14:55 +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
AlineRinquin
b9f9f5fb3f initial commit 2022-01-18 16:11:37 +01:00