Olivier PARPAILLON
|
84cf9abbc2
|
conflict resolved
|
2024-11-26 15:58:14 +01:00 |
|
Olivier PARPAILLON
|
119051eef8
|
dashboard done + UI/UX fix
|
2024-11-26 15:35:11 +01:00 |
|
mepiphana2023
|
8c065dd886
|
des trucs
|
2024-11-26 15:34:54 +01:00 |
|
jleroy2023
|
5e5e5e9ca7
|
Merge branch 'Johan'
|
2024-11-25 16:28:18 +01:00 |
|
jleroy2023
|
ab9f9451a1
|
participant view
|
2024-11-25 16:23:56 +01:00 |
|
Olivier PARPAILLON
|
e853743b01
|
sortie > 1 month
|
2024-11-25 16:22:18 +01:00 |
|
Olivier PARPAILLON
|
72719df7c2
|
conflict resolved
|
2024-11-25 15:37:04 +01:00 |
|
Olivier PARPAILLON
|
54011679f1
|
Merge branch 'Olivier'
|
2024-11-25 15:33:28 +01:00 |
|
Olivier PARPAILLON
|
339131aaf4
|
Merge branch 'Johan'
|
2024-11-25 15:33:23 +01:00 |
|
Olivier PARPAILLON
|
8747a59ba2
|
inscription done
|
2024-11-25 15:32:00 +01:00 |
|
jleroy2023
|
ffacae3548
|
point map
|
2024-11-25 15:27:51 +01:00 |
|
Olivier PARPAILLON
|
f852b0682a
|
inscription and unscribe done
|
2024-11-25 14:56:08 +01:00 |
|
mepiphana2023
|
0a6cd2b958
|
invitation event
|
2024-11-25 14:50:14 +01:00 |
|
jleroy2023
|
3439e51948
|
annuler sortie admin
|
2024-11-25 14:33:47 +01:00 |
|
Olivier PARPAILLON
|
b98dfd38c8
|
conflict resolved
|
2024-11-25 14:02:49 +01:00 |
|
Olivier PARPAILLON
|
3fd95744a9
|
error page
|
2024-11-25 14:01:59 +01:00 |
|
jleroy2023
|
2d7e15573d
|
responsive V1
|
2024-11-25 13:39:48 +01:00 |
|
jleroy2023
|
13b1e7f5c8
|
commit conflit
|
2024-11-25 12:10:49 +01:00 |
|
mepiphana2023
|
7efa22978e
|
Merge remote-tracking branch 'origin/main'
# Conflicts:
# templates/sortie/create.html.twig
|
2024-11-25 12:02:51 +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 |
|