Commit Graph

39 Commits

Author SHA1 Message Date
Sana EL HIRI
adfd1db2ff correction jeremy 2022-03-22 14:54:07 +01:00
HarmandI
d09b147af2
Merge pull request #8 from HarmandI/feature/supprimer
Feature/supprimer
2022-03-22 12:55:35 +01:00
HarmandI
4aced57191 der des der? 2022-03-22 12:54:31 +01:00
Vincent Ramiere
a2ddf52c88 lien Page administrateur dans navbar 2022-03-22 12:52:32 +01:00
Vincent Ramiere
200221dc5c lien admin dans navbar 2022-03-22 12:49:35 +01:00
Sana
4f5e6cd180
Merge pull request #7 from HarmandI/css
css
2022-03-22 12:38:08 +01:00
Sana EL HIRI
33c431921d css 2022-03-22 12:36:25 +01:00
Vincent Ramiere
bd4468a9d6 Merge branch 'main' of https://github.com/HarmandI/Admin-La-Belle-Plante
pull
2022-03-22 12:14:04 +01:00
Vincent Ramiere
983533e4e1 Merge branch 'main' into feature/supprimer 2022-03-22 12:11:34 +01:00
HarmandI
a2cf4f55ed
Merge pull request #6 from HarmandI/feature/ajouter
Feature/ajouter
2022-03-22 12:09:42 +01:00
HarmandI
49edb1782d derniere? 2022-03-22 12:08:27 +01:00
HarmandI
be9e510a94 erreur 2022-03-22 11:47:05 +01:00
HarmandI
a99dbc57ab
Merge pull request #5 from HarmandI/feature/modifier-plante
Feature/modifier plante
2022-03-22 11:45:31 +01:00
HarmandI
426c359dbf
Merge branch 'main' into feature/modifier-plante 2022-03-22 11:45:21 +01:00
Sana EL HIRI
7d8e72e4ac modifier ok 2022-03-22 11:43:33 +01:00
Sana EL HIRI
1b5b7f0e3e modifs 2022-03-22 10:55:06 +01:00
Vincent Ramiere
1b18f648a0 formulaire, ajouter, modifier html 2022-03-22 10:01:26 +01:00
HarmandI
e8c45f87e9
Merge pull request #4 from HarmandI/feature/ajouter
Feature/ajouter
2022-03-22 09:52:58 +01:00
HarmandI
5e8d6c3532
Merge branch 'main' into feature/ajouter 2022-03-22 09:52:51 +01:00
HarmandI
26c96850ca
Merge pull request #3 from HarmandI/feature/supprimer
modif inStock
2022-03-22 09:47:47 +01:00
HarmandI
2773b54531
Merge branch 'main' into feature/supprimer 2022-03-22 09:47:39 +01:00
HarmandI
2ba13fa864
Merge pull request #2 from HarmandI/feature/modifier-plante
Feature/modifier plante
2022-03-22 09:45:33 +01:00
Vincent Ramiere
19d48cc995 modif inStock 2022-03-22 09:44:39 +01:00
Sana EL HIRI
03a825ec76 inStock 2022-03-22 09:42:03 +01:00
HarmandI
f2279bc977 select category et divers 2022-03-22 08:54:41 +01:00
Sana EL HIRI
d9800d3ae5 cette branche vient remplacer feature/modifier qui est corrompue 2022-03-21 20:51:17 +01:00
HarmandI
4d93763aa5 Merge branch 'main' into feature/ajouter 2022-03-21 18:59:04 +01:00
Vincent Ramiere
2d808feb25 merge page supprimer 2022-03-21 18:49:20 +01:00
Vincent Ramiere
04f3b22fd3 conflit de merge 2022-03-21 18:36:26 +01:00
Vincent Ramiere
1f747c6933 supprimer 2022-03-21 18:32:20 +01:00
HarmandI
8db3a6cde1 conflit merge 2022-03-21 18:30:32 +01:00
HarmandI
1406011efc ajouter 1 2022-03-21 18:25:59 +01:00
HarmandI
1afa24289d
Merge pull request #1 from HarmandI/ajout-subject
subject fini
2022-03-21 18:21:03 +01:00
Hedi
62ae357403 subject fini 2022-03-21 18:19:25 +01:00
Hedi
8b00bb2ba3 product_id en id dans db.json 2022-03-21 14:13:34 +01:00
HarmandI
9ffaa62e0f composant plantForm + model 2022-03-21 13:04:19 +01:00
Sana EL HIRI
d25efc4f73 création tableau et récupération des données 2022-03-21 12:15:26 +01:00
Vincent Ramiere
4bbf8906e8 création structure 2022-03-21 11:04:14 +01:00
HarmandI
73897ea5b4 initial 2022-03-21 10:11:14 +01:00