Sana EL HIRI
|
4d7fe28e41
|
Merge branch 'dev' of https://github.com/HediMjid/Organizee into dev
|
2022-02-18 17:46:23 +01:00 |
|
Sana EL HIRI
|
06e48caac7
|
merge conflicts
|
2022-02-18 17:46:14 +01:00 |
|
Blandine Bajard
|
8f4fd71e4b
|
Merge pull request #38 from HediMjid/Blandine
Blandine
|
2022-02-18 17:41:43 +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
|
ddb81b5734
|
Merge branch 'sana' into dev
|
2022-02-18 17:29:54 +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
|
a5a2c625e2
|
Merge pull request #33 from HediMjid/aline
modification du controleur contact et du controler membre
|
2022-02-18 17:17:31 +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
|
1498fadb3f
|
Merge pull request #32 from HediMjid/aline
re push pull du projet avec les modfs
|
2022-02-18 11:45:57 +01:00 |
|
AlineRinquin
|
34722797ee
|
re push pull du projet avec les modfs
|
2022-02-17 14:40:45 +01:00 |
|
Blandine Bajard
|
ab30810e07
|
Merge pull request #31 from HediMjid/Blandine
Blandine
|
2022-02-17 11:43:22 +01:00 |
|
Blandine Bajard
|
9c72f95494
|
addMenu
|
2022-02-17 11:42:52 +01:00 |
|
Blandine Bajard
|
e83810c9fd
|
Merge branch 'dev' of https://github.com/HediMjid/Organizee into Blandine
|
2022-02-17 11:42:24 +01:00 |
|
Blandine Bajard
|
d42c2ea70c
|
Merge pull request #30 from HediMjid/isa
Isa
|
2022-02-17 11:41:21 +01:00 |
|
Blandine Bajard
|
b93dc104cf
|
Merge pull request #28 from HediMjid/aline
Aline
|
2022-02-17 11:39:41 +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 |
|
Sana EL HIRI
|
cea4ee8690
|
merge conflicts
|
2022-02-17 10:00:18 +01:00 |
|
HarmandI
|
31ec70f02e
|
addTache
|
2022-02-15 15:39:35 +01:00 |
|
HarmandI
|
56218bd8c5
|
Merge branch 'dev' of https://github.com/HediMjid/Organizee into isa
|
2022-02-14 11:21:45 +01:00 |
|
Blandine Bajard
|
7aebd9f88d
|
Merge branch 'dev' of https://github.com/HediMjid/Organizee into Blandine
|
2022-02-14 11:20:15 +01:00 |
|
AlineRinquin
|
9b5a8c065c
|
Merge branch 'dev' into aline
|
2022-02-13 14:40:40 +01:00 |
|
AlineRinquin
|
8a96240fd6
|
ALINE:controller contact blocage préauthorize
|
2022-02-13 14:39:49 +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 |
|
HarmandI
|
1e78b6e449
|
Merge branch 'dev' of https://github.com/HediMjid/Organizee into isa
|
2022-02-05 15:27:27 +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 |
|
AlineRinquin
|
0f55e66702
|
Merge branch 'dev' of https://github.com/HediMjid/Organizee into aline
|
2022-01-22 14:15:40 +01:00 |
|
HarmandI
|
e058a34066
|
Merge branch 'dev' of https://github.com/HediMjid/Organizee into isa
|
2022-01-22 08:07:39 +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 |
|