Commit Graph

Select branches

Hide Pull Requests

main

Mono Color

• edeafa7151
  Merge pull request #62 from HediMjid/dev main Blandine Bajard 2022-03-14 09:53:55 +0100
• 445d318559
  Merge pull request #61 from HediMjid/sana Blandine Bajard 2022-03-14 09:51:53 +0100
• f731ae78fc coms Sana EL HIRI 2022-03-13 18:44:53 +0100
• f76c5b9692
  Merge pull request #58 from HediMjid/Blandine Blandine Bajard 2022-03-11 16:28:59 +0100
• 48c5d6d91f fichier sql Blandine Bajard 2022-03-11 16:27:23 +0100
• 0eccc45c56
  Merge pull request #56 from HediMjid/sana AlineRinquin 2022-03-11 15:08:37 +0100
• 8f1117623b modifs Sana EL HIRI 2022-03-11 15:07:23 +0100
• 7f2dd8d9a2
  Merge pull request #55 from HediMjid/Blandine AlineRinquin 2022-03-11 14:53:00 +0100
• 02bd8f36c0 comment des authorize sur menus Blandine Bajard 2022-03-11 14:47:34 +0100
• 06deb6bc14
  Merge pull request #54 from HediMjid/Blandine Blandine Bajard 2022-03-07 16:44:59 +0100
• 787d7dda37 decomment des pre autorize Blandine Bajard 2022-03-07 16:28:32 +0100
• 3130169c84 Merge branch 'dev' of https://github.com/HediMjid/Organizee into sana Sana EL HIRI 2022-03-07 15:07:50 +0100
• 4282b09307
  Merge pull request #53 from HediMjid/sana Blandine Bajard 2022-03-07 15:04:56 +0100
• 05810f6031 Merge branch 'dev' of https://github.com/HediMjid/Organizee into sana Sana EL HIRI 2022-03-06 22:08:05 +0100
• 901247fb99 modif pour que le find membre by team ne récupère pas les membres soft deleted Sana EL HIRI 2022-03-06 20:52:38 +0100
• 4f38637cc4
  Merge pull request #52 from HediMjid/cecile Hédi 2022-03-06 19:12:10 +0100
• aaa3ba5333 modif smiley avec bdd cecilesimplon93 2022-03-06 15:48:43 +0100
• ce8c57b5ac cecile cecilesimplon93 2022-03-05 19:19:43 +0100
• 5ba2f1c9fd
  Merge pull request #51 from HediMjid/sana Blandine Bajard 2022-03-04 16:15:41 +0100
• 3f00f674ca avancées Sana EL HIRI 2022-03-04 16:11:48 +0100
• c2f2fcd23e
  Merge pull request #48 from HediMjid/sana Blandine Bajard 2022-03-03 09:48:22 +0100
• 20382c2d1b modif team et membre controller Sana EL HIRI 2022-03-02 19:18:33 +0100
• 294712656a
  Merge pull request #47 from HediMjid/Blandine Blandine Bajard 2022-03-01 18:00:42 +0100
• 057530cb29 Merge branch 'dev' of https://github.com/HediMjid/Organizee into Blandine Blandine Bajard 2022-03-01 17:45:58 +0100
• ff1df20b1f order by date menu Blandine Bajard 2022-03-01 17:45:51 +0100
• 9be7dc59e5 Merge branch 'dev' into cecile cecilesimplon93 2022-03-01 13:47:24 +0100
• 5f9c0acdc3 ajout humeur 1 par défaut cecilesimplon93 2022-03-01 13:46:09 +0100
• 69483609d8
  Merge pull request #46 from HediMjid/isa Hédi 2022-02-27 18:04:20 +0100
• 4f7834a9a6 add to do list HarmandI 2022-02-27 17:27:47 +0100
• cfbe212c88
  Merge pull request #45 from HediMjid/forgot-reset-password Hédi 2022-02-27 14:20:33 +0100
• d56a795854 refacto forget/reset password Hedi MJID 2022-02-26 19:21:50 +0100
• c9fcdb5764 Merge branch 'dev' of https://github.com/HediMjid/Organizee into dev Hedi MJID 2022-02-26 13:56:05 +0100
• a7b20b51e8
  Merge pull request #44 from HediMjid/sana AlineRinquin 2022-02-26 13:00:09 +0100
