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

Commit Graph

  • 5d4dd47a96
         Merge pull request #107 from AlineRinquin/dev main AlineRinquin 2022-03-14 09:55:11 +0100
  • c807c00176
         Merge pull request #106 from AlineRinquin/cecile AlineRinquin 2022-03-14 08:43:33 +0100
  • 7c3db84ffb
         Merge pull request #105 from AlineRinquin/calendrier AlineRinquin 2022-03-14 08:31:40 +0100
  • 04734c7348
         Merge pull request #104 from AlineRinquin/forgot-reset-password AlineRinquin 2022-03-14 08:31:08 +0100
  • b933bb478d commentaires Hedi 2022-03-14 00:39:22 +0100
  • 59523cb54b change ip to localhost Hedi 2022-03-14 00:32:50 +0100
  • c04b5da615
         Merge pull request #103 from AlineRinquin/isa2 AlineRinquin 2022-03-13 20:57:33 +0100
  • a9654e184b Bêtise réparée! HarmandI 2022-03-13 20:55:29 +0100
  • 227069f71b formulaire fonctionnel, merci Hédi git add .! cecilesimplon93 2022-03-13 20:28:00 +0100
  • 06feb4ab79
         Merge pull request #102 from AlineRinquin/forgot-reset-password AlineRinquin 2022-03-13 19:53:51 +0100
  • 663105a9d3 refacto message alert envoi de mail + tiitre form reset password Hedi 2022-03-13 19:51:03 +0100
  • 725665ad16
         Merge pull request #101 from AlineRinquin/sana AlineRinquin 2022-03-13 19:48:44 +0100
  • 3326b48eab coms Sana EL HIRI 2022-03-13 18:45:28 +0100
  • 35cba2625c Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into cecile cecilesimplon93 2022-03-13 17:39:07 +0100
  • 103294207a Fautes orthographe + indentation HarmandI 2022-03-13 17:33:34 +0100
  • f31463a1b9
         Merge pull request #100 from AlineRinquin/aline AlineRinquin 2022-03-13 17:21:46 +0100
  • d5defdbf3e ajout des smileys dans coponent avatar plus css plus commentaires AlineRinquin 2022-03-13 14:47:31 +0100
  • 790ee67f71 détails + début formulaire contacts cecilesimplon93 2022-03-13 10:25:08 +0100
  • 9b67d21485
         Merge pull request #99 from AlineRinquin/dev AlineRinquin 2022-03-11 16:15:32 +0100
  • 0a101c9920 essai d flex AlineRinquin 2022-03-11 15:16:18 +0100
  • bcc27e9250
         Merge pull request #98 from AlineRinquin/cecile AlineRinquin 2022-03-11 14:46:51 +0100
  • 21f782a4ea retrait de -accueil- dans le footer cecilesimplon93 2022-03-11 13:06:55 +0100
  • c13767a5dc
         Merge pull request #97 from AlineRinquin/isa2 AlineRinquin 2022-03-11 12:07:58 +0100
  • 4d8f138c60 commentaires (fin) j'espère! HarmandI 2022-03-11 12:05:28 +0100
  • 6f1e79d9b4
         Merge pull request #96 from AlineRinquin/cecile AlineRinquin 2022-03-11 11:48:31 +0100
  • 89e50699a3 couleur humeur component, couleur agenda hédi, espace sur dashboard aline cecilesimplon93 2022-03-08 18:39:25 +0100
  • 020f56870d
         Merge pull request #95 from AlineRinquin/sana AlineRinquin 2022-03-08 13:58:09 +0100
  • 841d8fd78c signup ok et delete membre ok Sana EL HIRI 2022-03-08 13:06:48 +0100
  • bd9610275d modifs Sana EL HIRI 2022-03-07 20:03:04 +0100
  • c07b32cad1 avancées signup Sana EL HIRI 2022-03-07 18:29:53 +0100
  • 58abccca86 Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into sana Sana EL HIRI 2022-03-07 16:44:23 +0100
  • 65a61e259b
         Merge pull request #94 from AlineRinquin/blandine AlineRinquin 2022-03-07 16:41:53 +0100
  • 8527024606 nettoyage code Sana EL HIRI 2022-03-07 16:26:52 +0100
  • bb80e279e6 modif mail add member et comment sur to do list editing Blandine Bajard 2022-03-07 16:26:02 +0100
  • f7a657fddd
         Merge pull request #93 from AlineRinquin/sana AlineRinquin 2022-03-07 15:03:05 +0100
  • d88c7ea5fb css modifs Sana EL HIRI 2022-03-07 15:01:35 +0100
  • a0ecb2419d
         Merge pull request #92 from AlineRinquin/sana AlineRinquin 2022-03-07 12:00:53 +0100
  • 2ca1b760d9
         Merge pull request #91 from AlineRinquin/fix-humeur AlineRinquin 2022-03-07 11:59:12 +0100
  • 7d9f63fada css/style modifs header et bouton deconnexion Sana EL HIRI 2022-03-07 11:52:12 +0100
  • 0a8d6ed7dd css/style modifs Sana EL HIRI 2022-03-07 11:24:34 +0100
  • 699c7add05 modif scss footer, scss sidebar + ajout footer sur pages ajout/modifier/supprimer membre Sana EL HIRI 2022-03-07 11:06:24 +0100
  • 95d9ab28f0 limitations au ROLE_ENFANT sur page account/ modifier, supprimer et ajouter membre ok Sana EL HIRI 2022-03-07 10:32:37 +0100
  • 2dd153198e Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into sana Sana EL HIRI 2022-03-06 22:06:26 +0100
  • 50d5794668 signup : crée une nouvelle team et un nouveau membre mais ne fait pas le lien entre les deux/ suppression : page création team Sana EL HIRI 2022-03-06 22:04:44 +0100
  • 4b90b0e1b2 avancées et bloquage sur delete Sana EL HIRI 2022-03-06 20:49:53 +0100
  • c2c30c3cf8 fix humeur + ajout des couleur par page pour la side bar Hedi 2022-03-06 19:55:26 +0100
  • 53408a220e
         Merge pull request #90 from AlineRinquin/isa2 AlineRinquin 2022-03-06 19:24:07 +0100
  • b4518612ce
         Merge pull request #88 from AlineRinquin/cecile AlineRinquin 2022-03-06 19:23:33 +0100
  • c162d50605 Corrections des bugs HarmandI 2022-03-06 18:50:11 +0100
  • b7e4e1ad18 avancées Sana EL HIRI 2022-03-06 18:30:50 +0100
  • 297527cdbb smileys avec bdd cecilesimplon93 2022-03-06 15:46:45 +0100
  • 9814f0de9f
         Merge pull request #89 from AlineRinquin/fix-header AlineRinquin 2022-03-06 12:16:52 +0100
  • 773b8a1b87
         Merge pull request #87 from AlineRinquin/isa2 AlineRinquin 2022-03-06 12:12:26 +0100
  • b28fae62eb header: fix du probleme titre-logo Hedi 2022-03-06 11:34:14 +0100
  • cca4e96f2b bug : enregistre en base cocher toutes les taches HarmandI 2022-03-05 20:22:10 +0100
  • bb34a0cc7a finalisation du footer cecilesimplon93 2022-03-05 19:53:33 +0100
  • b12da5fb36
         Merge pull request #86 from AlineRinquin/dev AlineRinquin 2022-03-05 19:12:17 +0100
  • 3d16635cef
         Merge pull request #85 from AlineRinquin/aline AlineRinquin 2022-03-05 13:50:49 +0100
  • 52bc42fb6c suppression de l'allerte que je peux pas faire AlineRinquin 2022-03-05 13:50:04 +0100
  • 5ce6b397ea
         Merge pull request #84 from AlineRinquin/aline AlineRinquin 2022-03-05 13:33:49 +0100
  • 2e8d6ed18a bakground color side bar essai alert pas fini cursor pointer AlineRinquin 2022-03-05 13:32:15 +0100
  • 8701849cde
         Merge pull request #83 from AlineRinquin/aline AlineRinquin 2022-03-05 12:42:00 +0100
  • ad43314632 ng model et comment code AlineRinquin 2022-03-05 12:41:24 +0100
  • 0e2452570d
         Merge pull request #82 from AlineRinquin/side-bar-custom AlineRinquin 2022-03-05 12:35:52 +0100
  • 7e47294a82
         Merge pull request #81 from AlineRinquin/formulaire-evenement AlineRinquin 2022-03-05 12:35:27 +0100
  • 80ebbf2ec6
         Merge pull request #80 from AlineRinquin/isa2 AlineRinquin 2022-03-05 12:34:53 +0100
  • c65fb9d8c2 side-bar : personnalisation de la couleur Hedi 2022-03-05 12:19:40 +0100
  • 1d9bf75e59 fix formulaire Hedi 2022-03-05 10:45:23 +0100
  • 7955ccad42 correction bug list et tache vides HarmandI 2022-03-05 09:21:00 +0100
  • 4a4c511fcd Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into sana Sana EL HIRI 2022-03-04 18:10:03 +0100
  • f8fccea027 petites avancées Sana EL HIRI 2022-03-04 18:07:59 +0100
  • 6549070d2c
         Merge pull request #79 from AlineRinquin/blandine AlineRinquin 2022-03-04 16:40:46 +0100
  • 42eff07067 menache Blandine Bajard 2022-03-04 16:39:56 +0100
  • 4ccbbf869b
         Merge pull request #78 from AlineRinquin/aline AlineRinquin 2022-03-04 16:18:30 +0100
  • 6a2ddf7fad dasboard css et update contact ngmodel AlineRinquin 2022-03-04 16:17:28 +0100
  • 5ad57fbd88
         Merge pull request #77 from AlineRinquin/calendrier AlineRinquin 2022-03-04 16:08:06 +0100
  • 03a3cd0351
         Merge pull request #76 from AlineRinquin/formulaire-evenement AlineRinquin 2022-03-04 16:03:59 +0100
  • 1264566762
         Merge pull request #75 from AlineRinquin/blandine AlineRinquin 2022-03-04 16:02:50 +0100
  • 48dedea665 calendrier : ajout du formulaire d'ajout de evenement Hedi MJID 2022-03-04 15:54:34 +0100
  • 505b280ee5
         Merge pull request #74 from AlineRinquin/sana AlineRinquin 2022-03-04 15:53:22 +0100
  • 1191176e25 avancées à merge Sana EL HIRI 2022-03-04 15:50:51 +0100
  • 799c29e08f menu update fixed Blandine Bajard 2022-03-04 15:40:26 +0100
  • 284c9c2b97 calendrier : ajout de commentaires Hedi MJID 2022-03-04 14:44:31 +0100
  • 52286c1b7f calendrier : ajout de commentaires Hedi MJID 2022-03-04 14:31:50 +0100
  • 6f69c6cdb5 Merge branch 'dev' into aline AlineRinquin 2022-03-04 12:00:46 +0100
  • f2f790211c avancées sur update member/ page account ok / add Member ok Sana EL HIRI 2022-03-03 21:59:06 +0100
  • 11e4d7321e Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into sana Sana EL HIRI 2022-03-02 19:15:48 +0100
  • ab58fd0c6a avancées page account/ modif side bar/modif card-member Sana EL HIRI 2022-03-02 19:14:43 +0100
  • aecd8df7a6
         Merge pull request #73 from AlineRinquin/blandine AlineRinquin 2022-03-02 17:32:42 +0100
  • cb3862141b footer sur menu Blandine Bajard 2022-03-02 17:01:02 +0100
  • 2c2a60c1bd Merge branch 'dev' into aline AlineRinquin 2022-03-02 16:20:26 +0100
  • f56f7e9a9f
         Merge pull request #72 from AlineRinquin/sana AlineRinquin 2022-03-02 16:09:40 +0100
  • 9f1c373403
         Merge pull request #71 from AlineRinquin/blandine AlineRinquin 2022-03-02 16:09:04 +0100
  • 5a3d15dcd7
         Merge pull request #70 from AlineRinquin/aline AlineRinquin 2022-03-02 16:07:38 +0100
  • d2cd689713 alerte sur menus et comment du code Blandine Bajard 2022-03-02 15:57:03 +0100
  • 8c36759ce3 ajout dashboard dans sidebar et correction url environnement 8088 Sana EL HIRI 2022-03-02 14:55:15 +0100
  • f66df8d790 Merge branch 'dev' into aline AlineRinquin 2022-03-02 14:01:44 +0100
  • 7c1eeaca82 variables envoronement AlineRinquin 2022-03-02 14:01:01 +0100
  • 0f27a72de2 Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into blandine Blandine Bajard 2022-03-02 09:35:39 +0100
  • c2091c7961 localhost8088 Blandine Bajard 2022-03-02 09:35:32 +0100