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 |
|
Blandine Bajard
|
771c14e7f2
|
interceptor et guards
|
2022-02-25 10:55:33 +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 |
|
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 |
|
Blandine Bajard
|
388804ae06
|
menus
|
2022-02-18 17:22:17 +01:00 |
|
cecilesimplon93
|
76f26627bd
|
mise a jour wend
|
2022-02-18 17:05:29 +01:00 |
|
AlineRinquin
|
6504d28c4b
|
Merge branch 'dev' into cecile
|
2022-02-18 10:39:22 +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 |
|
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 |
|
HarmandI
|
ffbcc88df2
|
ne pas en tenir compte Merci
|
2022-02-15 15:19:53 +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 |
|
AlineRinquin
|
61cacda89b
|
fonction delete
|
2022-02-15 13:58:06 +01:00 |
|
Blandine Bajard
|
26032019c5
|
menu service
|
2022-02-15 13:57:42 +01:00 |
|
Sana EL HIRI
|
1e491a50ab
|
sidebar
|
2022-02-14 18:42:03 +01:00 |
|
AlineRinquin
|
42b5ac19ef
|
Merge branch 'dev' into sana
|
2022-02-14 16:38:15 +01:00 |
|
AlineRinquin
|
7bed54db11
|
Merge pull request #23 from AlineRinquin/aline
fonction delete ok
|
2022-02-14 15:52:26 +01:00 |
|
AlineRinquin
|
4144bc5f3e
|
fonction delete ok
|
2022-02-14 15:51:13 +01:00 |
|
Sana EL HIRI
|
026ac42818
|
Side bar css ok avancées sur ticket page account et page membreetc
|
2022-02-14 15:45:32 +01:00 |
|
Blandine Bajard
|
d89214db19
|
component meteo
|
2022-02-14 12:59:15 +01:00 |
|
HarmandI
|
efb86420d0
|
todo en cours
|
2022-02-14 11:28:50 +01:00 |
|
AlineRinquin
|
ceaec59c0d
|
Merge branch 'dev' into page404
|
2022-02-11 11:50:57 +01:00 |
|
cecilesimplon93
|
3be268bfdb
|
page-not-found semble ok
|
2022-02-02 16:28:52 +01:00 |
|
Blandine Bajard
|
0633d6ae6d
|
page d'accueil
|
2022-01-31 18:18:03 +01:00 |
|
AlineRinquin
|
52ff29ca30
|
Merge pull request #17 from AlineRinquin/isa
ToDoList version1 front
|
2022-01-31 09:22:43 +01:00 |
|
HarmandI
|
9287f531d2
|
ToDoList version1 front
|
2022-01-30 20:23:15 +01:00 |
|
Blandine Bajard
|
88fd522f00
|
css component header
|
2022-01-25 17:46:18 +01:00 |
|