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 |
|
AlineRinquin
|
7c1eeaca82
|
variables envoronement
|
2022-03-02 14:01:01 +01:00 |
|
Blandine Bajard
|
0f27a72de2
|
Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into blandine
|
2022-03-02 09:35:39 +01:00 |
|
Blandine Bajard
|
c2091c7961
|
localhost8088
|
2022-03-02 09:35:32 +01:00 |
|
AlineRinquin
|
8826efdd3f
|
Merge pull request #69 from AlineRinquin/component-alert
Component alert
|
2022-03-01 21:52:53 +01:00 |
|
Hedi
|
fa3265f533
|
component alert pour afficher une alert avec un message
|
2022-03-01 21:16:33 +01:00 |
|
AlineRinquin
|
8cdd8d3e64
|
Merge pull request #68 from AlineRinquin/component-alert
Component alert
|
2022-03-01 21:04:50 +01:00 |
|
AlineRinquin
|
9d130f3415
|
Merge pull request #67 from AlineRinquin/calendrier
missing role
|
2022-03-01 21:03:11 +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 |
|
AlineRinquin
|
ba178b22dd
|
Merge pull request #66 from AlineRinquin/blandine
Blandine
|
2022-03-01 18:49:18 +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 |
|
AlineRinquin
|
4b5b3020ac
|
Merge pull request #63 from AlineRinquin/isa2
Isa2
|
2022-02-28 21:09:50 +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 |
|
AlineRinquin
|
174c3fd77f
|
Merge pull request #62 from AlineRinquin/login-message
affichage de message d erreur lors du login
|
2022-02-27 18:07:00 +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
|
c9d964f7dc
|
Merge pull request #58 from AlineRinquin/aline
Aline
|
2022-02-26 17:50:09 +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
|
9501ab5c47
|
Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into dev
|
2022-02-26 15:03:06 +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 |
|