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 |
|
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 |
|
Sana EL HIRI
|
5df5d379f8
|
avancées tickets account et membre 2
|
2022-02-14 16:33:26 +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 |
|
Blandine Bajard
|
2f5705e766
|
page d'accueil fixed
|
2022-02-14 12:25:49 +01:00 |
|
Sana EL HIRI
|
e53a9a062d
|
Team crud Ok connection Back Ok
|
2022-02-14 11:47:09 +01:00 |
|
HarmandI
|
efb86420d0
|
todo en cours
|
2022-02-14 11:28:50 +01:00 |
|
Hedi MJID
|
3f2bfd26c6
|
fix pb avec le app.module
|
2022-02-11 16:08:59 +01:00 |
|
AlineRinquin
|
ceaec59c0d
|
Merge branch 'dev' into page404
|
2022-02-11 11:50:57 +01:00 |
|
cecilesimplon93
|
f26ce2eaf2
|
page404
|
2022-02-11 11:10:13 +01:00 |
|
Sana EL HIRI
|
ae1fc13951
|
removed merge conflicts
|
2022-02-09 17:55:44 +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 |
|
Blandine Bajard
|
5df6f6f46e
|
css component signin
|
2022-01-25 17:18:51 +01:00 |
|
AlineRinquin
|
a545bf5a25
|
Merge pull request #15 from AlineRinquin/aline
ajout des commentaires manquants sur le code
|
2022-01-23 15:18:13 +01:00 |
|
AlineRinquin
|
595ead0e74
|
ajout des commentaires manquants sur le code
|
2022-01-23 15:17:39 +01:00 |
|
AlineRinquin
|
de17b0d925
|
Merge pull request #14 from AlineRinquin/blandine
Blandine
|
2022-01-23 15:14:35 +01:00 |
|
AlineRinquin
|
a723a02a56
|
Fonctionn modifier contact ok
|
2022-01-23 15:08:17 +01:00 |
|
Blandine Bajard
|
79a6165196
|
css signup
|
2022-01-23 12:00:11 +01:00 |
|
Blandine Bajard
|
7102d73f89
|
reset-password terminé
|
2022-01-23 09:18:57 +01:00 |
|
AlineRinquin
|
0390c45886
|
recup du stach et fonctionalitée modifier contact
|
2022-01-22 14:57:04 +01:00 |
|
Sana EL HIRI
|
efa5bb8d22
|
Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into dev
|
2022-01-21 15:10:38 +01:00 |
|
Sana EL HIRI
|
1ffd4ad2ee
|
dev
|
2022-01-21 15:10:24 +01:00 |
|
AlineRinquin
|
6623310501
|
Merge branch 'dev' into cecile
|
2022-01-21 15:04:53 +01:00 |
|
AlineRinquin
|
241b71e566
|
Merge pull request #10 from AlineRinquin/sana
creation-team connection back ok
|
2022-01-21 14:59:46 +01:00 |
|
AlineRinquin
|
0550e1b239
|
Merge pull request #9 from AlineRinquin/blandine
Blandine
|
2022-01-21 14:58:50 +01:00 |
|
cecilesimplon93
|
080a694838
|
page 404
|
2022-01-21 14:55:35 +01:00 |
|
AlineRinquin
|
f330dc901a
|
Merge branch 'dev' into aline
|
2022-01-21 14:54:29 +01:00 |
|
AlineRinquin
|
cde96f2bb6
|
fonctionalitée ajout contact ok
|
2022-01-21 14:02:57 +01:00 |
|
Sana EL HIRI
|
50f5b00b52
|
creation-team connection back ok
|
2022-01-21 12:56:22 +01:00 |
|
Blandine Bajard
|
20459365ee
|
corrections
|
2022-01-21 12:54:22 +01:00 |
|
Blandine Bajard
|
22af2a20ba
|
ok
|
2022-01-21 12:45:59 +01:00 |
|
Blandine Bajard
|
b994e6be58
|
reset password en cours
|
2022-01-21 12:30:05 +01:00 |
|
AlineRinquin
|
219636bc75
|
Merge branch 'dev' into blandine
|
2022-01-21 09:49:16 +01:00 |
|
AlineRinquin
|
a650aaf3d8
|
Merge branch 'dev' into sana
|
2022-01-21 09:45:22 +01:00 |
|
AlineRinquin
|
60a12b50ad
|
Merge pull request #4 from AlineRinquin/isa
Isa
|
2022-01-21 09:43:52 +01:00 |
|
HarmandI
|
5904f64103
|
début add Member
|
2022-01-20 18:01:32 +01:00 |
|
Sana EL HIRI
|
a344348b7a
|
creation-team incomplet
|
2022-01-20 17:58:46 +01:00 |
|
Blandine Bajard
|
673887a81c
|
forgot-pwd + signup
|
2022-01-20 17:58:18 +01:00 |
|
AlineRinquin
|
4a55d75da7
|
mise en place du html et lien vers le back de repertoire
|
2022-01-20 17:30:17 +01:00 |
|
AlineRinquin
|
68e1df8eb7
|
authentification / signup /signin
|
2022-01-19 16:14:55 +01:00 |
|
AlineRinquin
|
1ba991e959
|
header et side-bar
|
2022-01-19 10:57:26 +01:00 |
|
AlineRinquin
|
6f9112ee91
|
initialisation de l'application
|
2022-01-18 17:12:04 +01:00 |
|
AlineRinquin
|
b9f9f5fb3f
|
initial commit
|
2022-01-18 16:11:37 +01:00 |
|