Commit Graph

76 Commits

Author SHA1 Message Date
AlineRinquin
25830750bd
Merge pull request #27 from AlineRinquin/blandine
Blandine
2022-02-15 15:38:25 +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
Blandine Bajard
a2fd96e6a4 Merge branch 'dev' of https://github.com/AlineRinquin/organizee-front into blandine 2022-02-15 13:58:26 +01:00
Blandine Bajard
26032019c5 menu service 2022-02-15 13:57:42 +01:00
AlineRinquin
46a3ffe671
Merge pull request #25 from AlineRinquin/sana
Sana
2022-02-15 13:55:43 +01:00
Sana EL HIRI
1e491a50ab sidebar 2022-02-14 18:42:03 +01:00
Sana EL HIRI
58f3a1969f commit to merge 2022-02-14 16:46:37 +01:00
Sana EL HIRI
4184e613da commit to merge 2022-02-14 16:44:34 +01:00
AlineRinquin
f404b8fd2f
Merge pull request #24 from AlineRinquin/sana
Sana
2022-02-14 16:39:20 +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
AlineRinquin
9fa153da8c
Merge pull request #22 from AlineRinquin/blandine
Blandine
2022-02-14 15:25:20 +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
AlineRinquin
acfb169715
Merge pull request #21 from AlineRinquin/fix-front
fix pb avec le app.module
2022-02-11 16:19:54 +01:00
Hedi MJID
3f2bfd26c6 fix pb avec le app.module 2022-02-11 16:08:59 +01:00
AlineRinquin
2cf744c30d
Merge pull request #20 from AlineRinquin/page404
Page404
2022-02-11 11:51:14 +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
AlineRinquin
5c7e4662b2
Merge pull request #19 from AlineRinquin/aline
instaltion module autofocus
2022-02-02 10:43:02 +01:00
AlineRinquin
8bdc521f2d instaltion module autofous 2022-02-02 10:41:37 +01:00
AlineRinquin
3331a34b9f
Merge pull request #18 from AlineRinquin/blandine
page d'accueil
2022-02-01 08:49:07 +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
AlineRinquin
a7483795a3
Merge pull request #16 from AlineRinquin/blandine
Blandine
2022-01-26 15:44:12 +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
307f1343a5
Merge pull request #13 from AlineRinquin/aline
Aline
2022-01-23 15:13:31 +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
ef3418b45c
Merge pull request #11 from AlineRinquin/cecile
page 404
2022-01-21 15:05:01 +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