Commit Graph

220 Commits

Author SHA1 Message Date
jleroy
474dec272c patch articles BDD 2024-04-29 16:49:40 +02:00
jleroy
c1be35a6cc Merge branch 'main' of https://gitlab.com/marvin.epip/enchere 2024-04-29 16:03:31 +02:00
mepiphana2023
c6207224c4 Un peu de tout 2024-04-29 16:02:46 +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
2791df65ea Merge branch 'main' of https://gitlab.com/marvin.epip/enchere 2024-04-26 15:49:57 +02:00
Parpaillax
1dd673c6bc merge conflict 2024-04-26 15:49:45 +02:00
mepiphana2023
f5d972d9da Merge remote-tracking branch 'origin/main'
# Conflicts:
#	src/main/resources/i18n/messages_en.properties
2024-04-26 15:47:06 +02:00
mepiphana2023
acbe792ed5 langue 2024-04-26 15:46:40 +02:00
Parpaillax
396dc56bbd merge conflict 2024-04-26 15:45:31 +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
mepiphana2023
5f1c440ef3 langue 2024-04-26 15:37:15 +02:00
Parpaillax
bd37441f9c end article start edit article 2024-04-26 14:29:43 +02:00
Parpaillax
5183bf0a7a Merge branch 'marvin' 2024-04-26 13:52:36 +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
mepiphana2023
df6c7c0cbc langue 2024-04-26 13:51:36 +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
mepiphana2023
1e08ee7091 inscription 2024-04-26 11:28:42 +02:00
Parpaillax
ba081d8807 Merge branch 'Johan' of https://gitlab.com/marvin.epip/enchere into Johan 2024-04-26 11:28:41 +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
mepiphana2023
931c55abdf Merge remote-tracking branch 'origin/main' 2024-04-26 08:45:57 +02:00
mepiphana2023
0d6edc033f build 2024-04-26 08:44:50 +02:00
Parpaillax
dd938c52b8 Merge branch 'Olivier' 2024-04-25 17:01:17 +02:00
Parpaillax
42b38dd802 Seucrity on enchere 2024-04-25 17:00:40 +02:00
mepiphana2023
cb0b7dde5f front 2024-04-25 17:00:30 +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
8ebddc6d18 Merge branch 'Olivier' 2024-04-25 12:49:42 +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
Parpaillax
5c787eca51 test 2024-04-25 12:48:35 +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