Blandine Bajard
|
b2f01ab493
|
merde
|
2022-02-18 18:00:49 +01:00 |
|
Blandine Bajard
|
c55e0e93b1
|
Merge pull request #43 from AlineRinquin/dev
Merge pull request #42 from AlineRinquin/blandine
|
2022-02-18 18:00:07 +01:00 |
|
Blandine Bajard
|
55c72fccc6
|
Merge pull request #42 from AlineRinquin/blandine
menus
|
2022-02-18 17:54:07 +01:00 |
|
Blandine Bajard
|
e40a927044
|
Merge branch 'dev' into blandine
|
2022-02-18 17:53:52 +01:00 |
|
Blandine Bajard
|
388804ae06
|
menus
|
2022-02-18 17:22:17 +01:00 |
|
cecilesimplon93
|
33052f54d1
|
Merge branch 'dev' into cecile
|
2022-02-18 17:10:11 +01:00 |
|
cecilesimplon93
|
76f26627bd
|
mise a jour wend
|
2022-02-18 17:05:29 +01:00 |
|
Sana EL HIRI
|
f9bf388ac7
|
Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into dev
|
2022-02-18 17:03:49 +01:00 |
|
Sana EL HIRI
|
156c9676c0
|
commit to merge
|
2022-02-18 17:00:14 +01:00 |
|
AlineRinquin
|
5a90969f71
|
Merge pull request #41 from AlineRinquin/calendrier
Calendrier
|
2022-02-18 16:38:08 +01:00 |
|
Hedi
|
c9c354360d
|
calendrier full
|
2022-02-18 16:34:29 +01:00 |
|
Hedi
|
83da5729e1
|
calendrier css
|
2022-02-18 16:27:46 +01:00 |
|
Hedi
|
8099f55335
|
calendrier html
|
2022-02-18 16:24:33 +01:00 |
|
Hedi
|
faa4571f67
|
calendrier ts
|
2022-02-18 16:19:48 +01:00 |
|
Hedi
|
42f486e66a
|
calendrier service
|
2022-02-18 16:16:55 +01:00 |
|
Hedi
|
4f624bf33f
|
initialisation du calendrier
|
2022-02-18 16:08:47 +01:00 |
|
Hedi
|
cce97527b5
|
modif
|
2022-02-18 14:27:37 +01:00 |
|
Hedi
|
4afd11b34e
|
change port 8080
|
2022-02-18 11:43:30 +01:00 |
|
AlineRinquin
|
3644b8f1bd
|
Merge pull request #40 from AlineRinquin/aline
fix conflicts
|
2022-02-18 11:00:41 +01:00 |
|
AlineRinquin
|
2596418c94
|
fix conflicts
|
2022-02-18 10:59:57 +01:00 |
|
Hedi
|
53119ea28a
|
package
|
2022-02-18 10:56:09 +01:00 |
|
cecilesimplon93
|
0516b99866
|
Merge branch 'dev' into cecile
|
2022-02-18 10:53:55 +01:00 |
|
cecilesimplon93
|
ab47488db1
|
re
|
2022-02-18 10:53:01 +01:00 |
|
Hedi
|
bc51469588
|
Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into dev
|
2022-02-18 10:45:19 +01:00 |
|
AlineRinquin
|
056576b87f
|
Merge pull request #39 from AlineRinquin/cecile
Cecile
|
2022-02-18 10:39:29 +01:00 |
|
AlineRinquin
|
6504d28c4b
|
Merge branch 'dev' into cecile
|
2022-02-18 10:39:22 +01:00 |
|
Hedi
|
4e56e325c9
|
package
|
2022-02-18 10:34:56 +01:00 |
|
cecilesimplon93
|
6d917a62ad
|
correction
|
2022-02-18 09:58:44 +01:00 |
|
cecilesimplon93
|
11109e4afd
|
ajustement avatar
|
2022-02-18 09:43:15 +01:00 |
|
AlineRinquin
|
74e28d14f4
|
Merge pull request #37 from AlineRinquin/sana
sticky sidebar
|
2022-02-18 09:27:57 +01:00 |
|
Sana EL HIRI
|
674560bd84
|
sticky sidebar
|
2022-02-18 09:27:24 +01:00 |
|
Hedi
|
f41d09fcb0
|
package-lock
|
2022-02-17 16:15:52 +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 |
|
cecilesimplon93
|
72d0c77dd3
|
finalisation humeurs, mise en place plan du site
|
2022-02-16 17:50:53 +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 |
|