Blandine Bajard
|
c2091c7961
|
localhost8088
|
2022-03-02 09:35:32 +01:00 |
|
Hedi
|
fa3265f533
|
component alert pour afficher une alert avec un message
|
2022-03-01 21:16:33 +01:00 |
|
Hedi
|
3b4e3b2f84
|
component alert pour afficher une alert avec un message
|
2022-03-01 20:58:35 +01:00 |
|
Hedi
|
b4ca38d046
|
merge avec dev
|
2022-03-01 19:55:13 +01:00 |
|
Hedi
|
86bdf56cb6
|
missing role
|
2022-03-01 19:07:37 +01:00 |
|
AlineRinquin
|
0784bacd2e
|
Merge pull request #65 from AlineRinquin/calendrier-dashboard
calendrier component pour le dashboard
|
2022-03-01 18:50:34 +01:00 |
|
AlineRinquin
|
4807bfde57
|
Merge pull request #64 from AlineRinquin/calendrier
Calendrier
|
2022-03-01 18:50:01 +01:00 |
|
Hedi
|
cd8a67a9e7
|
calendrier : fin + gestion des roles + debug
|
2022-03-01 18:37:35 +01:00 |
|
Hedi
|
de0413930b
|
calendrier component pour le dashboard
|
2022-03-01 18:32:13 +01:00 |
|
Blandine Bajard
|
6c489a4fda
|
Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into blandine
|
2022-03-01 17:32:23 +01:00 |
|
Blandine Bajard
|
476cc12cc0
|
trucs de menu et token
|
2022-03-01 17:32:16 +01:00 |
|
Hedi
|
68aae07bb3
|
calendrier : fin + gestion des roles + debug
|
2022-03-01 15:17:34 +01:00 |
|
Hedi
|
f02e3b630e
|
calendrier : fin + gestion des roles
|
2022-03-01 15:12:41 +01:00 |
|
HarmandI
|
de3fbc6fda
|
Merge branch 'dev' into isa2
|
2022-02-28 08:34:43 +01:00 |
|
HarmandI
|
759612288a
|
Css To-do-list
|
2022-02-28 08:26:08 +01:00 |
|
Hedi
|
b0c15f976b
|
affichage de message d erreur lors du login
|
2022-02-27 17:55:42 +01:00 |
|
AlineRinquin
|
547740dd44
|
Merge pull request #61 from AlineRinquin/calendrier
Calendrier
|
2022-02-27 16:38:53 +01:00 |
|
AlineRinquin
|
46a6e3b506
|
Merge pull request #60 from AlineRinquin/isa2
Toutes les fonctionnalités to do list ok
|
2022-02-27 16:28:24 +01:00 |
|
Hedi
|
bd3ee44a1d
|
merge avec dev
|
2022-02-27 15:56:01 +01:00 |
|
HarmandI
|
59b55b35a7
|
Toutes les fonctionnalités to do list ok
|
2022-02-27 15:51:53 +01:00 |
|
Hedi
|
b3b724ecf0
|
update resizing event
|
2022-02-27 15:13:50 +01:00 |
|
AlineRinquin
|
4aa5469a04
|
Merge pull request #59 from AlineRinquin/forgot-reset-password
Forgot reset password
|
2022-02-27 14:53:05 +01:00 |
|
Hedi MJID
|
e997e0541d
|
ajout de la redirection apres le new password
|
2022-02-26 19:35:51 +01:00 |
|
Hedi MJID
|
1d8eb27df0
|
refacto forgot/reset password
|
2022-02-26 19:23:13 +01:00 |
|
AlineRinquin
|
4386c4b474
|
redirection page acceuil et miseen place de privation d'action si enfant
|
2022-02-26 17:48:12 +01:00 |
|
Hedi MJID
|
e7b153e1a0
|
+appmodule - humeur
|
2022-02-26 14:33:18 +01:00 |
|
Hedi MJID
|
9b3c02f6c1
|
tracking files
|
2022-02-26 14:19:27 +01:00 |
|
Hedi MJID
|
c0a89e1868
|
update agenda + team service
|
2022-02-26 14:17:47 +01:00 |
|
Sana EL HIRI
|
21e076b1ee
|
addMember envoi de mail ok
|
2022-02-25 18:52:30 +01:00 |
|
Blandine Bajard
|
f79b47f3ac
|
encore erreur
|
2022-02-25 17:19:03 +01:00 |
|
AlineRinquin
|
4b17f61207
|
Merge branch 'dev' into aline
|
2022-02-25 17:16:58 +01:00 |
|
Blandine Bajard
|
bae708b85e
|
resoling some mistakes
|
2022-02-25 17:15:06 +01:00 |
|
AlineRinquin
|
b885324f1f
|
resolve conflicts
|
2022-02-25 17:14:58 +01:00 |
|
Blandine Bajard
|
50fd7539ac
|
truc
|
2022-02-25 17:02:25 +01:00 |
|
Blandine Bajard
|
2a10f319ae
|
je sais pas
|
2022-02-25 17:00:35 +01:00 |
|
AlineRinquin
|
a04bef6954
|
Merge pull request #53 from AlineRinquin/aline
koehfozh
|
2022-02-25 16:59:46 +01:00 |
|
AlineRinquin
|
d08399693d
|
koehfozh
|
2022-02-25 16:59:15 +01:00 |
|
AlineRinquin
|
03ec7ffe92
|
Merge branch 'dev' into cecile
|
2022-02-25 16:58:21 +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 |
|
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 |
|
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 |
|
cecilesimplon93
|
530cd73b3f
|
ça devrait le faire
|
2022-02-24 15:21:36 +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 |
|
Blandine Bajard
|
6e013f3ffe
|
menus de la semaine terminés
|
2022-02-24 15:01:22 +01:00 |
|
cecilesimplon93
|
c8b13f2de6
|
Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into cecile
|
2022-02-24 15:01:00 +01:00 |
|
Blandine Bajard
|
9c239bdaac
|
menus de la semaine terminé
|
2022-02-24 15:00:33 +01:00 |
|
cecilesimplon93
|
923a7507e9
|
ajout formulaire page-support, pas de ts
|
2022-02-23 20:41:02 +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
|
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 |
|
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
|
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 |
|
AlineRinquin
|
6504d28c4b
|
Merge branch 'dev' into cecile
|
2022-02-18 10:39:22 +01:00 |
|
cecilesimplon93
|
11109e4afd
|
ajustement avatar
|
2022-02-18 09:43:15 +01:00 |
|
Sana EL HIRI
|
674560bd84
|
sticky sidebar
|
2022-02-18 09:27:24 +01:00 |
|
AlineRinquin
|
257bbdde40
|
page repertoire presque fini
|
2022-02-17 14:02:01 +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
|
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
|
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
|
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 |
|
cecilesimplon93
|
50ef04ca86
|
page 404 et début choix humeur
|
2022-02-15 15:46:31 +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 |
|