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

Commit Graph

  • 056576b87f
         Merge pull request #39 from AlineRinquin/cecile AlineRinquin 2022-02-18 10:39:29 +0100
  • 6504d28c4b
         Merge branch 'dev' into cecile AlineRinquin 2022-02-18 10:39:22 +0100
  • 4e56e325c9 package Hedi 2022-02-18 10:34:56 +0100
  • 6d917a62ad correction cecilesimplon93 2022-02-18 09:58:44 +0100
  • 11109e4afd ajustement avatar cecilesimplon93 2022-02-18 09:43:15 +0100
  • 74e28d14f4
         Merge pull request #37 from AlineRinquin/sana AlineRinquin 2022-02-18 09:27:57 +0100
  • 674560bd84 sticky sidebar Sana EL HIRI 2022-02-18 09:27:24 +0100
  • f41d09fcb0 package-lock Hedi 2022-02-17 16:15:52 +0100
  • 8ccb93aa27
         Merge pull request #36 from AlineRinquin/aline AlineRinquin 2022-02-17 14:08:10 +0100
  • 257bbdde40 page repertoire presque fini AlineRinquin 2022-02-17 14:02:01 +0100
  • b0c9a5368f
         Merge pull request #35 from AlineRinquin/aline AlineRinquin 2022-02-17 10:31:38 +0100
  • 44d00b0217
         Merge branch 'dev' into aline AlineRinquin 2022-02-17 10:31:30 +0100
  • f93962a330 ajout de l'install de blandine AlineRinquin 2022-02-17 10:27:05 +0100
  • 57ca1768da
         Merge pull request #34 from AlineRinquin/isa AlineRinquin 2022-02-17 10:25:03 +0100
  • b66b59badc
         Merge branch 'dev' into isa AlineRinquin 2022-02-17 10:24:53 +0100
  • 30fa1f7de5
         Merge pull request #33 from AlineRinquin/aline AlineRinquin 2022-02-17 10:22:54 +0100
  • e7b64f14fc
         Merge pull request #32 from AlineRinquin/sana AlineRinquin 2022-02-17 10:22:22 +0100
  • 60c1753ea4
         Merge branch 'dev' into sana AlineRinquin 2022-02-17 10:22:14 +0100
  • 49049bc255 Ajout des couleurs et un peu css AlineRinquin 2022-02-17 10:14:20 +0100
  • fb401a94d1 fin card membre Sana EL HIRI 2022-02-17 09:50:36 +0100
  • 82321df395 update tache HarmandI 2022-02-17 09:44:18 +0100
  • 0d4ac5606b card membre Sana EL HIRI 2022-02-16 19:18:24 +0100
  • 72d0c77dd3 finalisation humeurs, mise en place plan du site cecilesimplon93 2022-02-16 17:50:53 +0100
  • b9cf650daf
         Merge pull request #31 from AlineRinquin/blandine AlineRinquin 2022-02-16 17:33:10 +0100
  • a3b89e4043
         Merge branch 'dev' into blandine AlineRinquin 2022-02-16 17:32:57 +0100
  • d892e3ff93 modif token service + addMenu en modal Blandine Bajard 2022-02-16 17:31:18 +0100
  • a9970a50eb
         Merge pull request #30 from AlineRinquin/isa AlineRinquin 2022-02-16 15:45:23 +0100
  • 1bed92a6e4 mise à jour de ma branche HarmandI 2022-02-16 15:32:19 +0100
  • e96da0519b
         Merge pull request #29 from AlineRinquin/aline AlineRinquin 2022-02-16 15:23:44 +0100
  • 0244cb29ea ajout contact AlineRinquin 2022-02-16 15:20:23 +0100
  • e6f59fb84c Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into aline AlineRinquin 2022-02-16 11:49:27 +0100
  • e82d138907 ajout des couleurs dans le form AlineRinquin 2022-02-16 11:48:34 +0100
  • 50ef04ca86 page 404 et début choix humeur cecilesimplon93 2022-02-15 15:46:31 +0100
  • f284206787
         Merge pull request #28 from AlineRinquin/aline AlineRinquin 2022-02-15 15:39:14 +0100
  • 25830750bd
         Merge pull request #27 from AlineRinquin/blandine AlineRinquin 2022-02-15 15:38:25 +0100
  • a881b6cee6 ajout couleur AlineRinquin 2022-02-15 15:37:22 +0100
  • ffbcc88df2 ne pas en tenir compte Merci HarmandI 2022-02-15 15:19:53 +0100
  • 6e68de9f3a token service Blandine Bajard 2022-02-15 15:18:07 +0100
  • fea0ac9524
         Merge pull request #26 from AlineRinquin/isa AlineRinquin 2022-02-15 15:04:50 +0100
  • 507edc6151 Add tache ok HarmandI 2022-02-15 15:03:35 +0100
  • 98374d8a47 merge conflicts AlineRinquin 2022-02-15 14:01:50 +0100
  • a2fd96e6a4 Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into blandine Blandine Bajard 2022-02-15 13:58:26 +0100
  • 61cacda89b fonction delete AlineRinquin 2022-02-15 13:58:06 +0100
  • 26032019c5 menu service Blandine Bajard 2022-02-15 13:57:42 +0100
  • 46a3ffe671
         Merge pull request #25 from AlineRinquin/sana AlineRinquin 2022-02-15 13:55:43 +0100
  • 1e491a50ab sidebar Sana EL HIRI 2022-02-14 18:42:03 +0100
  • 58f3a1969f commit to merge Sana EL HIRI 2022-02-14 16:46:37 +0100
  • 4184e613da commit to merge Sana EL HIRI 2022-02-14 16:44:34 +0100
  • f404b8fd2f
         Merge pull request #24 from AlineRinquin/sana AlineRinquin 2022-02-14 16:39:20 +0100
  • 42b5ac19ef
         Merge branch 'dev' into sana AlineRinquin 2022-02-14 16:38:15 +0100
  • 5df5d379f8 avancées tickets account et membre 2 Sana EL HIRI 2022-02-14 16:33:26 +0100
  • 7bed54db11
         Merge pull request #23 from AlineRinquin/aline AlineRinquin 2022-02-14 15:52:26 +0100
  • 4144bc5f3e fonction delete ok AlineRinquin 2022-02-14 15:51:13 +0100
  • 026ac42818 Side bar css ok avancées sur ticket page account et page membreetc Sana EL HIRI 2022-02-14 15:45:32 +0100
  • 9fa153da8c
         Merge pull request #22 from AlineRinquin/blandine AlineRinquin 2022-02-14 15:25:20 +0100
  • d89214db19 component meteo Blandine Bajard 2022-02-14 12:59:15 +0100
  • 2f5705e766 page d'accueil fixed Blandine Bajard 2022-02-14 12:25:49 +0100
  • e53a9a062d Team crud Ok connection Back Ok Sana EL HIRI 2022-02-14 11:47:09 +0100
  • efb86420d0 todo en cours HarmandI 2022-02-14 11:28:50 +0100
  • 92be353905 ajout du component alert pour les confirmations d'actions Hedi 2022-02-12 18:29:39 +0100
  • 6e8b258fbc page agenda + module daypilot Hedi 2022-02-12 17:48:50 +0100
  • cee51a61f4 init page agenda Hedi MJID 2022-02-11 16:42:09 +0100
  • acfb169715
         Merge pull request #21 from AlineRinquin/fix-front AlineRinquin 2022-02-11 16:19:54 +0100
  • 3f2bfd26c6 fix pb avec le app.module Hedi MJID 2022-02-11 16:08:59 +0100
  • 2cf744c30d
         Merge pull request #20 from AlineRinquin/page404 AlineRinquin 2022-02-11 11:51:14 +0100
  • ceaec59c0d
         Merge branch 'dev' into page404 AlineRinquin 2022-02-11 11:50:57 +0100
  • f26ce2eaf2 page404 cecilesimplon93 2022-02-11 11:10:13 +0100
  • ae1fc13951 removed merge conflicts Sana EL HIRI 2022-02-09 17:55:44 +0100
  • 3be268bfdb page-not-found semble ok cecilesimplon93 2022-02-02 16:28:52 +0100
  • 5c7e4662b2
         Merge pull request #19 from AlineRinquin/aline AlineRinquin 2022-02-02 10:43:02 +0100
  • 8bdc521f2d instaltion module autofous AlineRinquin 2022-02-02 10:41:37 +0100
  • 3331a34b9f
         Merge pull request #18 from AlineRinquin/blandine AlineRinquin 2022-02-01 08:49:07 +0100
  • 0633d6ae6d page d'accueil Blandine Bajard 2022-01-31 18:18:03 +0100
  • 52ff29ca30
         Merge pull request #17 from AlineRinquin/isa AlineRinquin 2022-01-31 09:22:43 +0100
  • 9287f531d2 ToDoList version1 front HarmandI 2022-01-30 20:23:15 +0100
  • a7483795a3
         Merge pull request #16 from AlineRinquin/blandine AlineRinquin 2022-01-26 15:44:12 +0100
  • 88fd522f00 css component header Blandine Bajard 2022-01-25 17:46:18 +0100
  • 5df6f6f46e css component signin Blandine Bajard 2022-01-25 17:18:51 +0100
  • a545bf5a25
         Merge pull request #15 from AlineRinquin/aline AlineRinquin 2022-01-23 15:18:13 +0100
  • 595ead0e74 ajout des commentaires manquants sur le code AlineRinquin 2022-01-23 15:17:39 +0100
  • de17b0d925
         Merge pull request #14 from AlineRinquin/blandine AlineRinquin 2022-01-23 15:14:35 +0100
  • 307f1343a5
         Merge pull request #13 from AlineRinquin/aline AlineRinquin 2022-01-23 15:13:31 +0100
  • a723a02a56 Fonctionn modifier contact ok AlineRinquin 2022-01-23 15:08:17 +0100
  • 79a6165196 css signup Blandine Bajard 2022-01-23 12:00:11 +0100
  • 7102d73f89 reset-password terminé Blandine Bajard 2022-01-23 09:18:57 +0100
  • 0390c45886 recup du stach et fonctionalitée modifier contact AlineRinquin 2022-01-22 14:57:04 +0100
  • efa5bb8d22 Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into dev Sana EL HIRI 2022-01-21 15:10:38 +0100
  • 1ffd4ad2ee dev Sana EL HIRI 2022-01-21 15:10:24 +0100
  • ef3418b45c
         Merge pull request #11 from AlineRinquin/cecile AlineRinquin 2022-01-21 15:05:01 +0100
  • 6623310501
         Merge branch 'dev' into cecile AlineRinquin 2022-01-21 15:04:53 +0100
  • 241b71e566
         Merge pull request #10 from AlineRinquin/sana AlineRinquin 2022-01-21 14:59:46 +0100
  • 0550e1b239
         Merge pull request #9 from AlineRinquin/blandine AlineRinquin 2022-01-21 14:58:50 +0100
  • 080a694838 page 404 cecilesimplon93 2022-01-21 14:55:35 +0100
  • 38f52c7448
         Merge pull request #7 from AlineRinquin/aline AlineRinquin 2022-01-21 14:55:10 +0100
  • f330dc901a
         Merge branch 'dev' into aline AlineRinquin 2022-01-21 14:54:29 +0100
  • cde96f2bb6 fonctionalitée ajout contact ok AlineRinquin 2022-01-21 14:02:57 +0100
  • 50f5b00b52 creation-team connection back ok Sana EL HIRI 2022-01-21 12:56:22 +0100
  • 20459365ee corrections Blandine Bajard 2022-01-21 12:54:22 +0100
  • 22af2a20ba ok Blandine Bajard 2022-01-21 12:45:59 +0100
  • b994e6be58 reset password en cours Blandine Bajard 2022-01-21 12:30:05 +0100