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 |
|
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
|
13c4bea465
|
Merge branch 'dev' into Romain
|
2022-03-03 14:58:16 +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
|
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 |
|