Commit Graph

209 Commits

Author SHA1 Message Date
Parpaillax
50c854d9b5 cookies done miam 2024-05-02 16:45:06 +02:00
jleroy
e576d52dfb merge 2024-05-02 13:57:02 +02:00
jleroy
71bdd65ae2 Patch no image data final 2024-05-02 13:55:56 +02:00
Parpaillax
74f60e04d2 Merge branch 'Olivier' 2024-05-02 13:51:45 +02:00
Parpaillax
2390d8f56d Merge branch 'marvin' 2024-05-02 13:51:36 +02:00
Parpaillax
42ee079996 allo 2024-05-02 13:51:16 +02:00
Parpaillax
cf2cae3e31 allo 2024-05-02 13:50:21 +02:00
mepiphana2023
125809627f pagination 2024-05-02 13:49:38 +02:00
Parpaillax
b750327df9 log de merde 2024-05-02 13:46:29 +02:00
jleroy
6cd102603e merge 2024-05-02 13:44:46 +02:00
jleroy
74cbd3c073 patch no image data 2024-05-02 13:34:55 +02:00
Parpaillax
345f22b0d9 merge conflict 2024-05-02 12:09:27 +02:00
Parpaillax
9c419ea047 merge 2024-05-02 12:08:43 +02:00
Parpaillax
ad3223f172 merge 2024-05-02 12:05:55 +02:00
Parpaillax
3847d0336e test 2024-05-02 11:58:14 +02:00
jleroy
53d7fe5a80 patch fin projet v1 2024-05-02 11:57:42 +02:00
Parpaillax
f46848644d enchere done 2024-05-02 11:57:16 +02:00
mepiphana2023
4326cee3a0 pagination 2024-05-02 11:35:29 +02:00
Parpaillax
8788aecb39 Merge branch 'Olivier' 2024-04-30 16:53:49 +02:00
Parpaillax
a0cb07ed99 Merge branch 'Johan' 2024-04-30 16:53:45 +02:00
Parpaillax
818fc4008e Merge branch 'marvin' 2024-04-30 16:53:38 +02:00
mepiphana2023
1d755e024d Un peu de tout 2024-04-30 16:53:08 +02:00
Parpaillax
ba908f9352 better article 2024-04-30 16:53:08 +02:00
jleroy
95e4c0b835 patch delete user 2024-04-30 16:15:15 +02:00
Parpaillax
efdf1cb306 setCredit on enchere 2024-04-30 14:54:06 +02:00
Parpaillax
73fda0abec Merge branch 'Johan' 2024-04-30 14:29:42 +02:00
jleroy
9fbad31470 Gestion login after register beta 2024-04-30 14:29:14 +02:00
Parpaillax
bcc6a672e8 delete article 2024-04-30 14:28:32 +02:00
Parpaillax
bc0a7eb33e patch article css 2024-04-30 13:24:33 +02:00
Parpaillax
bd199d4b7a Merge branch 'marvin' 2024-04-30 13:22:09 +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
dd7e8e9042 Un peu de tout 2024-04-30 13:16:30 +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
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