Commit Graph

139 Commits

Author SHA1 Message Date
jleroy
9fbad31470 Gestion login after register beta 2024-04-30 14:29:14 +02:00
Parpaillax
2f34d763d3 merge 2024-04-30 13:21:46 +02:00
Parpaillax
120efcf246 merge 2024-04-30 13:18:38 +02:00
mepiphana2023
882d9bede0 Un peu de tout 2024-04-30 13:14:37 +02:00
Parpaillax
0c92b7e6ff delete article 2024-04-30 13:13:02 +02:00
jleroy
5d888af09b Credit account /bank 2024-04-30 13:12:13 +02:00
Parpaillax
d13ad65102 update article + retrait 2024-04-30 12:17:59 +02:00
Parpaillax
36952b957f merge conflict 2024-04-30 09:03:20 +02:00
Parpaillax
ed8a5939a2 test 2024-04-30 09:00:59 +02:00
jleroy
c1be35a6cc Merge branch 'main' of https://gitlab.com/marvin.epip/enchere 2024-04-29 16:03:31 +02:00
jleroy
d5e4012c79 patch credit 2024-04-29 16:02:06 +02:00
mepiphana2023
d1acc13ef7 Un peu de tout 2024-04-29 16:02:06 +02:00
jleroy
c068412213 Merge branch 'Johan' 2024-04-29 13:46:29 +02:00
jleroy
ae040010aa Mot de passe oublie terminer 2024-04-29 13:44:37 +02:00
mepiphana2023
9c5ece84cc Un peu de tout 2024-04-29 12:54:16 +02:00
Parpaillax
1dd673c6bc merge conflict 2024-04-26 15:49:45 +02:00
Parpaillax
54f1503ac2 edit article 2024-04-26 15:42:25 +02:00
jleroy
c4b23fdc89 Page admin final no css and mot de passe perdu 2024-04-26 15:41:27 +02:00
Parpaillax
bd37441f9c end article start edit article 2024-04-26 14:29:43 +02:00
Parpaillax
92173c2b94 Merge branch 'Johan' 2024-04-26 13:52:32 +02:00
Parpaillax
413aa031e5 better article 2024-04-26 13:51:57 +02:00
jleroy
ff7df78e31 Page admin final no css 2024-04-26 13:51:17 +02:00
Parpaillax
b970ad4c30 test 2024-04-26 11:30:41 +02:00
Parpaillax
f32a30967f Merge branch 'Johan' 2024-04-26 11:29:25 +02:00
jleroy
0c28a4ce14 Page admin V1 2024-04-26 11:28:16 +02:00
Parpaillax
b2175b7f96 error enchere 2024-04-26 11:28:09 +02:00
Parpaillax
42b38dd802 Seucrity on enchere 2024-04-25 17:00:40 +02:00
jleroy
658f1c3e9c Début de la page admin 2024-04-25 16:58:47 +02:00
Parpaillax
85f4f52960 patch conflict 2024-04-25 15:45:23 +02:00
Parpaillax
34d3696adf merge conflict 2024-04-25 15:44:49 +02:00
Parpaillax
061c4003ed Merge branch 'Johan' 2024-04-25 15:41:58 +02:00
jleroy
e08371fafe Début de la page admin 2024-04-25 15:41:09 +02:00
mepiphana2023
8b252e7038 front 2024-04-25 15:40:41 +02:00
Parpaillax
a898b160b7 save enchere 2024-04-25 15:39:50 +02:00
jleroy
7513587b76 Correction validation all formulaire version final 2024-04-25 14:54:23 +02:00
Parpaillax
0831273dab Merge branch 'Johan' 2024-04-25 12:49:37 +02:00
mepiphana2023
0993bb0564 filtres articles 2024-04-25 12:49:07 +02:00
jleroy
bd32e620f7 Correction validation all formulaire 2024-04-25 12:48:30 +02:00
Parpaillax
c536001a04 test 2024-04-25 10:46:34 +02:00
Parpaillax
84c96f8f1b Merge branch 'Olivier' 2024-04-25 10:45:30 +02:00
Parpaillax
7fc748caf3 test 2024-04-25 10:45:02 +02:00
mepiphana2023
129fe541f7 user detail 2024-04-25 10:44:59 +02:00
jleroy
c25f03de15 Correction validation all formulaire 2024-04-25 10:44:58 +02:00
Parpaillax
eaa5a41b88 Merge branch 'Olivier' 2024-04-25 10:03:54 +02:00
Parpaillax
d3cccc8d66 Merge branch 'Johan' 2024-04-25 10:03:47 +02:00
mepiphana2023
3af1ce6623 filtre articles 2024-04-25 10:03:12 +02:00
jleroy
c4020f1612 Ajout article final 2024-04-25 10:03:01 +02:00
Parpaillax
aa6216a926 test 2024-04-25 10:02:50 +02:00
ionak
01f120cb2f critere de recherche 2024-04-24 23:19:42 +02:00
Parpaillax
6ffe121111 Merge branch 'Johan' 2024-04-24 16:55:25 +02:00