Commit Graph

174 Commits

Author SHA1 Message Date
Vincent Ramiere
2502cd88bd modif css search-bar 2022-03-11 15:34:20 +01:00
Vincent Ramiere
403875422c Merge branch 'Vincent' into dev
Footer Responsif
2022-03-11 14:44:23 +01:00
Vincent Ramiere
b9fa5aa2eb footer responsive 2022-03-11 14:38:21 +01:00
Thomas Cardon
e4becefeb5 MAJ Roles 2022-03-11 14:29:20 +01:00
Thomas Cardon
3c2ff28746 resolution bug categorie vide 2022-03-10 15:55:15 +01:00
Thomas Cardon
4528d03909 merge resolution 2022-03-10 13:21:42 +01:00
Thomas Cardon
fb972c6f1d cleanCheckbox 2022-03-10 13:20:12 +01:00
Thomas Cardon
61baefb7f6 cleanCheckbox 2022-03-10 13:18:57 +01:00
Romain Verger
9403571d83 petites modifs 2022-03-10 13:14:32 +01:00
Thomas Cardon
65ab8cf9bc merge resolution 2022-03-10 09:44:44 +01:00
Thomas Cardon
734a7f9068 mis a 2022-03-10 09:40:46 +01:00
Romain Verger
d544ead787 changement regex 2022-03-09 17:12:23 +01:00
Romain Verger
b0fdee89b6 page-denied ok 2022-03-09 16:52:33 +01:00
Romain Verger
8413febc86 changement localhost 2022-03-09 16:45:31 +01:00
Romain Verger
695e8fbe4e merge 2022-03-09 16:43:14 +01:00
Romain Verger
9eca5174d5 Merge branch 'paul' into Romain 2022-03-09 16:43:03 +01:00
Your Name
130250a75a denied + 404 2022-03-09 16:39:07 +01:00
Romain Verger
2ba6818bc5 Merge branch 'dev' into Romain 2022-03-09 16:05:47 +01:00
Romain Verger
1c2eb7afa5 ajout page denied 2022-03-09 16:05:21 +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
Vincent Ramiere
757811c04f bidouilles sans interet 2022-03-08 14:37:02 +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
a41df2d219 Merge branch 'dev' of https://github.com/RomainVgr/simpleat into dev 2022-03-07 16:18:23 +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
91f8f7ad7b localhost 8080 2022-03-04 15:26:28 +01:00
Vincent Ramiere
d4530c3e1e Merge branch 'dev' into Vincent
modif thomas 04/03/2022
2022-03-04 15:23:42 +01:00
Thomas Cardon
1d165f68ba Merge branch 'thomas' into dev 2022-03-04 15:22:39 +01:00
Vincent Ramiere
cd22c70642 Merge branch 'dev' into Vincent
modif paul 4/03/20222
2022-03-04 15:21:34 +01:00
Thomas Cardon
500ba0811a ajout categ dans formulaire creation restau 2022-03-04 15:21:24 +01:00
Vincent Ramiere
de5ed53342 lock.json 2022-03-04 15:19:46 +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