Blandine Bajard
|
02bd8f36c0
|
comment des authorize sur menus
|
2022-03-11 14:47:34 +01:00 |
|
Blandine Bajard
|
787d7dda37
|
decomment des pre autorize
|
2022-03-07 16:28:32 +01:00 |
|
Blandine Bajard
|
4282b09307
|
Merge pull request #53 from HediMjid/sana
modif pour que le find membre by team ne récupère pas les membres sof…
|
2022-03-07 15:04:56 +01:00 |
|
Sana EL HIRI
|
901247fb99
|
modif pour que le find membre by team ne récupère pas les membres soft deleted
|
2022-03-06 20:52:38 +01:00 |
|
cecilesimplon93
|
aaa3ba5333
|
modif smiley avec bdd
|
2022-03-06 15:48:43 +01:00 |
|
Sana EL HIRI
|
3f00f674ca
|
avancées
|
2022-03-04 16:11:48 +01:00 |
|
Sana EL HIRI
|
20382c2d1b
|
modif team et membre controller
|
2022-03-02 19:18:33 +01:00 |
|
Blandine Bajard
|
057530cb29
|
Merge branch 'dev' of https://github.com/HediMjid/Organizee into Blandine
|
2022-03-01 17:45:58 +01:00 |
|
Blandine Bajard
|
ff1df20b1f
|
order by date menu
|
2022-03-01 17:45:51 +01:00 |
|
Hédi
|
69483609d8
|
Merge pull request #46 from HediMjid/isa
add to do list
|
2022-02-27 18:04:20 +01:00 |
|
HarmandI
|
4f7834a9a6
|
add to do list
|
2022-02-27 17:27:47 +01:00 |
|
Hedi MJID
|
d56a795854
|
refacto forget/reset password
|
2022-02-26 19:21:50 +01:00 |
|
Sana EL HIRI
|
c6e0aa036a
|
ajout crossOrgins sur mail
|
2022-02-25 18:53:57 +01:00 |
|
Sana EL HIRI
|
695d3c1078
|
ajout post add membre en plus de signup et modifs repo et service
|
2022-02-25 09:54:59 +01:00 |
|
Sana EL HIRI
|
65f87cf85b
|
Merge branch 'dev' into sana
|
2022-02-24 15:02:54 +01:00 |
|
Sana EL HIRI
|
e7d0757d49
|
commit to merge
|
2022-02-24 15:01:56 +01:00 |
|
Blandine Bajard
|
87bbec1ba1
|
changement back sur le menu
|
2022-02-24 12:14:50 +01:00 |
|
AlineRinquin
|
6cabcc4d22
|
Merge branch 'dev' into sana
|
2022-02-18 18:01:46 +01:00 |
|
AlineRinquin
|
bc5a22186f
|
push de a branch
|
2022-02-18 17:56:52 +01:00 |
|
AlineRinquin
|
287deb99e5
|
controler hors du dto
|
2022-02-18 17:51:34 +01:00 |
|
Blandine Bajard
|
8e43bd59aa
|
Merge branch 'dev' of https://github.com/HediMjid/Organizee into Blandine
|
2022-02-18 17:39:33 +01:00 |
|
Sana EL HIRI
|
c189362601
|
Membre
|
2022-02-18 17:21:07 +01:00 |
|
Blandine Bajard
|
623c744ee9
|
menus de la semaine
|
2022-02-18 17:19:15 +01:00 |
|
AlineRinquin
|
b87499ba73
|
modification du controleur contact et du controler membre
|
2022-02-18 17:16:53 +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 |
|