AlineRinquin
|
5d4dd47a96
|
Merge pull request #107 from AlineRinquin/dev
Dev verssion au 14/03/22 version 1.3
|
2022-03-14 09:55:11 +01:00 |
|
AlineRinquin
|
c807c00176
|
Merge pull request #106 from AlineRinquin/cecile
Cecile
|
2022-03-14 08:43:33 +01:00 |
|
AlineRinquin
|
7c3db84ffb
|
Merge pull request #105 from AlineRinquin/calendrier
commentaires
|
2022-03-14 08:31:40 +01:00 |
|
AlineRinquin
|
04734c7348
|
Merge pull request #104 from AlineRinquin/forgot-reset-password
change ip to localhost
|
2022-03-14 08:31:08 +01:00 |
|
Hedi
|
b933bb478d
|
commentaires
|
2022-03-14 00:39:22 +01:00 |
|
Hedi
|
59523cb54b
|
change ip to localhost
|
2022-03-14 00:32:50 +01:00 |
|
AlineRinquin
|
c04b5da615
|
Merge pull request #103 from AlineRinquin/isa2
Isa2
|
2022-03-13 20:57:33 +01:00 |
|
HarmandI
|
a9654e184b
|
Bêtise réparée!
|
2022-03-13 20:55:29 +01:00 |
|
cecilesimplon93
|
227069f71b
|
formulaire fonctionnel, merci Hédi git add .!
|
2022-03-13 20:28:00 +01:00 |
|
AlineRinquin
|
06feb4ab79
|
Merge pull request #102 from AlineRinquin/forgot-reset-password
refacto message alert envoi de mail + tiitre form reset password
|
2022-03-13 19:53:51 +01:00 |
|
Hedi
|
663105a9d3
|
refacto message alert envoi de mail + tiitre form reset password
|
2022-03-13 19:51:03 +01:00 |
|
AlineRinquin
|
725665ad16
|
Merge pull request #101 from AlineRinquin/sana
coms
|
2022-03-13 19:48:44 +01:00 |
|
Sana EL HIRI
|
3326b48eab
|
coms
|
2022-03-13 18:45:28 +01:00 |
|
cecilesimplon93
|
35cba2625c
|
Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into cecile
|
2022-03-13 17:39:07 +01:00 |
|
HarmandI
|
103294207a
|
Fautes orthographe + indentation
|
2022-03-13 17:33:34 +01:00 |
|
AlineRinquin
|
f31463a1b9
|
Merge pull request #100 from AlineRinquin/aline
Aline
|
2022-03-13 17:21:46 +01:00 |
|
AlineRinquin
|
d5defdbf3e
|
ajout des smileys dans coponent avatar plus css plus commentaires
|
2022-03-13 14:47:31 +01:00 |
|
cecilesimplon93
|
790ee67f71
|
détails + début formulaire contacts
|
2022-03-13 10:25:08 +01:00 |
|
AlineRinquin
|
9b67d21485
|
Merge pull request #99 from AlineRinquin/dev
Dev verssion au 11/03/22 verssion 1.2
|
2022-03-11 16:15:32 +01:00 |
|
AlineRinquin
|
0a101c9920
|
essai d flex
|
2022-03-11 15:16:18 +01:00 |
|
AlineRinquin
|
bcc27e9250
|
Merge pull request #98 from AlineRinquin/cecile
retrait de -accueil- dans le footer
|
2022-03-11 14:46:51 +01:00 |
|
cecilesimplon93
|
21f782a4ea
|
retrait de -accueil- dans le footer
|
2022-03-11 13:06:55 +01:00 |
|
AlineRinquin
|
c13767a5dc
|
Merge pull request #97 from AlineRinquin/isa2
commentaires (fin) j'espère!
|
2022-03-11 12:07:58 +01:00 |
|
HarmandI
|
4d8f138c60
|
commentaires (fin) j'espère!
|
2022-03-11 12:05:28 +01:00 |
|
AlineRinquin
|
6f1e79d9b4
|
Merge pull request #96 from AlineRinquin/cecile
couleur humeur component, couleur agenda hédi, espace sur dashboard a…
|
2022-03-11 11:48:31 +01:00 |
|
cecilesimplon93
|
89e50699a3
|
couleur humeur component, couleur agenda hédi, espace sur dashboard aline
|
2022-03-08 18:39:25 +01:00 |
|
AlineRinquin
|
020f56870d
|
Merge pull request #95 from AlineRinquin/sana
Sana
|
2022-03-08 13:58:09 +01:00 |
|
Sana EL HIRI
|
841d8fd78c
|
signup ok et delete membre ok
|
2022-03-08 13:06:48 +01:00 |
|
Sana EL HIRI
|
bd9610275d
|
modifs
|
2022-03-07 20:03:04 +01:00 |
|
Sana EL HIRI
|
c07b32cad1
|
avancées signup
|
2022-03-07 18:29:53 +01:00 |
|
Sana EL HIRI
|
58abccca86
|
Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into sana
|
2022-03-07 16:44:23 +01:00 |
|
AlineRinquin
|
65a61e259b
|
Merge pull request #94 from AlineRinquin/blandine
modif mail add member et comment sur to do list editing
|
2022-03-07 16:41:53 +01:00 |
|
Sana EL HIRI
|
8527024606
|
nettoyage code
|
2022-03-07 16:26:52 +01:00 |
|
Blandine Bajard
|
bb80e279e6
|
modif mail add member et comment sur to do list editing
|
2022-03-07 16:26:02 +01:00 |
|
AlineRinquin
|
f7a657fddd
|
Merge pull request #93 from AlineRinquin/sana
css modifs
|
2022-03-07 15:03:05 +01:00 |
|
Sana EL HIRI
|
d88c7ea5fb
|
css modifs
|
2022-03-07 15:01:35 +01:00 |
|
AlineRinquin
|
a0ecb2419d
|
Merge pull request #92 from AlineRinquin/sana
Sana
|
2022-03-07 12:00:53 +01:00 |
|
AlineRinquin
|
2ca1b760d9
|
Merge pull request #91 from AlineRinquin/fix-humeur
fix humeur + ajout des couleur par page pour la side bar
|
2022-03-07 11:59:12 +01:00 |
|
Sana EL HIRI
|
7d9f63fada
|
css/style modifs header et bouton deconnexion
|
2022-03-07 11:52:12 +01:00 |
|
Sana EL HIRI
|
0a8d6ed7dd
|
css/style modifs
|
2022-03-07 11:24:34 +01:00 |
|
Sana EL HIRI
|
699c7add05
|
modif scss footer, scss sidebar + ajout footer sur pages ajout/modifier/supprimer membre
|
2022-03-07 11:06:24 +01:00 |
|
Sana EL HIRI
|
95d9ab28f0
|
limitations au ROLE_ENFANT sur page account/ modifier, supprimer et ajouter membre ok
|
2022-03-07 10:32:37 +01:00 |
|
Sana EL HIRI
|
2dd153198e
|
Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into sana
|
2022-03-06 22:06:26 +01:00 |
|
Sana EL HIRI
|
50d5794668
|
signup : crée une nouvelle team et un nouveau membre mais ne fait pas le lien entre les deux/ suppression : page création team
|
2022-03-06 22:04:44 +01:00 |
|
Sana EL HIRI
|
4b90b0e1b2
|
avancées et bloquage sur delete
|
2022-03-06 20:49:53 +01:00 |
|
Hedi
|
c2c30c3cf8
|
fix humeur + ajout des couleur par page pour la side bar
|
2022-03-06 19:55:26 +01:00 |
|
AlineRinquin
|
53408a220e
|
Merge pull request #90 from AlineRinquin/isa2
Corrections des bugs
|
2022-03-06 19:24:07 +01:00 |
|
AlineRinquin
|
b4518612ce
|
Merge pull request #88 from AlineRinquin/cecile
Cecile
|
2022-03-06 19:23:33 +01:00 |
|
HarmandI
|
c162d50605
|
Corrections des bugs
|
2022-03-06 18:50:11 +01:00 |
|
Sana EL HIRI
|
b7e4e1ad18
|
avancées
|
2022-03-06 18:30:50 +01:00 |
|