AlineRinquin
|
4e7444f093
|
Merge pull request #51 from AlineRinquin/aline
dasboard pas fini et modif addmembre
|
2022-02-25 16:32:04 +01:00 |
|
AlineRinquin
|
2e36982415
|
Merge branch 'dev' into aline
|
2022-02-25 16:31:53 +01:00 |
|
AlineRinquin
|
896c0c5f3a
|
dasboard pas fini et modif addmembre
|
2022-02-25 16:29:12 +01:00 |
|
AlineRinquin
|
5907b69046
|
Merge pull request #50 from AlineRinquin/blandine
deconnexion button + nav bar fixed
|
2022-02-25 14:32:57 +01:00 |
|
Blandine Bajard
|
eac32838d6
|
deconnexion button + nav bar fixed
|
2022-02-25 12:52:25 +01:00 |
|
AlineRinquin
|
9e40a5ff68
|
Merge pull request #49 from AlineRinquin/blandine
interceptor et guards
|
2022-02-25 10:56:56 +01:00 |
|
Blandine Bajard
|
771c14e7f2
|
interceptor et guards
|
2022-02-25 10:55:33 +01:00 |
|
AlineRinquin
|
75df7b456a
|
Merge pull request #47 from AlineRinquin/blandine
fixed-update-menu
|
2022-02-25 10:51:04 +01:00 |
|
AlineRinquin
|
cac2d1b5b8
|
Merge pull request #48 from AlineRinquin/sana
Sana
|
2022-02-25 10:50:38 +01:00 |
|
Sana EL HIRI
|
466a146174
|
add member avec role ok account récupère les membre en focntion de la team
|
2022-02-25 09:52:06 +01:00 |
|
Blandine Bajard
|
f8bb12cc3a
|
fixed-update-menu
|
2022-02-24 17:44:28 +01:00 |
|
Sana EL HIRI
|
7784870446
|
Merge branch 'dev' into sana
|
2022-02-24 15:13:53 +01:00 |
|
Sana EL HIRI
|
591411bbaa
|
commit to merge
|
2022-02-24 15:13:21 +01:00 |
|
AlineRinquin
|
1f644da5b9
|
Merge pull request #46 from AlineRinquin/aline
dasboard pas fini
|
2022-02-24 15:07:11 +01:00 |
|
AlineRinquin
|
d0519247e0
|
dasboard pas fini
|
2022-02-24 15:05:47 +01:00 |
|
AlineRinquin
|
6da3c9026d
|
Merge pull request #45 from AlineRinquin/blandine
Blandine
|
2022-02-24 15:02:20 +01:00 |
|
Blandine Bajard
|
6e013f3ffe
|
menus de la semaine terminés
|
2022-02-24 15:01:22 +01:00 |
|
Blandine Bajard
|
9c239bdaac
|
menus de la semaine terminé
|
2022-02-24 15:00:33 +01:00 |
|
Blandine Bajard
|
3515e87f13
|
Merge branch 'blandine' of https://github.com/AlineRinquin/organizee-front into blandine
|
2022-02-18 18:09:24 +01:00 |
|
Blandine Bajard
|
6dc16ea103
|
Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into blandine
|
2022-02-18 18:09:14 +01:00 |
|
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 |
|
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 |
|
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 |
|