Commit graph

47 commits

Author SHA1 Message Date
Hedi
42f486e66a calendrier service 2022-02-18 16:16:55 +01:00
AlineRinquin
b66b59badc
Merge branch 'dev' into isa 2022-02-17 10:24:53 +01:00
AlineRinquin
30fa1f7de5
Merge pull request #33 from AlineRinquin/aline
Ajout des couleurs et un peu css
2022-02-17 10:22:54 +01:00
AlineRinquin
60c1753ea4
Merge branch 'dev' into sana 2022-02-17 10:22:14 +01:00
AlineRinquin
49049bc255 Ajout des couleurs et un peu css 2022-02-17 10:14:20 +01:00
HarmandI
82321df395 update tache 2022-02-17 09:44:18 +01:00
Sana EL HIRI
0d4ac5606b card membre 2022-02-16 19:18:24 +01:00
AlineRinquin
a3b89e4043
Merge branch 'dev' into blandine 2022-02-16 17:32:57 +01:00
Blandine Bajard
d892e3ff93 modif token service + addMenu en modal 2022-02-16 17:31:18 +01:00
AlineRinquin
a9970a50eb
Merge pull request #30 from AlineRinquin/isa
lili
2022-02-16 15:45:23 +01:00
HarmandI
1bed92a6e4 mise à jour de ma branche 2022-02-16 15:32:19 +01:00
AlineRinquin
0244cb29ea ajout contact 2022-02-16 15:20:23 +01:00
AlineRinquin
f284206787
Merge pull request #28 from AlineRinquin/aline
Aline
2022-02-15 15:39:14 +01:00
AlineRinquin
25830750bd
Merge pull request #27 from AlineRinquin/blandine
Blandine
2022-02-15 15:38:25 +01:00
Blandine Bajard
6e68de9f3a token service 2022-02-15 15:18:07 +01:00
AlineRinquin
fea0ac9524
Merge pull request #26 from AlineRinquin/isa
Isa
2022-02-15 15:04:50 +01:00
HarmandI
507edc6151 Add tache ok 2022-02-15 15:03:35 +01:00
AlineRinquin
98374d8a47 merge conflicts 2022-02-15 14:01:50 +01:00
Blandine Bajard
a2fd96e6a4 Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into blandine 2022-02-15 13:58:26 +01:00
AlineRinquin
61cacda89b fonction delete 2022-02-15 13:58:06 +01:00
Blandine Bajard
26032019c5 menu service 2022-02-15 13:57:42 +01:00
Sana EL HIRI
026ac42818 Side bar css ok avancées sur ticket page account et page membreetc 2022-02-14 15:45:32 +01:00
Sana EL HIRI
e53a9a062d Team crud Ok connection Back Ok 2022-02-14 11:47:09 +01:00
HarmandI
efb86420d0 todo en cours 2022-02-14 11:28:50 +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
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
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
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
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