Commit Graph

Select branches

Hide Pull Requests

Johan

Marvin

Olivier

main

Mono Color

• a7c12bf807 des trucs main mepiphana2023 2024-11-29 14:07:03 +01:00
• 7e94f90e2b des trucs mepiphana2023 2024-11-29 14:04:13 +01:00
• 3f4018229c des trucs Johan mepiphana2023 2024-11-29 13:44:26 +01:00
• bd9b98b0d1 des trucs mepiphana2023 2024-11-29 13:23:55 +01:00
• 32556512eb des trucs mepiphana2023 2024-11-28 15:21:09 +01:00
• 0c6ac2fa20 des trucs mepiphana2023 2024-11-28 10:47:01 +01:00
• 921e7bfdea des trucs mepiphana2023 2024-11-27 13:40:24 +01:00
• c7cc6b20a0 des trucs Marvin mepiphana2023 2024-11-29 13:23:55 +01:00
• 2e89691ade des trucs mepiphana2023 2024-11-28 15:21:09 +01:00
• 42db692853 des trucs mepiphana2023 2024-11-28 10:47:01 +01:00
• 5d3b63b343 sortie etat done Olivier Olivier PARPAILLON 2024-11-28 09:44:27 +01:00
• df68d55e5c des trucs mepiphana2023 2024-11-27 13:40:24 +01:00
• 6a429984d1 better dashboard Olivier PARPAILLON 2024-11-27 13:31:25 +01:00
• 806a023670 Merge branch 'main' into Olivier Olivier PARPAILLON 2024-11-27 13:18:57 +01:00
• 8b5533526e Merge branch 'Marvin' Olivier PARPAILLON 2024-11-27 13:18:37 +01:00
• 31b11d0544 stash pop Olivier PARPAILLON 2024-11-27 13:18:11 +01:00
• 447c360963 des trucs mepiphana2023 2024-11-27 13:17:09 +01:00
• 5a69867774 des trucs mepiphana2023 2024-11-27 13:16:54 +01:00
• 6d238f8d85 fixtures done Olivier PARPAILLON 2024-11-27 10:30:26 +01:00
• f607b64239 Merge branch 'main' into Marvin mepiphana2023 2024-11-26 16:30:35 +01:00
• 266a338b24 link fix Olivier PARPAILLON 2024-11-26 16:30:10 +01:00
• 346625b223 fix Olivier PARPAILLON 2024-11-26 16:24:55 +01:00
• 9c6298f727 Merge branch 'main' into Marvin mepiphana2023 2024-11-26 16:07:22 +01:00
• 3331a21c9d fix UI Olivier PARPAILLON 2024-11-26 16:05:28 +01:00
• d020360a60 change Olivier PARPAILLON 2024-11-26 16:02:47 +01:00
• 51b80fb27f Merge branch 'main' into Marvin mepiphana2023 2024-11-26 15:59:51 +01:00
• 989d3fb64d Merge branch 'main' into Marvin mepiphana2023 2024-11-26 15:59:06 +01:00
• 84cf9abbc2 conflict resolved Olivier PARPAILLON 2024-11-26 15:58:14 +01:00
• 119051eef8 dashboard done + UI/UX fix Olivier PARPAILLON 2024-11-26 15:35:11 +01:00
• 8c065dd886 des trucs mepiphana2023 2024-11-26 15:34:54 +01:00
• 5e5e5e9ca7 Merge branch 'Johan' jleroy2023 2024-11-25 16:28:18 +01:00
• e43b576aad Merge remote-tracking branch 'origin/main' mepiphana2023 2024-11-25 16:24:35 +01:00
• ab9f9451a1 participant view jleroy2023 2024-11-25 16:23:56 +01:00
• e853743b01 sortie > 1 month Olivier PARPAILLON 2024-11-25 16:22:18 +01:00
• bacd365306 Motif anulation mepiphana2023 2024-11-25 16:21:50 +01:00
• 72719df7c2 conflict resolved Olivier PARPAILLON 2024-11-25 15:37:04 +01:00
• 54011679f1 Merge branch 'Olivier' Olivier PARPAILLON 2024-11-25 15:33:28 +01:00
• 339131aaf4 Merge branch 'Johan' Olivier PARPAILLON 2024-11-25 15:33:23 +01:00
• 8747a59ba2 inscription done Olivier PARPAILLON 2024-11-25 15:32:00 +01:00
• ffacae3548 point map jleroy2023 2024-11-25 15:27:51 +01:00
• f852b0682a inscription and unscribe done Olivier PARPAILLON 2024-11-25 14:56:08 +01:00
• 0a6cd2b958 invitation event mepiphana2023 2024-11-25 14:50:14 +01:00
• 3439e51948 annuler sortie admin jleroy2023 2024-11-25 14:33:47 +01:00
• b98dfd38c8 conflict resolved Olivier PARPAILLON 2024-11-25 14:02:49 +01:00
• 3fd95744a9 error page Olivier PARPAILLON 2024-11-25 14:01:59 +01:00
• 2d7e15573d responsive V1 jleroy2023 2024-11-25 13:39:48 +01:00
• 13b1e7f5c8 commit conflit jleroy2023 2024-11-25 12:10:49 +01:00
• 7efa22978e Merge remote-tracking branch 'origin/main' mepiphana2023 2024-11-25 12:02:51 +01:00
• 64a93b1726 Merge branch 'Marvin' mepiphana2023 2024-11-25 12:01:25 +01:00
• 10020aa703 conflic reslved jleroy2023 2024-11-25 11:59:39 +01:00
• dc1d002261 Merge branch 'Johan' jleroy2023 2024-11-25 11:58:00 +01:00
• 162e7e5048 Merge branch 'Johan' of https://gitlab.com/marvin.epip/sortir into Johan jleroy2023 2024-11-25 11:57:01 +01:00
• 03f79de663 suppr table ville mepiphana2023 2024-11-25 11:56:43 +01:00
• ab51562177 admin responsive V1 jleroy2023 2024-11-25 11:36:12 +01:00
• 07f2261ea9 set mail server test jleroy2023 2024-11-25 11:36:12 +01:00
• 732587fa84 set administration sortie and delete administration city jleroy2023 2024-11-25 11:29:27 +01:00
• 1ff8eb7c16 Merge branch 'main' of https://gitlab.com/marvin.epip/sortir Olivier PARPAILLON 2024-11-25 11:00:51 +01:00
• 4561cea8d4 profile done Olivier PARPAILLON 2024-11-25 11:00:36 +01:00
• 5593939a16 suppr table ville mepiphana2023 2024-11-25 10:56:46 +01:00
• 8c3be2df3b suppr table ville mepiphana2023 2024-11-25 10:37:04 +01:00
• 14f7720eb6 Merge branch 'main' into Marvin Marvin EPIPHANA 2024-11-25 09:51:09 +01:00
• cb01a159bc commit initial jleroy2023 2024-11-25 09:48:57 +01:00
• 76504c174d GreaterThan Olivier PARPAILLON 2024-11-22 16:48:04 +01:00
• 36db7da07d comment marvin 2024-11-22 14:22:29 +01:00
• cdfce3a639 Marvin Conflict jleroy2023 2024-11-22 14:14:33 +01:00
• db38ec2979 plein de truc marvin 2024-11-22 14:10:39 +01:00
• 380e96cc11 Merge branch 'Johan' jleroy2023 2024-11-22 13:53:34 +01:00
• 0d4b461af7 a lot of ui and flash message. Useless af Olivier PARPAILLON 2024-11-22 10:14:18 +01:00
• a978f466c2 UI jleroy2023 2024-11-21 16:54:28 +01:00
• 2a594a8d44 better form & mime type check Olivier PARPAILLON 2024-11-21 13:47:47 +01:00
• 3d4fe031f6 conflict resolved Olivier PARPAILLON 2024-11-21 10:21:01 +01:00
• 33f60148a9 Merge branch 'Johan' Olivier PARPAILLON 2024-11-21 10:19:25 +01:00
• 94fad1ea08 Merge branch 'Marvin' Olivier PARPAILLON 2024-11-21 10:19:18 +01:00
• b467a5ea68 bettere button Olivier PARPAILLON 2024-11-21 10:18:58 +01:00
• 131bde64c2 set user site jleroy2023 2024-11-21 10:18:52 +01:00
• 22006281cd Merge branch 'main' into Marvin marvin 2024-11-21 10:13:28 +01:00
• a27921f1a8 add sortir marvin 2024-11-21 10:12:44 +01:00
• 3b1511d76f relation ManyToMany done Olivier PARPAILLON 2024-11-21 10:06:47 +01:00
• e84adff833 set title jleroy2023 2024-11-21 09:46:22 +01:00
• 182d1867c5 stash Olivier PARPAILLON 2024-11-20 16:09:35 +01:00
• d0db9a4d58 conflict resolved Olivier PARPAILLON 2024-11-20 16:08:37 +01:00
• 8bb53d3baa aled Olivier PARPAILLON 2024-11-20 16:07:19 +01:00
• fe1a8ba208 conflit resolved jleroy2023 2024-11-20 16:05:58 +01:00
• f197db0455 home marvin 2024-11-20 16:03:55 +01:00
• 110cca48a1 set V1 jleroy2023 2024-11-20 16:02:32 +01:00
• 0ff9ac68b2 set V1 jleroy2023 2024-11-20 15:48:47 +01:00
• f25295ae5c forme création sortie marvin 2024-11-20 15:48:32 +01:00
• e6954b6ce3 set V1 jleroy2023 2024-11-20 14:55:04 +01:00
• 1594788d45 Merge branch 'Johan' Olivier PARPAILLON 2024-11-20 14:49:55 +01:00
• fbdd46ca1f user gestion fully done Olivier PARPAILLON 2024-11-20 14:49:34 +01:00
• 6fc39840c2 set V1 jleroy2023 2024-11-20 14:49:19 +01:00
• 5b6b44ab9d set V1 jleroy2023 2024-11-20 14:49:09 +01:00
• 6b25c1852b better error msg Olivier PARPAILLON 2024-11-20 14:03:45 +01:00
• 21be9ebb52 Merge branch 'Johan' Olivier PARPAILLON 2024-11-20 13:51:22 +01:00
• 2d62998c61 set password reset jleroy2023 2024-11-20 13:51:00 +01:00
• 456e79380a profile done Olivier PARPAILLON 2024-11-20 13:50:55 +01:00
• 3be58536aa Merge branch 'Marvin' Olivier PARPAILLON 2024-11-20 12:53:30 +01:00
• 48fcc263b5 conflict resolved Olivier PARPAILLON 2024-11-20 12:53:20 +01:00
• 40019dff72 profile update done Olivier PARPAILLON 2024-11-20 12:51:11 +01:00
• d6c6956dc6 forme création sortie marvin 2024-11-20 12:50:43 +01:00