isa44.74/organizee-front
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Commit graph

  • 8826efdd3f
         Merge pull request #69 from AlineRinquin/component-alert AlineRinquin 2022-03-01 21:52:53 +01:00
  • fa3265f533 component alert pour afficher une alert avec un message Hedi 2022-03-01 21:16:33 +01:00
  • 8cdd8d3e64
         Merge pull request #68 from AlineRinquin/component-alert AlineRinquin 2022-03-01 21:04:50 +01:00
  • 9d130f3415
         Merge pull request #67 from AlineRinquin/calendrier AlineRinquin 2022-03-01 21:03:11 +01:00
  • 3b4e3b2f84 component alert pour afficher une alert avec un message Hedi 2022-03-01 20:58:35 +01:00
  • b4ca38d046 merge avec dev Hedi 2022-03-01 19:55:13 +01:00
  • 86bdf56cb6 missing role Hedi 2022-03-01 19:07:37 +01:00
  • 0784bacd2e
         Merge pull request #65 from AlineRinquin/calendrier-dashboard AlineRinquin 2022-03-01 18:50:34 +01:00
  • 4807bfde57
         Merge pull request #64 from AlineRinquin/calendrier AlineRinquin 2022-03-01 18:50:01 +01:00
  • ba178b22dd
         Merge pull request #66 from AlineRinquin/blandine AlineRinquin 2022-03-01 18:49:18 +01:00
  • cd8a67a9e7 calendrier : fin + gestion des roles + debug Hedi 2022-03-01 18:37:35 +01:00
  • de0413930b calendrier component pour le dashboard Hedi 2022-03-01 18:32:13 +01:00
  • 6c489a4fda Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into blandine Blandine Bajard 2022-03-01 17:32:23 +01:00
  • 476cc12cc0 trucs de menu et token Blandine Bajard 2022-03-01 17:32:16 +01:00
  • 68aae07bb3 calendrier : fin + gestion des roles + debug Hedi 2022-03-01 15:17:34 +01:00
  • f02e3b630e calendrier : fin + gestion des roles Hedi 2022-03-01 15:12:41 +01:00
  • 4b5b3020ac
         Merge pull request #63 from AlineRinquin/isa2 AlineRinquin 2022-02-28 21:09:50 +01:00
  • de3fbc6fda Merge branch 'dev' into isa2 HarmandI 2022-02-28 08:34:43 +01:00
  • 759612288a Css To-do-list HarmandI 2022-02-28 08:26:08 +01:00
  • 174c3fd77f
         Merge pull request #62 from AlineRinquin/login-message AlineRinquin 2022-02-27 18:07:00 +01:00
  • b0c15f976b affichage de message d erreur lors du login Hedi 2022-02-27 17:55:42 +01:00
  • 547740dd44
         Merge pull request #61 from AlineRinquin/calendrier AlineRinquin 2022-02-27 16:38:53 +01:00
  • 46a6e3b506
         Merge pull request #60 from AlineRinquin/isa2 AlineRinquin 2022-02-27 16:28:24 +01:00
  • bd3ee44a1d merge avec dev Hedi 2022-02-27 15:56:01 +01:00
  • 59b55b35a7 Toutes les fonctionnalités to do list ok HarmandI 2022-02-27 15:51:53 +01:00
  • b3b724ecf0 update resizing event Hedi 2022-02-27 15:13:50 +01:00
  • 4aa5469a04
         Merge pull request #59 from AlineRinquin/forgot-reset-password AlineRinquin 2022-02-27 14:53:05 +01:00
  • e997e0541d ajout de la redirection apres le new password Hedi MJID 2022-02-26 19:35:51 +01:00
  • 1d8eb27df0 refacto forgot/reset password Hedi MJID 2022-02-26 19:23:13 +01:00
  • c9d964f7dc
         Merge pull request #58 from AlineRinquin/aline AlineRinquin 2022-02-26 17:50:09 +01:00
  • 4386c4b474 redirection page acceuil et miseen place de privation d'action si enfant AlineRinquin 2022-02-26 17:48:12 +01:00
  • 9501ab5c47 Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into dev Hedi MJID 2022-02-26 15:03:06 +01:00
  • e7b153e1a0 +appmodule - humeur Hedi MJID 2022-02-26 14:33:18 +01:00
  • 9b3c02f6c1 tracking files Hedi MJID 2022-02-26 14:19:27 +01:00
  • c0a89e1868 update agenda + team service Hedi MJID 2022-02-26 14:17:47 +01:00
  • 1d4a2c957c Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into aline AlineRinquin 2022-02-26 12:58:57 +01:00
  • 3c16eadc69 app module AlineRinquin 2022-02-26 12:58:39 +01:00
  • cb1498a215
         Merge pull request #57 from AlineRinquin/sana AlineRinquin 2022-02-26 12:51:21 +01:00
  • 21e076b1ee addMember envoi de mail ok Sana EL HIRI 2022-02-25 18:52:30 +01:00
  • 1d96834459
         Merge pull request #56 from AlineRinquin/blandine AlineRinquin 2022-02-25 17:19:34 +01:00
  • f79b47f3ac encore erreur Blandine Bajard 2022-02-25 17:19:03 +01:00
  • 0e4e0f18dc
         Merge pull request #55 from AlineRinquin/aline AlineRinquin 2022-02-25 17:17:05 +01:00
  • 4b17f61207
         Merge branch 'dev' into aline AlineRinquin 2022-02-25 17:16:58 +01:00
  • 98af9f417e
         Merge pull request #54 from AlineRinquin/blandine AlineRinquin 2022-02-25 17:15:56 +01:00
  • bae708b85e resoling some mistakes Blandine Bajard 2022-02-25 17:15:06 +01:00
  • b885324f1f resolve conflicts AlineRinquin 2022-02-25 17:14:58 +01:00
  • 50fd7539ac truc Blandine Bajard 2022-02-25 17:02:25 +01:00
  • 2a10f319ae je sais pas Blandine Bajard 2022-02-25 17:00:35 +01:00
  • a04bef6954
         Merge pull request #53 from AlineRinquin/aline AlineRinquin 2022-02-25 16:59:46 +01:00
  • d08399693d koehfozh AlineRinquin 2022-02-25 16:59:15 +01:00
  • 3e814174ed
         Merge pull request #52 from AlineRinquin/cecile AlineRinquin 2022-02-25 16:58:35 +01:00
  • 03ec7ffe92
         Merge branch 'dev' into cecile AlineRinquin 2022-02-25 16:58:21 +01:00
  • 4e7444f093
         Merge pull request #51 from AlineRinquin/aline AlineRinquin 2022-02-25 16:32:04 +01:00
  • 2e36982415
         Merge branch 'dev' into aline AlineRinquin 2022-02-25 16:31:53 +01:00
  • 896c0c5f3a dasboard pas fini et modif addmembre AlineRinquin 2022-02-25 16:29:12 +01:00
  • 5907b69046
         Merge pull request #50 from AlineRinquin/blandine AlineRinquin 2022-02-25 14:32:57 +01:00
  • eac32838d6 deconnexion button + nav bar fixed Blandine Bajard 2022-02-25 12:52:25 +01:00
  • 9e40a5ff68
         Merge pull request #49 from AlineRinquin/blandine AlineRinquin 2022-02-25 10:56:56 +01:00
  • 771c14e7f2 interceptor et guards Blandine Bajard 2022-02-25 10:55:33 +01:00
  • 55101f50dd
         Merge pull request #44 from AlineRinquin/cecile AlineRinquin 2022-02-25 10:51:41 +01:00
  • 75df7b456a
         Merge pull request #47 from AlineRinquin/blandine AlineRinquin 2022-02-25 10:51:04 +01:00
  • cac2d1b5b8
         Merge pull request #48 from AlineRinquin/sana AlineRinquin 2022-02-25 10:50:38 +01:00
  • 466a146174 add member avec role ok account récupère les membre en focntion de la team Sana EL HIRI 2022-02-25 09:52:06 +01:00
  • f8bb12cc3a fixed-update-menu Blandine Bajard 2022-02-24 17:44:28 +01:00
  • 530cd73b3f ça devrait le faire cecilesimplon93 2022-02-24 15:21:36 +01:00
  • 7784870446 Merge branch 'dev' into sana Sana EL HIRI 2022-02-24 15:13:53 +01:00
  • 591411bbaa commit to merge Sana EL HIRI 2022-02-24 15:13:21 +01:00
  • 1f644da5b9
         Merge pull request #46 from AlineRinquin/aline AlineRinquin 2022-02-24 15:07:11 +01:00
  • d0519247e0 dasboard pas fini AlineRinquin 2022-02-24 15:05:47 +01:00
  • 6da3c9026d
         Merge pull request #45 from AlineRinquin/blandine AlineRinquin 2022-02-24 15:02:20 +01:00
  • 6e013f3ffe menus de la semaine terminés Blandine Bajard 2022-02-24 15:01:22 +01:00
  • c8b13f2de6 Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into cecile cecilesimplon93 2022-02-24 15:01:00 +01:00
  • 9c239bdaac menus de la semaine terminé Blandine Bajard 2022-02-24 15:00:33 +01:00
  • 923a7507e9 ajout formulaire page-support, pas de ts cecilesimplon93 2022-02-23 20:41:02 +01:00
  • 3515e87f13 Merge branch 'blandine' of https://github.com/AlineRinquin/organizee-front into blandine Blandine Bajard 2022-02-18 18:09:24 +01:00
  • 6dc16ea103 Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into blandine Blandine Bajard 2022-02-18 18:09:14 +01:00
  • b2f01ab493 merde Blandine Bajard 2022-02-18 18:00:49 +01:00
  • c55e0e93b1
         Merge pull request #43 from AlineRinquin/dev Blandine Bajard 2022-02-18 18:00:07 +01:00
  • 55c72fccc6
         Merge pull request #42 from AlineRinquin/blandine Blandine Bajard 2022-02-18 17:54:07 +01:00
  • e40a927044
         Merge branch 'dev' into blandine Blandine Bajard 2022-02-18 17:53:52 +01:00
  • 388804ae06 menus Blandine Bajard 2022-02-18 17:22:17 +01:00
  • 33052f54d1 Merge branch 'dev' into cecile cecilesimplon93 2022-02-18 17:10:11 +01:00
  • 76f26627bd mise a jour wend cecilesimplon93 2022-02-18 17:05:29 +01:00
  • f9bf388ac7 Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into dev Sana EL HIRI 2022-02-18 17:03:49 +01:00
  • 156c9676c0 commit to merge Sana EL HIRI 2022-02-18 17:00:14 +01:00
  • 5a90969f71
         Merge pull request #41 from AlineRinquin/calendrier AlineRinquin 2022-02-18 16:38:08 +01:00
  • c9c354360d calendrier full Hedi 2022-02-18 16:34:29 +01:00
  • 83da5729e1 calendrier css Hedi 2022-02-18 16:27:46 +01:00
  • 8099f55335 calendrier html Hedi 2022-02-18 16:24:33 +01:00
  • faa4571f67 calendrier ts Hedi 2022-02-18 16:19:48 +01:00
  • 42f486e66a calendrier service Hedi 2022-02-18 16:16:55 +01:00
  • 4f624bf33f initialisation du calendrier Hedi 2022-02-18 16:08:47 +01:00
  • cce97527b5 modif Hedi 2022-02-18 14:27:37 +01:00
  • 4afd11b34e change port 8080 Hedi 2022-02-18 11:43:30 +01:00
  • 3644b8f1bd
         Merge pull request #40 from AlineRinquin/aline AlineRinquin 2022-02-18 11:00:41 +01:00
  • 2596418c94 fix conflicts AlineRinquin 2022-02-18 10:59:57 +01:00
  • 53119ea28a package Hedi 2022-02-18 10:56:09 +01:00
  • 0516b99866 Merge branch 'dev' into cecile cecilesimplon93 2022-02-18 10:53:55 +01:00
  • ab47488db1 re cecilesimplon93 2022-02-18 10:53:01 +01:00
  • bc51469588 Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into dev Hedi 2022-02-18 10:45:19 +01:00