Sana EL HIRI
|
4b90b0e1b2
|
avancées et bloquage sur delete
|
2022-03-06 20:49:53 +01:00 |
|
Sana EL HIRI
|
b7e4e1ad18
|
avancées
|
2022-03-06 18:30:50 +01:00 |
|
Sana EL HIRI
|
4a4c511fcd
|
Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into sana
|
2022-03-04 18:10:03 +01:00 |
|
Sana EL HIRI
|
f8fccea027
|
petites avancées
|
2022-03-04 18:07:59 +01:00 |
|
Blandine Bajard
|
42eff07067
|
menache
|
2022-03-04 16:39:56 +01:00 |
|
AlineRinquin
|
4ccbbf869b
|
Merge pull request #78 from AlineRinquin/aline
Aline
|
2022-03-04 16:18:30 +01:00 |
|
AlineRinquin
|
6a2ddf7fad
|
dasboard css et update contact ngmodel
|
2022-03-04 16:17:28 +01:00 |
|
AlineRinquin
|
5ad57fbd88
|
Merge pull request #77 from AlineRinquin/calendrier
Calendrier
|
2022-03-04 16:08:06 +01:00 |
|
AlineRinquin
|
03a3cd0351
|
Merge pull request #76 from AlineRinquin/formulaire-evenement
calendrier : ajout du formulaire d'ajout de evenement
|
2022-03-04 16:03:59 +01:00 |
|
AlineRinquin
|
1264566762
|
Merge pull request #75 from AlineRinquin/blandine
menu update fixed
|
2022-03-04 16:02:50 +01:00 |
|
Hedi MJID
|
48dedea665
|
calendrier : ajout du formulaire d'ajout de evenement
|
2022-03-04 15:54:34 +01:00 |
|
Sana EL HIRI
|
1191176e25
|
avancées à merge
|
2022-03-04 15:50:51 +01:00 |
|
Blandine Bajard
|
799c29e08f
|
menu update fixed
|
2022-03-04 15:40:26 +01:00 |
|
Hedi MJID
|
52286c1b7f
|
calendrier : ajout de commentaires
|
2022-03-04 14:31:50 +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 |
|
Blandine Bajard
|
cb3862141b
|
footer sur menu
|
2022-03-02 17:01:02 +01:00 |
|
Blandine Bajard
|
d2cd689713
|
alerte sur menus et comment du code
|
2022-03-02 15:57:03 +01:00 |
|
Hedi
|
3b4e3b2f84
|
component alert pour afficher une alert avec un message
|
2022-03-01 20:58:35 +01:00 |
|
Hedi
|
86bdf56cb6
|
missing role
|
2022-03-01 19:07:37 +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 |
|
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 |
|
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 |
|
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 |
|