Commit Graph

115 Commits

Author SHA1 Message Date
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 97e024afb3 Merge branch 'Romain' into dev 2022-03-03 14:29: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
Romain Verger 547f6aee58 module deconnexion 2022-03-02 10:25:30 +01:00
Romain Verger 30f70296ba modif app-routing-module 2022-03-01 15:31:13 +01:00
Romain Verger bea5442dea Merge branch 'Romain' into dev 2022-03-01 15:03:32 +01:00
Romain Verger 01b68c0899 ajout sécu signin 2022-03-01 15:02:17 +01:00
Thomas 01778dbfdb
search bar version précédente 2022-02-27 14:45:54 +01:00
Thomas Cardon 4d92ddb960 search-bar = ok 2022-02-25 16:43:31 +01:00
Romain Verger 6c1f0338eb Merge branch 'dev' of https://github.com/RomainVgr/simpleat into dev 2022-02-18 17:25:32 +01:00
Romain Verger 4049a0d8b1 Merge branch 'dev' of https://github.com/RomainVgr/simpleat into dev 2022-02-18 17:24:03 +01:00
Your Name b8922c9185 Merge branch 'dev' into paul 2022-02-18 17:23:17 +01:00
Romain Verger e8a1dcc759 avancement searchBar 2022-02-18 17:22:53 +01:00
Your Name 9f058b2d6a modif card + image 2022-02-18 17:21:51 +01:00
Thomas Cardon 5524d3c6d9 ajout composant add-restau 2022-02-18 16:47:23 +01:00
Romain Verger 3dcdbfb405 ajout Fonction searchBar 2022-02-18 16:41:52 +01:00
Romain Verger 2a3390cbae ajout button Recherche (non fonctionnel) 2022-02-18 15:28:10 +01:00
Your Name 0478d8886a modif paul 2022-02-18 15:24:17 +01:00
Thomas Cardon 19feceeb19 admin-page + prix card resto 2022-02-18 15:11:51 +01:00
Romain Verger b82dc11a35 Merge dev to Romain 2022-02-18 14:52:41 +01:00
Your Name b6976ed5fc modif paul 2022-02-18 14:37:30 +01:00
Your Name c2d98cd094 modif card resto 2022-02-18 14:34:50 +01:00
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
Romain Verger 3bb6ed9780 Modif aEmporter 2022-02-18 10:25:56 +01:00
Romain Verger 8ebcfc32ad Modif aEmporter 2022-02-18 10:25:37 +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