Commit Graph

77 Commits

Author SHA1 Message Date
Thomas Cardon d7f423f93c stash merge + card resto 2022-02-18 14:21:13 +01:00
Thomas Cardon 334f799c60 Merge branch 'dev' of https://github.com/RomainVgr/simpleat into dev 2022-02-18 14:17:55 +01:00
Vincent Ramiere cf102b766c card resto 2022-02-18 10:53:08 +01:00
Vincent Ramiere a0df10e724 Merge branch 'dev' into Vincent
OK
2022-02-18 10:25:20 +01:00
Thomas Cardon dc03c1b25f mis en place admin-page 2022-02-18 10:16:55 +01:00
Romain Verger 9e03cf2750 Merge branch 'Romain' into dev 2022-02-18 10:12:33 +01:00
Romain Verger e96f370497 Filtres test ok 2022-02-18 10:11:52 +01:00
Vincent Ramiere e3abfaae06 modif fond d'ecran sigin 2022-02-18 10:10:09 +01:00
Your Name 9b6c646c14 migration home page vers list category 2022-02-18 10:05:28 +01:00
Vincent Ramiere 543bbcd2e0 test modif footer NOK 2022-02-17 11:48:25 +01:00
Your Name 1b51cb5787 photos 2022-02-16 17:38:37 +01:00
Vincent Ramiere 63906bf345 Suppression des components sur la page signin 2022-02-16 17:37:58 +01:00
Vincent Ramiere b774a93da7 Merge branch 'dev' into Vincent
ok
2022-02-16 15:09:49 +01:00
Romain Verger a97d444fe1 Merge branch 'dev' into Romain 2022-02-16 14:19:22 +01:00
Romain Verger f7e123b159 Modif filtres 2022-02-16 14:17:44 +01:00
Your Name 0bb889bc40 modif card resto 2022-02-16 14:14:07 +01:00
Romain Verger 0d9546fff0 merge dev vers Romain 2022-02-16 14:07:27 +01:00
Your Name db957edd2d modif card resto 2022-02-16 14:05:49 +01:00
Your Name ce1fe995b8 modif card resto 2022-02-16 12:35:13 +01:00
Thomas Cardon 2170ef0f65 filtres prix = ok 2022-02-16 12:03:15 +01:00
Vincent Ramiere 35d7393eaf fusion apres trompage 2022-02-15 15:30:33 +01:00
Thomas Cardon a6d96e2280 template-page in appModule 2022-02-15 15:18:16 +01:00
Romain Verger 4ed189dc0f modif 2022-02-15 15:12:53 +01:00
Romain Verger a30efc0cf7 Merge branch 'dev' of https://github.com/RomainVgr/simpleat into dev 2022-02-15 15:06:01 +01:00
Thomas Cardon e945b46aba merge thomas into dev 2022-02-15 15:03:21 +01:00
Thomas Cardon c633f4dc3d Merge branch 'thomas' into dev 2022-02-15 15:02:55 +01:00
Romain Verger a4b719ba94 Merge branch 'Romain' into dev 2022-02-15 15:00:40 +01:00
Thomas Cardon 1726ec44b2 petite modif let 2022-02-15 15:00:40 +01:00
Romain Verger 8c1cee7e24 Modif filtres page 2022-02-15 14:58:50 +01:00
Thomas Cardon 993be2e1b0 distance+Site Web in cardResto 2022-02-15 14:54:17 +01:00
Your Name 59ca38b89b card resto 2022-02-15 14:06:23 +01:00
Your Name bdeb6fd265 modifs carte restau accordeon 2022-02-14 17:27:44 +01:00
Romain Verger 637e8f75cd avancement filtres 2022-02-14 16:51:32 +01:00
Vincent Ramiere edf93ab0f8 Merge branch 'Vincent' into dev 2022-02-14 16:32:30 +01:00
Vincent Ramiere 34777f7a5e Modif sigin 2022-02-14 15:56:05 +01:00
Thomas Cardon 5d3549b0b6 composant icon into card-resto 2022-02-11 14:16:59 +01:00
Thomas Cardon 1b520593cd Service restoByCat + icone 2022-02-04 14:13:52 +01:00
Romain 48d4b68b9b Merge branch 'dev' of https://github.com/RomainVgr/simpleat into dev 2022-02-04 11:35:23 +01:00
Your Name 781d097cad Merge branch 'paul' into dev 2022-02-04 11:23:09 +01:00
Your Name 56d663bb7f modif card resto search bar 2022-01-21 16:21:44 +01:00
Romain 16b5f51e26 Mise en plave range TypeScript 2022-01-21 15:07:18 +01:00
Romain 05f04db32b Modifs mineures Page Filter 2022-01-21 12:33:21 +01:00
Romain c749473762 Page filters améliorations + Composant Avis-bar 2022-01-21 12:14:52 +01:00
Your Name 77131ede13 Merge branch 'dev' into paul 2022-01-21 09:14:56 +01:00
Your Name e7566908a7 modif card resto 2022-01-21 09:13:47 +01:00
Vincent Ramiere e3b80c3049 Merge branch 'dev' of https://github.com/RomainVgr/simpleat into dev
parceque
2022-01-20 17:41:09 +01:00
Vincent Ramiere f54cdf8365 Ajout sigin 2022-01-20 17:29:42 +01:00
Your Name bb6a6f07ce Merge branch 'dev' of https://github.com/RomainVgr/simpleat into dev 2022-01-20 17:27:18 +01:00
Your Name 1c9acc3193 card resto + modifs 2022-01-20 17:23:07 +01:00
Romain ac3c69e0f6 Merge branch 'dev' into Romain 2022-01-20 17:18:26 +01:00