Commit Graph

142 Commits

Author SHA1 Message Date
Your Name
130250a75a denied + 404 2022-03-09 16:39:07 +01:00
Thomas Cardon
a204a18e99 authentification avec Role 2022-03-09 15:57:38 +01:00
Thomas Cardon
f7d6b0f691 bug restauCateg = ok 2022-03-09 14:52:09 +01:00
Thomas Cardon
8b70164a9f Merge branch 'dev' into thomas 2022-03-09 13:56:06 +01:00
Thomas Cardon
e3585e4979 likeRestau = ok 2022-03-09 13:54:10 +01:00
Romain Verger
57d085d470 Merge branch 'Romain' into dev 2022-03-09 13:53:34 +01:00
Romain Verger
97124d3f02 petites modifs 2022-03-09 13:53:07 +01:00
Thomas Cardon
7615cebc20 checkbox= ok + modif d'un restau ok 2022-03-08 14:37:39 +01:00
Thomas Cardon
bd6827fe30 maj 2022-03-07 16:27:27 +01:00
Thomas Cardon
8f3d2669e5 merge dev->thomas 2022-03-07 16:24:48 +01:00
Thomas Cardon
9fe71c85d9 modif restau manque checkbox 2022-03-07 16:17:44 +01:00
Your Name
edcd583de8 Merge branch 'dev' into paul 2022-03-07 16:12:22 +01:00
Your Name
7abc3d09d6 modif responsive 2022-03-07 16:11:36 +01:00
Romain Verger
c4d838856b modif page account 2022-03-07 16:11:13 +01:00
Romain Verger
c80b74eb7f page account 2022-03-07 15:36:40 +01:00
Romain Verger
b771677562 Ajout d'un membre 2022-03-07 13:48:49 +01:00
Romain Verger
802fe74a29 Ajout d'un membre 2022-03-07 13:48:33 +01:00
Thomas Cardon
1d165f68ba Merge branch 'thomas' into dev 2022-03-04 15:22:39 +01:00
Thomas Cardon
500ba0811a ajout categ dans formulaire creation restau 2022-03-04 15:21:24 +01:00
Romain Verger
f086d7b70d Merge branch 'Romain' into dev 2022-03-04 15:19:37 +01:00
Romain Verger
0f68db5042 maj 2022-03-04 15:18:44 +01:00
Your Name
00df317bb0 home page + typo 2022-03-04 15:16:55 +01:00
Romain Verger
ffc40296f3 Merge branch 'Romain' into dev 2022-03-04 11:20:47 +01:00
Romain Verger
c0768c3f79 page accueil 2022-03-04 11:18:53 +01:00
Thomas Cardon
b7d5ef1043 Merge branch 'dev' of https://github.com/RomainVgr/simpleat into dev 2022-03-04 11:01:44 +01:00
Thomas Cardon
321e0a16be search-bar modifiée+ link admin 2022-03-04 11:01:20 +01:00
Romain Verger
e633e445c5 ajout images accueil 2022-03-04 09:07:41 +01:00
Romain Verger
58332161ae Merge branch 'dev' into Romain 2022-03-03 17:16:54 +01:00
Romain Verger
6de3e4dfda Ajout prenom page d'accueil 2022-03-03 17:16:07 +01:00
Thomas Cardon
a04197cceb toggle like coeur=ok 2022-03-03 16:35:44 +01:00
Romain Verger
7aa95ef99a Merge branch 'dev' into Romain 2022-03-03 15:22:17 +01:00
Thomas Cardon
d1a49dae32 ajout favoris sur pages categories 2022-03-03 15:12:19 +01:00
Romain Verger
daa51bafb1 delete token expiration 2022-03-03 14:57:55 +01:00
Romain Verger
1607634d17 delete token expiration 2022-03-03 14:57:37 +01:00
Thomas Cardon
a7a53659f2 merge resolution 2022-03-03 14:49:55 +01:00
Thomas Cardon
c70e3bab94 favoris avec coeur rempli 2022-03-03 14:46:09 +01:00
Romain Verger
d169ba120f onglet restau + debut Favoris 2022-03-03 14:28:40 +01:00
Romain Verger
4a271c15b7 Merge dev into Romain 2022-03-02 16:56:14 +01:00
Thomas Cardon
ea3e2ad2ae search bar ok 2022-03-02 16:55:50 +01:00
Romain Verger
6c9aa254e8 Merge branch 'dev' into Romain 2022-03-02 16:51:22 +01:00
Thomas Cardon
b3987b0255 init : getPersonne dans favoris 2022-03-02 16:48:32 +01:00
Romain Verger
82ff9da81c Ajout restaurants nav-bar 2022-03-02 16:23:17 +01:00
Romain Verger
36b79bfb66 recuperer id du token 2022-03-02 16:16:10 +01:00
Thomas Cardon
829c8333f6 merge resolution 2022-03-02 14:20:51 +01:00
Romain Verger
0478637dd6 Merge branch 'Romain' into dev 2022-03-02 13:52:59 +01:00
Thomas Cardon
9148c51a1f resolution merge 2022-03-02 13:46:34 +01:00
Thomas Cardon
7ac59372b2 ajout getPersonnById ds service + ds favoris 2022-03-02 13:43:30 +01:00
Thomas Cardon
e72283e305 admin:crea suppr restau, search bar 2022-03-02 12:43:16 +01:00
Romain Verger
55d122eeea modif connexion 2022-03-02 12:40:21 +01:00
Romain Verger
c082030aed modif page connexion (cacher composants) 2022-03-02 12:40:01 +01:00