Commit Graph

105 Commits

Author SHA1 Message Date
Sana EL HIRI
674560bd84 sticky sidebar 2022-02-18 09:27:24 +01:00
AlineRinquin
8ccb93aa27
Merge pull request #36 from AlineRinquin/aline
page repertoire presque fini
2022-02-17 14:08:10 +01:00
AlineRinquin
257bbdde40 page repertoire presque fini 2022-02-17 14:02:01 +01:00
AlineRinquin
b0c9a5368f
Merge pull request #35 from AlineRinquin/aline
ajout de l'install de blandine
2022-02-17 10:31:38 +01:00
AlineRinquin
44d00b0217
Merge branch 'dev' into aline 2022-02-17 10:31:30 +01:00
AlineRinquin
f93962a330 ajout de l'install de blandine 2022-02-17 10:27:05 +01:00
AlineRinquin
57ca1768da
Merge pull request #34 from AlineRinquin/isa
update tache
2022-02-17 10:25:03 +01:00
AlineRinquin
b66b59badc
Merge branch 'dev' into isa 2022-02-17 10:24:53 +01:00
AlineRinquin
30fa1f7de5
Merge pull request #33 from AlineRinquin/aline
Ajout des couleurs et un peu css
2022-02-17 10:22:54 +01:00
AlineRinquin
e7b64f14fc
Merge pull request #32 from AlineRinquin/sana
Sana
2022-02-17 10:22:22 +01:00
AlineRinquin
60c1753ea4
Merge branch 'dev' into sana 2022-02-17 10:22:14 +01:00
AlineRinquin
49049bc255 Ajout des couleurs et un peu css 2022-02-17 10:14:20 +01:00
Sana EL HIRI
fb401a94d1 fin card membre 2022-02-17 09:50:36 +01:00
HarmandI
82321df395 update tache 2022-02-17 09:44:18 +01:00
Sana EL HIRI
0d4ac5606b card membre 2022-02-16 19:18:24 +01:00
AlineRinquin
b9cf650daf
Merge pull request #31 from AlineRinquin/blandine
modif token service + addMenu en modal
2022-02-16 17:33:10 +01:00
AlineRinquin
a3b89e4043
Merge branch 'dev' into blandine 2022-02-16 17:32:57 +01:00
Blandine Bajard
d892e3ff93 modif token service + addMenu en modal 2022-02-16 17:31:18 +01:00
AlineRinquin
a9970a50eb
Merge pull request #30 from AlineRinquin/isa
lili
2022-02-16 15:45:23 +01:00
HarmandI
1bed92a6e4 mise à jour de ma branche 2022-02-16 15:32:19 +01:00
AlineRinquin
e96da0519b
Merge pull request #29 from AlineRinquin/aline
Aline
2022-02-16 15:23:44 +01:00
AlineRinquin
0244cb29ea ajout contact 2022-02-16 15:20:23 +01:00
AlineRinquin
e6f59fb84c Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into aline 2022-02-16 11:49:27 +01:00
AlineRinquin
e82d138907 ajout des couleurs dans le form 2022-02-16 11:48:34 +01:00
AlineRinquin
f284206787
Merge pull request #28 from AlineRinquin/aline
Aline
2022-02-15 15:39:14 +01:00
AlineRinquin
25830750bd
Merge pull request #27 from AlineRinquin/blandine
Blandine
2022-02-15 15:38:25 +01:00
AlineRinquin
a881b6cee6 ajout couleur 2022-02-15 15:37:22 +01:00
HarmandI
ffbcc88df2 ne pas en tenir compte Merci 2022-02-15 15:19:53 +01:00
Blandine Bajard
6e68de9f3a token service 2022-02-15 15:18:07 +01:00
AlineRinquin
fea0ac9524
Merge pull request #26 from AlineRinquin/isa
Isa
2022-02-15 15:04:50 +01:00
HarmandI
507edc6151 Add tache ok 2022-02-15 15:03:35 +01:00
AlineRinquin
98374d8a47 merge conflicts 2022-02-15 14:01:50 +01:00
Blandine Bajard
a2fd96e6a4 Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into blandine 2022-02-15 13:58:26 +01:00
AlineRinquin
61cacda89b fonction delete 2022-02-15 13:58:06 +01:00
Blandine Bajard
26032019c5 menu service 2022-02-15 13:57:42 +01:00
AlineRinquin
46a3ffe671
Merge pull request #25 from AlineRinquin/sana
Sana
2022-02-15 13:55:43 +01:00
Sana EL HIRI
1e491a50ab sidebar 2022-02-14 18:42:03 +01:00
Sana EL HIRI
58f3a1969f commit to merge 2022-02-14 16:46:37 +01:00
Sana EL HIRI
4184e613da commit to merge 2022-02-14 16:44:34 +01:00
AlineRinquin
f404b8fd2f
Merge pull request #24 from AlineRinquin/sana
Sana
2022-02-14 16:39:20 +01:00
AlineRinquin
42b5ac19ef
Merge branch 'dev' into sana 2022-02-14 16:38:15 +01:00
Sana EL HIRI
5df5d379f8 avancées tickets account et membre 2 2022-02-14 16:33:26 +01:00
AlineRinquin
7bed54db11
Merge pull request #23 from AlineRinquin/aline
fonction delete ok
2022-02-14 15:52:26 +01:00
AlineRinquin
4144bc5f3e fonction delete ok 2022-02-14 15:51:13 +01:00
Sana EL HIRI
026ac42818 Side bar css ok avancées sur ticket page account et page membreetc 2022-02-14 15:45:32 +01:00
AlineRinquin
9fa153da8c
Merge pull request #22 from AlineRinquin/blandine
Blandine
2022-02-14 15:25:20 +01:00
Blandine Bajard
d89214db19 component meteo 2022-02-14 12:59:15 +01:00
Blandine Bajard
2f5705e766 page d'accueil fixed 2022-02-14 12:25:49 +01:00
Sana EL HIRI
e53a9a062d Team crud Ok connection Back Ok 2022-02-14 11:47:09 +01:00
HarmandI
efb86420d0 todo en cours 2022-02-14 11:28:50 +01:00