Sana EL HIRI
|
c189362601
|
Membre
|
2022-02-18 17:21:07 +01:00 |
|
Sana EL HIRI
|
c49c926f3d
|
Merge branch 'dev' into sana
|
2022-02-18 12:02:43 +01:00 |
|
Sana EL HIRI
|
10eea5717b
|
Merge branch 'dev' of https://github.com/HediMjid/Organizee into dev
|
2022-02-18 12:02:04 +01:00 |
|
Sana EL HIRI
|
b9d3288a28
|
commit to merge
|
2022-02-18 12:01:55 +01:00 |
|
AlineRinquin
|
34722797ee
|
re push pull du projet avec les modfs
|
2022-02-17 14:40:45 +01:00 |
|
Blandine Bajard
|
9c72f95494
|
addMenu
|
2022-02-17 11:42:52 +01:00 |
|
Blandine Bajard
|
d42c2ea70c
|
Merge pull request #30 from HediMjid/isa
Isa
|
2022-02-17 11:41:21 +01:00 |
|
HarmandI
|
eb7b7777ec
|
update tache
|
2022-02-17 11:38:46 +01:00 |
|
AlineRinquin
|
54bf69a436
|
modification des contact ajout couleur
|
2022-02-17 10:40:56 +01:00 |
|
Sana EL HIRI
|
6cb4097588
|
merge conflicts
|
2022-02-17 10:16:32 +01:00 |
|
HarmandI
|
31ec70f02e
|
addTache
|
2022-02-15 15:39:35 +01:00 |
|
Hédi
|
5b6ccff43d
|
Merge pull request #27 from HediMjid/jwt-claim
jwt : ajout du userId et du teamId dans le token
|
2022-02-10 12:40:53 +01:00 |
|
Hédi
|
caa0e896bd
|
Merge pull request #24 from HediMjid/calendrier
calendrier : modif model + repository + controller
|
2022-02-09 12:05:12 +01:00 |
|
Hedi
|
e5bd670998
|
jwt : ajout du userId et du teamId dans le token
|
2022-02-06 22:50:59 +01:00 |
|
Hedi
|
7c352cad95
|
calendrier : modif model + repository + controller
|
2022-02-05 15:36:35 +01:00 |
|
Hedi MJID
|
ce88e646fd
|
fix destinataire mail
|
2022-02-01 16:06:16 +01:00 |
|
Hedi MJID
|
382b1052d4
|
commentaires
|
2022-02-01 09:44:35 +01:00 |
|
Hedi
|
aece88e2a8
|
fix des class pour eviter la recursivité de certain en json
|
2022-01-30 19:15:01 +01:00 |
|
Hedi
|
f23b0fbb87
|
modif route controller mail
|
2022-01-28 12:08:49 +01:00 |
|
Hedi
|
b47c3fdf6d
|
feat(mail):ajout d'envoi de mail au format text, HTML, avec piece jointe
|
2022-01-24 23:06:27 +01:00 |
|
Hedi
|
fbc5d83780
|
fix merge bis
|
2022-01-21 18:33:37 +01:00 |
|
Hedi
|
0ea451d9ea
|
fix merge
|
2022-01-21 18:22:14 +01:00 |
|
Sana EL HIRI
|
295d041fb8
|
Merge branch 'dev' into sana
|
2022-01-21 14:54:04 +01:00 |
|
Sana EL HIRI
|
347665ec75
|
Merge branch 'dev' of https://github.com/HediMjid/Organizee into dev
|
2022-01-21 14:53:43 +01:00 |
|
Sana EL HIRI
|
5af749ddb2
|
push obligatoire ne pas merger ma branche
|
2022-01-21 14:53:13 +01:00 |
|
Blandine Bajard
|
657a31cc63
|
modif methode sign-up et controller membre et model membre
|
2022-01-21 14:47:59 +01:00 |
|
Hedi
|
094a61951a
|
fix: pb update en cascade, ajout de Tache et Todolist (class et repository)
|
2022-01-21 14:45:37 +01:00 |
|
Sana EL HIRI
|
93e388b443
|
Merge branch 'dev' of https://github.com/HediMjid/Organizee into dev
|
2022-01-21 13:02:51 +01:00 |
|
Blandine Bajard
|
8d481cece8
|
reset password fonctionne
|
2022-01-21 12:55:15 +01:00 |
|
Blandine Bajard
|
63e8f73f4e
|
sign-up + forgot-password + rester-pwd non complet
|
2022-01-20 17:57:00 +01:00 |
|
Sana EL HIRI
|
270376f7e3
|
pb merge
|
2022-01-20 09:48:24 +01:00 |
|
Hedi
|
bb448eee1c
|
Merge branch 'main' of https://github.com/HediMjid/Organizee into hedii
|
2022-01-20 09:45:38 +01:00 |
|
Hedi
|
096e907446
|
debut de tache controller
|
2022-01-20 09:41:07 +01:00 |
|
Sana EL HIRI
|
4c700c979e
|
commit pour pull
|
2022-01-20 09:37:11 +01:00 |
|
Blandine Bajard
|
90498a2cd1
|
menu controller et repo
|
2022-01-19 16:01:44 +01:00 |
|
Blandine Bajard
|
f164000cc8
|
securite token jwt
|
2022-01-19 15:18:21 +01:00 |
|
Hédi
|
2c243ae900
|
Merge pull request #9 from HediMjid/hedii
Team : class et controller
|
2022-01-19 10:25:21 +01:00 |
|
Blandine Bajard
|
f6afef809d
|
contact controller et repo
|
2022-01-19 10:22:28 +01:00 |
|
Hedi
|
f4bc0dffe7
|
Team : class et controller
|
2022-01-19 09:33:38 +01:00 |
|
Hedi
|
48c83433b8
|
Modif class/repo/controller
|
2022-01-14 14:20:32 +01:00 |
|
Hedi
|
0c0f9467f1
|
comment
|
2022-01-08 18:46:36 +01:00 |
|
Hedi
|
cb3218ac1e
|
sans properties
|
2022-01-08 18:39:36 +01:00 |
|
Hedi
|
1ed8373359
|
modif class membre et team
|
2022-01-08 18:32:16 +01:00 |
|
Hedi
|
af3700e99a
|
Modif class Membre : modification de la jointure
Modif Controller Membre : ajout de methode delete et add
|
2021-12-22 10:40:06 +01:00 |
|
Hedi
|
b3c5c08a9d
|
moins les properties
|
2021-12-14 16:13:36 +01:00 |
|
Hedi
|
8895d30b22
|
Ajout class+controller
|
2021-12-14 16:11:23 +01:00 |
|
Hedi
|
75dbe1c4b8
|
controller
|
2021-12-14 10:04:50 +01:00 |
|
Hedi
|
fb162d97bd
|
test
|
2021-12-14 09:22:59 +01:00 |
|
Hedi
|
acf16bcc1e
|
Merge branch 'hedii' of https://github.com/HediMjid/Organizee into hedii
|
2021-12-14 09:22:30 +01:00 |
|
Hedi
|
8d36e19c89
|
test
|
2021-12-14 09:19:30 +01:00 |
|