Commit graph

68 commits

Author SHA1 Message Date
Sana EL HIRI
1191176e25 avancées à merge 2022-03-04 15:50:51 +01:00
Sana EL HIRI
f2f790211c avancées sur update member/ page account ok / add Member ok 2022-03-03 21:59:06 +01:00
Blandine Bajard
d2cd689713 alerte sur menus et comment du code 2022-03-02 15:57:03 +01:00
Blandine Bajard
6c489a4fda Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into blandine 2022-03-01 17:32:23 +01:00
Blandine Bajard
476cc12cc0 trucs de menu et token 2022-03-01 17:32:16 +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
HarmandI
59b55b35a7 Toutes les fonctionnalités to do list ok 2022-02-27 15:51:53 +01:00
Hedi MJID
1d8eb27df0 refacto forgot/reset password 2022-02-26 19:23:13 +01:00
Hedi MJID
9b3c02f6c1 tracking files 2022-02-26 14:19:27 +01:00
Sana EL HIRI
21e076b1ee addMember envoi de mail ok 2022-02-25 18:52:30 +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
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
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
Blandine Bajard
9c239bdaac menus de la semaine terminé 2022-02-24 15:00:33 +01:00
Blandine Bajard
b2f01ab493 merde 2022-02-18 18:00:49 +01:00
Blandine Bajard
388804ae06 menus 2022-02-18 17:22:17 +01:00
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