Blandine Bajard
|
7aebd9f88d
|
Merge branch 'dev' of https://github.com/HediMjid/Organizee into Blandine
|
2022-02-14 11:20:15 +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
|
08ed00a7b7
|
Merge pull request #25 from HediMjid/hedii
|
2022-02-09 21:30:54 +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 |
|
Hédi
|
bedffd0881
|
Merge pull request #23 from HediMjid/hedii
on croise les doigts
|
2022-02-02 15:54:13 +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 |
|
Hédi
|
c383149822
|
Merge pull request #22 from HediMjid/feature-send-email
Feature send email
|
2022-01-28 15:28:30 +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 |
|
Blandine Bajard
|
48e9cc5816
|
Merge branch 'dev' of https://github.com/HediMjid/Organizee into Blandine
|
2022-01-23 12:11:10 +01:00 |
|
Hedi
|
165da07728
|
fix merge bis
|
2022-01-23 12:09:17 +01:00 |
|
Blandine Bajard
|
865a5847cc
|
modif methode sign-up et controller membre et model membre
|
2022-01-23 12:09:16 +01:00 |
|
Hedi
|
c33d1282c7
|
fix: pb update en cascade, ajout de Tache et Todolist (class et repository)
|
2022-01-23 12:09:10 +01:00 |
|
Hedi
|
6c69774bb1
|
debut de tache controller
|
2022-01-23 12:08:59 +01:00 |
|
Hédi
|
50de4e00d4
|
Merge pull request #21 from HediMjid/hedii
normalement, ça passe !
|
2022-01-21 18:39:49 +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 |
|
Blandine Bajard
|
ba0cb8c258
|
Merge pull request #20 from HediMjid/blandine
modif methode sign-up et controller membre et model membre
|
2022-01-21 14:49:05 +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 |
|
Blandine Bajard
|
61bc862d0f
|
Merge pull request #19 from HediMjid/Blandine
reset password fonctionne
|
2022-01-21 12:56:39 +01:00 |
|
Blandine Bajard
|
8d481cece8
|
reset password fonctionne
|
2022-01-21 12:55:15 +01:00 |
|
Blandine Bajard
|
b6c5adb262
|
Merge pull request #18 from HediMjid/Blandine
sign-up + forgot-password + rester-pwd non complet
|
2022-01-21 09:34:42 +01:00 |
|
Blandine Bajard
|
63e8f73f4e
|
sign-up + forgot-password + rester-pwd non complet
|
2022-01-20 17:57:00 +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 |
|
Blandine Bajard
|
b147bc406c
|
Merge pull request #17 from HediMjid/dev
Dev maj 20-01-22
|
2022-01-20 09:35:38 +01:00 |
|
Blandine Bajard
|
275880850d
|
Merge pull request #16 from HediMjid/Blandine
menu controller et repo
|
2022-01-19 16:04:08 +01:00 |
|
Blandine Bajard
|
90498a2cd1
|
menu controller et repo
|
2022-01-19 16:01:44 +01:00 |
|
Blandine Bajard
|
6e0b40e4b8
|
Merge pull request #15 from HediMjid/Blandine
security token jwt
|
2022-01-19 15:19:23 +01:00 |
|
Blandine Bajard
|
f164000cc8
|
securite token jwt
|
2022-01-19 15:18:21 +01:00 |
|
Hédi
|
c464ed495b
|
Merge pull request #14 from HediMjid/dev
Dev
|
2022-01-19 11:36:29 +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
|
8d30dae023
|
Merge pull request #8 from HediMjid/Blandine
contact controller et repo
|
2022-01-19 10:25:00 +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 |
|
Hédi
|
456e44af4d
|
Merge pull request #7 from HediMjid/dev
Dev
|
2022-01-14 14:25:59 +01:00 |
|
Hédi
|
737cc56f6c
|
Merge pull request #6 from HediMjid/hedii
Modif class/repo/controller
|
2022-01-14 14:22:56 +01:00 |
|
Hedi
|
48c83433b8
|
Modif class/repo/controller
|
2022-01-14 14:20:32 +01:00 |
|
Hedi
|
93c3ae454d
|
rm properties
|
2022-01-08 18:54:53 +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 |
|
Hédi
|
d4208af0e2
|
Merge pull request #4 from HediMjid/hedii
modif class membre et team
|
2022-01-08 18:34:20 +01:00 |
|
Hedi
|
1ed8373359
|
modif class membre et team
|
2022-01-08 18:32:16 +01:00 |
|
HediMjid
|
5889217f2d
|
Merge pull request #3 from HediMjid/hedii
Modif class Membre : modification de la jointure
|
2022-01-06 16:47:48 +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 |
|