johanleroy/ENI-sortir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
153 Commits 4 Branches 0 Tags
c7cc6b20a0cd2b3b945549b1b214c1121599fe84
Commit Graph
153 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
mepiphana2023 c7cc6b20a0 des trucs 2024-11-29 13:23:55 +01:00
mepiphana2023 2e89691ade des trucs 2024-11-28 15:21:09 +01:00
mepiphana2023 42db692853 des trucs 2024-11-28 10:47:01 +01:00
mepiphana2023 df68d55e5c des trucs 2024-11-27 13:40:24 +01:00
Olivier PARPAILLON 6a429984d1 better dashboard 2024-11-27 13:31:25 +01:00
Olivier PARPAILLON 806a023670 Merge branch 'main' into Olivier 2024-11-27 13:18:57 +01:00
Olivier PARPAILLON 8b5533526e Merge branch 'Marvin' 2024-11-27 13:18:37 +01:00
Olivier PARPAILLON 31b11d0544 stash pop 2024-11-27 13:18:11 +01:00
mepiphana2023 447c360963 des trucs 2024-11-27 13:17:09 +01:00
mepiphana2023 5a69867774 des trucs 2024-11-27 13:16:54 +01:00
Olivier PARPAILLON 6d238f8d85 fixtures done 2024-11-27 10:30:26 +01:00
mepiphana2023 f607b64239 Merge branch 'main' into Marvin 2024-11-26 16:30:35 +01:00
Olivier PARPAILLON 266a338b24 link fix 2024-11-26 16:30:10 +01:00
Olivier PARPAILLON 346625b223 fix 2024-11-26 16:24:55 +01:00
mepiphana2023 9c6298f727 Merge branch 'main' into Marvin 2024-11-26 16:07:22 +01:00
Olivier PARPAILLON 3331a21c9d fix UI 2024-11-26 16:05:28 +01:00
Olivier PARPAILLON d020360a60 change 2024-11-26 16:02:47 +01:00
mepiphana2023 51b80fb27f Merge branch 'main' into Marvin 
# Conflicts:
#	src/Repository/SortieRepository.php
#	templates/sortie/list.html.twig
 2024-11-26 15:59:51 +01:00
mepiphana2023 989d3fb64d Merge branch 'main' into Marvin 
# Conflicts:
#	src/Repository/SortieRepository.php
#	templates/sortie/list.html.twig
 2024-11-26 15:59:06 +01:00
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
mepiphana2023 e43b576aad Merge remote-tracking branch 'origin/main' 2024-11-25 16:24:35 +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
mepiphana2023 bacd365306 Motif anulation 2024-11-25 16:21:50 +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
mepiphana2023 64a93b1726 Merge branch 'Marvin' 
# Conflicts:
#	templates/sortie/create.html.twig
 2024-11-25 12:01:25 +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
jleroy2023 162e7e5048 Merge branch 'Johan' of https://gitlab.com/marvin.epip/sortir into Johan 2024-11-25 11:57:01 +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 07f2261ea9 set mail server test 2024-11-25 11:36:12 +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