• c6e0aa036a ajout crossOrgins sur mail Sana EL HIRI 2022-02-25 18:53:57 +0100
• 5c92159b53
  Merge pull request #43 from HediMjid/sana Blandine Bajard 2022-02-25 09:57:31 +0100
• 695d3c1078 ajout post add membre en plus de signup et modifs repo et service Sana EL HIRI 2022-02-25 09:54:59 +0100
• 65f87cf85b Merge branch 'dev' into sana Sana EL HIRI 2022-02-24 15:02:54 +0100
• 127d8d72df Merge branch 'dev' of https://github.com/HediMjid/Organizee into dev Sana EL HIRI 2022-02-24 15:02:17 +0100
• e7d0757d49 commit to merge Sana EL HIRI 2022-02-24 15:01:56 +0100
• 156382fbff
  Merge pull request #42 from HediMjid/aline AlineRinquin 2022-02-24 15:00:35 +0100
• 03c8a9dfc3 data sql menu ajour AlineRinquin 2022-02-24 14:59:51 +0100
• 8ea0f6eca3 Merge branch 'dev' of https://github.com/HediMjid/Organizee into aline AlineRinquin 2022-02-24 13:35:40 +0100
• 45cecb0079 mise a jour fichier sana AlineRinquin 2022-02-24 13:35:05 +0100
• df2416a5ae
  Merge pull request #41 from HediMjid/Blandine Hédi 2022-02-24 12:32:33 +0100
• 87bbec1ba1 changement back sur le menu Blandine Bajard 2022-02-24 12:14:50 +0100
• 78a8b14bc9 Merge branch 'dev' of https://github.com/HediMjid/Organizee into dev Blandine Bajard 2022-02-18 18:06:23 +0100
• a91c4f652e merge conflicts Sana EL HIRI 2022-02-18 18:03:28 +0100
• bb5cd4b57b
  Merge pull request #35 from HediMjid/sana AlineRinquin 2022-02-18 18:01:54 +0100
• 6cabcc4d22
  Merge branch 'dev' into sana AlineRinquin 2022-02-18 18:01:46 +0100
• 3f1c30d8f9
  Merge pull request #40 from HediMjid/aline AlineRinquin 2022-02-18 17:57:35 +0100
• bc5a22186f push de a branch AlineRinquin 2022-02-18 17:56:52 +0100
• d5d186cefb Merge branch 'dev' of https://github.com/HediMjid/Organizee into dev Sana EL HIRI 2022-02-18 17:52:52 +0100
• a33f4a003c
  Merge pull request #39 from HediMjid/aline AlineRinquin 2022-02-18 17:52:30 +0100
• 287deb99e5 controler hors du dto AlineRinquin 2022-02-18 17:51:34 +0100
• 4d7fe28e41 Merge branch 'dev' of https://github.com/HediMjid/Organizee into dev Sana EL HIRI 2022-02-18 17:46:23 +0100
• 06e48caac7 merge conflicts Sana EL HIRI 2022-02-18 17:46:14 +0100
• 8f4fd71e4b
  Merge pull request #38 from HediMjid/Blandine Blandine Bajard 2022-02-18 17:41:43 +0100
• 8e43bd59aa Merge branch 'dev' of https://github.com/HediMjid/Organizee into Blandine Blandine Bajard 2022-02-18 17:39:33 +0100
• ddb81b5734 Merge branch 'sana' into dev Sana EL HIRI 2022-02-18 17:29:54 +0100
• a8f693a5cb Merge branch 'dev' of https://github.com/HediMjid/Organizee into dev Blandine Bajard 2022-02-18 17:29:51 +0100
• 2d4bfa7258 Merge branch 'Blandine' into dev Blandine Bajard 2022-02-18 17:29:12 +0100
• c189362601 Membre Sana EL HIRI 2022-02-18 17:21:07 +0100
• 623c744ee9 menus de la semaine Blandine Bajard 2022-02-18 17:19:15 +0100
• a5a2c625e2
  Merge pull request #33 from HediMjid/aline AlineRinquin 2022-02-18 17:17:31 +0100
