Commit Graph

270 Commits

Author SHA1 Message Date
AlineRinquin
2ca1b760d9
Merge pull request #91 from AlineRinquin/fix-humeur
fix humeur + ajout des couleur par page pour la side bar
2022-03-07 11:59:12 +01:00
Hedi
c2c30c3cf8 fix humeur + ajout des couleur par page pour la side bar 2022-03-06 19:55:26 +01:00
AlineRinquin
53408a220e
Merge pull request #90 from AlineRinquin/isa2
Corrections des bugs
2022-03-06 19:24:07 +01:00
AlineRinquin
b4518612ce
Merge pull request #88 from AlineRinquin/cecile
Cecile
2022-03-06 19:23:33 +01:00
HarmandI
c162d50605 Corrections des bugs 2022-03-06 18:50:11 +01:00
cecilesimplon93
297527cdbb smileys avec bdd 2022-03-06 15:46:45 +01:00
AlineRinquin
9814f0de9f
Merge pull request #89 from AlineRinquin/fix-header
header: fix du probleme titre-logo
2022-03-06 12:16:52 +01:00
AlineRinquin
773b8a1b87
Merge pull request #87 from AlineRinquin/isa2
bug : enregistre en base cocher toutes les taches
2022-03-06 12:12:26 +01:00
Hedi
b28fae62eb header: fix du probleme titre-logo 2022-03-06 11:34:14 +01:00
HarmandI
cca4e96f2b bug : enregistre en base cocher toutes les taches 2022-03-05 20:22:10 +01:00
cecilesimplon93
bb34a0cc7a finalisation du footer 2022-03-05 19:53:33 +01:00
AlineRinquin
b12da5fb36
Merge pull request #86 from AlineRinquin/dev
Dev Verssion 1.0 au 05/03/22
2022-03-05 19:12:17 +01:00
AlineRinquin
3d16635cef
Merge pull request #85 from AlineRinquin/aline
suppression de l'allerte que je peux pas faire plus placement footer partout
2022-03-05 13:50:49 +01:00
AlineRinquin
52bc42fb6c suppression de l'allerte que je peux pas faire 2022-03-05 13:50:04 +01:00
AlineRinquin
5ce6b397ea
Merge pull request #84 from AlineRinquin/aline
bakground color side bar essai alert pas fini cursor pointer
2022-03-05 13:33:49 +01:00
AlineRinquin
2e8d6ed18a bakground color side bar essai alert pas fini cursor pointer 2022-03-05 13:32:15 +01:00
AlineRinquin
8701849cde
Merge pull request #83 from AlineRinquin/aline
ng model et comment code
2022-03-05 12:42:00 +01:00
AlineRinquin
ad43314632 ng model et comment code 2022-03-05 12:41:24 +01:00
AlineRinquin
0e2452570d
Merge pull request #82 from AlineRinquin/side-bar-custom
side-bar : personnalisation de la couleur
2022-03-05 12:35:52 +01:00
AlineRinquin
7e47294a82
Merge pull request #81 from AlineRinquin/formulaire-evenement
fix formulaire
2022-03-05 12:35:27 +01:00
AlineRinquin
80ebbf2ec6
Merge pull request #80 from AlineRinquin/isa2
correction bug list et tache vides
2022-03-05 12:34:53 +01:00
Hedi
c65fb9d8c2 side-bar : personnalisation de la couleur 2022-03-05 12:19:40 +01:00
Hedi
1d9bf75e59 fix formulaire 2022-03-05 10:45:23 +01:00
HarmandI
7955ccad42 correction bug list et tache vides 2022-03-05 09:21:00 +01:00
AlineRinquin
6549070d2c
Merge pull request #79 from AlineRinquin/blandine
menache
2022-03-04 16:40:46 +01:00
Blandine Bajard
42eff07067 menache 2022-03-04 16:39:56 +01:00
AlineRinquin
4ccbbf869b
Merge pull request #78 from AlineRinquin/aline
Aline
2022-03-04 16:18:30 +01:00
AlineRinquin
6a2ddf7fad dasboard css et update contact ngmodel 2022-03-04 16:17:28 +01:00
AlineRinquin
5ad57fbd88
Merge pull request #77 from AlineRinquin/calendrier
Calendrier
2022-03-04 16:08:06 +01:00
AlineRinquin
03a3cd0351
Merge pull request #76 from AlineRinquin/formulaire-evenement
calendrier : ajout du formulaire d'ajout de evenement
2022-03-04 16:03:59 +01:00
AlineRinquin
1264566762
Merge pull request #75 from AlineRinquin/blandine
menu update fixed
2022-03-04 16:02:50 +01:00
Hedi MJID
48dedea665 calendrier : ajout du formulaire d'ajout de evenement 2022-03-04 15:54:34 +01:00
AlineRinquin
505b280ee5
Merge pull request #74 from AlineRinquin/sana
Sana
2022-03-04 15:53:22 +01:00
Sana EL HIRI
1191176e25 avancées à merge 2022-03-04 15:50:51 +01:00
Blandine Bajard
799c29e08f menu update fixed 2022-03-04 15:40:26 +01:00
Hedi MJID
284c9c2b97 calendrier : ajout de commentaires 2022-03-04 14:44:31 +01:00
Hedi MJID
52286c1b7f calendrier : ajout de commentaires 2022-03-04 14:31:50 +01:00
AlineRinquin
6f69c6cdb5 Merge branch 'dev' into aline 2022-03-04 12:00:46 +01:00
Sana EL HIRI
f2f790211c avancées sur update member/ page account ok / add Member ok 2022-03-03 21:59:06 +01:00
Sana EL HIRI
11e4d7321e Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into sana 2022-03-02 19:15:48 +01:00
Sana EL HIRI
ab58fd0c6a avancées page account/ modif side bar/modif card-member 2022-03-02 19:14:43 +01:00
AlineRinquin
aecd8df7a6
Merge pull request #73 from AlineRinquin/blandine
footer sur menu
2022-03-02 17:32:42 +01:00
Blandine Bajard
cb3862141b footer sur menu 2022-03-02 17:01:02 +01:00
AlineRinquin
2c2a60c1bd Merge branch 'dev' into aline 2022-03-02 16:20:26 +01:00
AlineRinquin
f56f7e9a9f
Merge pull request #72 from AlineRinquin/sana
ajout dashboard dans sidebar et correction url environnement 8088
2022-03-02 16:09:40 +01:00
AlineRinquin
9f1c373403
Merge pull request #71 from AlineRinquin/blandine
Blandine
2022-03-02 16:09:04 +01:00
AlineRinquin
5a3d15dcd7
Merge pull request #70 from AlineRinquin/aline
variables envoronement
2022-03-02 16:07:38 +01:00
Blandine Bajard
d2cd689713 alerte sur menus et comment du code 2022-03-02 15:57:03 +01:00
Sana EL HIRI
8c36759ce3 ajout dashboard dans sidebar et correction url environnement 8088 2022-03-02 14:55:15 +01:00
AlineRinquin
f66df8d790 Merge branch 'dev' into aline 2022-03-02 14:01:44 +01:00