Commit Graph

67 Commits

Author SHA1 Message Date
jleroy2023
13b1e7f5c8 commit conflit 2024-11-25 12:10:49 +01:00
jleroy2023
10020aa703 conflic reslved 2024-11-25 11:59:39 +01:00
jleroy2023
dc1d002261 Merge branch 'Johan' 2024-11-25 11:58:00 +01:00
mepiphana2023
03f79de663 suppr table ville 2024-11-25 11:56:43 +01:00
jleroy2023
ab51562177 admin responsive V1 2024-11-25 11:56:31 +01:00
jleroy2023
732587fa84 set administration sortie and delete administration city 2024-11-25 11:29:27 +01:00
Olivier PARPAILLON
1ff8eb7c16 Merge branch 'main' of https://gitlab.com/marvin.epip/sortir 2024-11-25 11:00:51 +01:00
Olivier PARPAILLON
4561cea8d4 profile done 2024-11-25 11:00:36 +01:00
mepiphana2023
5593939a16 suppr table ville 2024-11-25 10:56:46 +01:00
marvin
36db7da07d comment 2024-11-22 14:22:29 +01:00
jleroy2023
cdfce3a639 Marvin Conflict 2024-11-22 14:14:33 +01:00
marvin
db38ec2979 plein de truc 2024-11-22 14:10:39 +01:00
jleroy2023
380e96cc11 Merge branch 'Johan' 2024-11-22 13:53:34 +01:00
Olivier PARPAILLON
0d4b461af7 a lot of ui and flash message. Useless af 2024-11-22 10:14:18 +01:00
jleroy2023
a978f466c2 UI 2024-11-21 16:54:28 +01:00
Olivier PARPAILLON
2a594a8d44 better form & mime type check 2024-11-21 13:47:47 +01:00
Olivier PARPAILLON
3d4fe031f6 conflict resolved 2024-11-21 10:21:01 +01:00
Olivier PARPAILLON
33f60148a9 Merge branch 'Johan' 2024-11-21 10:19:25 +01:00
Olivier PARPAILLON
94fad1ea08 Merge branch 'Marvin' 2024-11-21 10:19:18 +01:00
Olivier PARPAILLON
b467a5ea68 bettere button 2024-11-21 10:18:58 +01:00
jleroy2023
131bde64c2 set user site 2024-11-21 10:18:52 +01:00
marvin
a27921f1a8 add sortir 2024-11-21 10:12:44 +01:00
jleroy2023
e84adff833 set title 2024-11-21 09:46:22 +01:00
jleroy2023
fe1a8ba208 conflit resolved 2024-11-20 16:05:58 +01:00
marvin
f197db0455 home 2024-11-20 16:03:55 +01:00
jleroy2023
110cca48a1 set V1 2024-11-20 16:02:32 +01:00
jleroy2023
0ff9ac68b2 set V1 2024-11-20 15:48:47 +01:00
marvin
f25295ae5c forme création sortie 2024-11-20 15:48:32 +01:00
Olivier PARPAILLON
1594788d45 Merge branch 'Johan' 2024-11-20 14:49:55 +01:00
Olivier PARPAILLON
fbdd46ca1f user gestion fully done 2024-11-20 14:49:34 +01:00
jleroy2023
5b6b44ab9d set V1 2024-11-20 14:49:09 +01:00
jleroy2023
2d62998c61 set password reset 2024-11-20 13:51:00 +01:00
Olivier PARPAILLON
3be58536aa Merge branch 'Marvin' 2024-11-20 12:53:30 +01:00
Olivier PARPAILLON
48fcc263b5 conflict resolved 2024-11-20 12:53:20 +01:00
Olivier PARPAILLON
40019dff72 profile update done 2024-11-20 12:51:11 +01:00
marvin
d6c6956dc6 forme création sortie 2024-11-20 12:50:43 +01:00
jleroy2023
6938ae1bd1 set email 2024-11-20 12:49:19 +01:00
Olivier PARPAILLON
8563a74e3b Merge branch 'Olivier' 2024-11-20 10:53:39 +01:00
Olivier PARPAILLON
7091bd4094 fileUploader + edit profile 2024-11-20 10:53:29 +01:00
jleroy2023
74f6db8a80 set admin user 2024-11-20 10:40:08 +01:00
Olivier PARPAILLON
caa78c634b patch 2024-11-20 09:08:43 +01:00
Olivier PARPAILLON
96d10aa626 Merge branch 'Marvin' 2024-11-19 16:56:04 +01:00
Olivier PARPAILLON
7908d4ff41 Merge branch 'Johan' 2024-11-19 16:55:46 +01:00
marvin
455d419166 forme création sortie 2024-11-19 16:55:30 +01:00
Olivier PARPAILLON
4cf7ec14a9 add view profile, and create edit profile route 2024-11-19 16:55:21 +01:00
jleroy2023
974059fc1b set admin responsive 2024-11-19 16:55:17 +01:00
jleroy2023
44d88baae9 set admin Site 2024-11-19 16:17:24 +01:00
Olivier PARPAILLON
e5fdaadcd8 merge 2024-11-19 16:03:16 +01:00
jleroy2023
1369fcab53 set admin V3 User 2024-11-19 15:58:28 +01:00
Olivier PARPAILLON
e10becf01d Registration and login perfect 2024-11-19 15:58:04 +01:00