• b87499ba73 modification du controleur contact et du controler membre AlineRinquin 2022-02-18 17:16:53 +0100
• c49c926f3d Merge branch 'dev' into sana Sana EL HIRI 2022-02-18 12:02:43 +0100
• 10eea5717b Merge branch 'dev' of https://github.com/HediMjid/Organizee into dev Sana EL HIRI 2022-02-18 12:02:04 +0100
• b9d3288a28 commit to merge Sana EL HIRI 2022-02-18 12:01:55 +0100
• 1498fadb3f
  Merge pull request #32 from HediMjid/aline AlineRinquin 2022-02-18 11:45:57 +0100
• 34722797ee re push pull du projet avec les modfs AlineRinquin 2022-02-17 14:40:45 +0100
• ab30810e07
  Merge pull request #31 from HediMjid/Blandine Blandine Bajard 2022-02-17 11:43:22 +0100
• 9c72f95494 addMenu Blandine Bajard 2022-02-17 11:42:52 +0100
• e83810c9fd Merge branch 'dev' of https://github.com/HediMjid/Organizee into Blandine Blandine Bajard 2022-02-17 11:42:24 +0100
• d42c2ea70c
  Merge pull request #30 from HediMjid/isa Blandine Bajard 2022-02-17 11:41:21 +0100
• b93dc104cf
  Merge pull request #28 from HediMjid/aline Blandine Bajard 2022-02-17 11:39:41 +0100
• eb7b7777ec update tache HarmandI 2022-02-17 11:38:46 +0100
• 54bf69a436 modification des contact ajout couleur AlineRinquin 2022-02-17 10:40:56 +0100
• 6cb4097588 merge conflicts Sana EL HIRI 2022-02-17 10:16:32 +0100
• cea4ee8690 merge conflicts Sana EL HIRI 2022-02-17 10:00:18 +0100
• 31ec70f02e addTache HarmandI 2022-02-15 15:39:35 +0100
• 56218bd8c5 Merge branch 'dev' of https://github.com/HediMjid/Organizee into isa HarmandI 2022-02-14 11:21:45 +0100
• 7aebd9f88d Merge branch 'dev' of https://github.com/HediMjid/Organizee into Blandine Blandine Bajard 2022-02-14 11:20:15 +0100
• 9b5a8c065c Merge branch 'dev' into aline AlineRinquin 2022-02-13 14:40:40 +0100
• 8a96240fd6 ALINE:controller contact blocage préauthorize AlineRinquin 2022-02-13 14:39:49 +0100
• 5b6ccff43d
  Merge pull request #27 from HediMjid/jwt-claim Hédi 2022-02-10 12:40:53 +0100
• 08ed00a7b7
  Merge pull request #25 from HediMjid/hedii Hédi 2022-02-09 21:30:54 +0100
• caa0e896bd
  Merge pull request #24 from HediMjid/calendrier Hédi 2022-02-09 12:05:12 +0100
• e5bd670998 jwt : ajout du userId et du teamId dans le token Hedi 2022-02-06 22:50:59 +0100
• 7c352cad95 calendrier : modif model + repository + controller Hedi 2022-02-05 15:36:35 +0100
• 1e78b6e449 Merge branch 'dev' of https://github.com/HediMjid/Organizee into isa HarmandI 2022-02-05 15:27:27 +0100
• bedffd0881
  Merge pull request #23 from HediMjid/hedii Hédi 2022-02-02 15:54:13 +0100
• ce88e646fd fix destinataire mail Hedi MJID 2022-02-01 16:06:16 +0100
• 382b1052d4 commentaires Hedi MJID 2022-02-01 09:17:11 +0100
• aece88e2a8 fix des class pour eviter la recursivité de certain en json Hedi 2022-01-30 19:15:01 +0100
• c383149822
  Merge pull request #22 from HediMjid/feature-send-email Hédi 2022-01-28 15:28:30 +0100
• f23b0fbb87 modif route controller mail Hedi 2022-01-28 12:08:49 +0100
• b47c3fdf6d feat(mail):ajout d'envoi de mail au format text, HTML, avec piece jointe Hedi 2022-01-24 23:06:27 +0100
• c59f1a81a3 modif commit Hédi 2022-01-21 18:39:49 +0100
• 48e9cc5816 Merge branch 'dev' of https://github.com/HediMjid/Organizee into Blandine Blandine Bajard 2022-01-23 12:11:10 +0100
• 165da07728 fix merge bis Hedi 2022-01-21 18:33:37 +0100