Commit Graph

112 Commits

Author SHA1 Message Date
jleroy
747c038050 Merge branch 'main' into Johan 2024-04-24 16:57:04 +02:00
jleroy
700d835199 Merge branch 'main' into Johan 2024-04-24 16:56:18 +02:00
Parpaillax
6ffe121111 Merge branch 'Johan' 2024-04-24 16:55:25 +02:00
jleroy
09e611656d Ajout article final 2024-04-24 16:55:05 +02:00
Parpaillax
261f97ff84 Merge branch 'marvin' 2024-04-24 16:53:48 +02:00
Parpaillax
119c45b3ec aled 2024-04-24 16:53:04 +02:00
mepiphana2023
d60fa01d3d accueil / login bootstrap 2024-04-24 16:52:38 +02:00
Parpaillax
30dcb2abad test 2024-04-24 15:14:41 +02:00
Parpaillax
bc49d8eeee update 2024-04-24 15:08:25 +02:00
Parpaillax
96e63e84b3 update 2024-04-24 15:06:33 +02:00
jleroy
5e9c1c5d34 Ajout article v3 2024-04-24 15:06:02 +02:00
jleroy
483893de3e Ajout article v3 2024-04-24 15:03:17 +02:00
jleroy
be83631053 Ajout article v3 2024-04-24 14:58:28 +02:00
mepiphana2023
dbd04fe987 fichier langue / bootstrap / modification sql article 2024-04-24 14:55:29 +02:00
Parpaillax
3713edd3fa better UI/UX 2024-04-24 14:46:02 +02:00
Parpaillax
cc658b8427 interceptor credit user 2024-04-24 14:05:10 +02:00
mepiphana2023
45c05debe6 fichier langue / bootstrap 2024-04-24 13:51:13 +02:00
Parpaillax
62d2de271e update 2024-04-24 12:18:28 +02:00
Parpaillax
5883a2209a Merge branch 'Johan' 2024-04-24 12:15:40 +02:00
mepiphana2023
666416d2f3 fichier langue / bootstrap 2024-04-24 12:15:04 +02:00
jleroy
6dea07d370 Ajout article v3 2024-04-24 12:14:46 +02:00
Parpaillax
1d41a7beeb update 2024-04-24 12:14:24 +02:00
Parpaillax
7df76ea3ed update userProfil & logout 2024-04-24 11:26:17 +02:00
mepiphana2023
3faaeffa70 Merge branch 'refs/heads/main' into marvin
# Conflicts:
#	src/main/java/fr/eni/enchere/security/WebSecurityConfig.java
2024-04-24 11:20:24 +02:00
mepiphana2023
067920189f fichier langue / bootstrap 2024-04-24 11:19:28 +02:00
mepiphana2023
86bcf8c022 Merge remote-tracking branch 'refs/remotes/origin/Johan' into marvin
# Conflicts:
#	src/main/java/fr/eni/enchere/security/WebSecurityConfig.java
2024-04-24 10:33:38 +02:00
jleroy
79fc4ce674 Ajout article v2 2024-04-24 10:32:03 +02:00
Parpaillax
389b5d6b23 test 2024-04-24 10:13:34 +02:00
Parpaillax
3f74f0daeb test 2024-04-24 10:10:54 +02:00
Parpaillax
5733027d01 Merge branch 'Johan' 2024-04-24 10:09:02 +02:00
mepiphana2023
915e3356fc fichier langue / bootstrap 2024-04-24 10:08:22 +02:00
jleroy
9281a2984f Ajout article v1 2024-04-24 10:08:13 +02:00
Parpaillax
07b47b3f41 test 2024-04-24 10:07:02 +02:00
jleroy
a9061f4d9b patch web security 2024-04-24 09:37:33 +02:00
Parpaillax
9dd6febff1 Merge branch 'Johan' into Olivier 2024-04-24 09:24:16 +02:00
jleroy
802fcdd8ea patch session utilisateur v2 2024-04-24 09:23:55 +02:00
Parpaillax
7e868dae3f allo 2024-04-24 09:20:17 +02:00
Parpaillax
4115461e05 allo 2024-04-24 09:19:52 +02:00
mepiphana2023
f6870a4dbb Merge branch 'refs/heads/marvin' 2024-04-24 08:55:11 +02:00
mepiphana2023
620ff91173 fichier langue 2024-04-24 08:52:59 +02:00
jleroy
06c31692eb patch session utilisateur 2024-04-24 08:50:09 +02:00
jleroy
d3bb566ad2 patch session utilisateur 2024-04-24 08:47:39 +02:00
jleroy
ce9b0a212c patch session utilisateur 2024-04-24 08:47:09 +02:00
ionak
a57ff3d837 emoji langue 2024-04-23 21:56:12 +02:00
Parpaillax
03029c73f6 patch connexion 2024-04-23 17:00:07 +02:00
mepiphana2023
fa8b266f4c Merge branch 'refs/heads/marvin' 2024-04-23 16:56:56 +02:00
mepiphana2023
105fdfb7d6 fichier langue 2024-04-23 16:56:36 +02:00
jleroy
5c2b72ddf5 patch 2024-04-23 16:52:09 +02:00
jleroy
93e5739ea0 Merge branch 'main' of https://gitlab.com/marvin.epip/enchere 2024-04-23 16:37:43 +02:00
Parpaillax
de2949417d Merge branch 'Olivier' 2024-04-23 16:37:08 +02:00