Commit graph

260 commits

Author SHA1 Message Date
Thibault Raquet
f1c1f185e3 Merge branch 'trunk' into 'master'
Trunk

See merge request ldc-web/projets/lionor!36
2024-07-09 13:43:15 +00:00
Thibault Raquet
0878350923 Merge branch 'develop' into 'trunk'
Update manifest.yaml

See merge request ldc-web/projets/lionor!35
2024-07-09 13:42:38 +00:00
Thibault Raquet
90040f9fb4 Update manifest.yaml 2024-07-09 13:41:35 +00:00
Vincent BRIDIER
1716fb8adf Merge branch 'trunk' into 'master'
Trunk

See merge request ldc-web/projets/lionor!34
2024-07-05 13:15:02 +00:00
Louis Rossignol
80c5b7d916 Merge branch 'develop' into 'trunk'
Préparation migration

See merge request ldc-web/projets/lionor!33
2024-07-01 08:02:56 +00:00
LOR
470f64e5ca Préparation migration 2024-07-01 09:53:18 +02:00
Vincent BRIDIER
e580f7f56f
Merge branch 'develop' into trunk 2024-06-24 14:03:11 +02:00
Vincent BRIDIER
7f7596ba2c Merge branch 'rgpd-06-2024' into 'develop'
fix: Added privacy policy link in cookie-notice

See merge request ldc-web/projets/lionor!32
2024-06-24 12:02:47 +00:00
Noah Lancien
1811553c79 fix: Added privacy policy link in cookie-notice 2024-06-24 10:47:36 +02:00
Vincent BRIDIER
eafaffe116
Merge branch 'develop' into trunk 2024-06-21 10:21:28 +02:00
Vincent BRIDIER
2c8335dfbd Merge branch 'rgpd-06-2024' into 'develop'
Mentions légales et CGU + font awesome

See merge request ldc-web/projets/lionor!31
2024-06-21 08:21:11 +00:00
Noah Lancien
206438ffc3 fix: Added missing font awesome icons 2024-06-21 09:54:05 +02:00
Noah Lancien
38ad8c8d0b fix: added 'et CGU' to legals link in the footer 2024-06-21 09:53:40 +02:00
Vincent BRIDIER
ff44ac613b
Merge branch 'develop' into trunk 2024-06-21 08:55:21 +02:00
Vincent BRIDIER
4afa7eb1e8 Merge branch 'issue-32-imgs' into 'develop'
Replaced unoptimized pictures

See merge request ldc-web/projets/lionor!22
2024-06-21 06:50:03 +00:00
Vincent BRIDIER
428e92ca44 Merge branch 'issue-38-responsive' into 'develop'
fix: #38 - Responsive was broken : axis x was sometimes larger than 100vw

See merge request ldc-web/projets/lionor!29
2024-06-21 06:48:05 +00:00
Vincent BRIDIER
1867442f98 Merge branch 'rgpd-06-2024' into 'develop'
fix: #40 - Updated the contact form text

See merge request ldc-web/projets/lionor!30
2024-06-21 06:47:14 +00:00
Noah Lancien
ba2de1bd90 fix: #40 - Updated the contact form text 2024-06-20 18:10:41 +02:00
Noah Lancien
cb3f61501b fix: #38 - Responsive was broken : axis x was sometimes larger than 100vw 2024-06-20 17:55:18 +02:00
Vincent BRIDIER
1c67975317 Merge branch 'develop' into trunk 2024-06-20 17:48:05 +02:00
Vincent BRIDIER
334431bb5a Merge branch 'rgpd-06-2024' into 'develop'
Fix: #39 #40 - Bumped cookie notice to 6.0.1

See merge request ldc-web/projets/lionor!28
2024-06-20 15:47:21 +00:00
Noah Lancien
af13501909 Fix: #39 #40 - Bumped cookie notice to 6.0.1 2024-06-20 17:13:58 +02:00
Vincent BRIDIER
0a7809ed7f Merge branch 'trunk' 2024-05-30 11:14:51 +02:00
Vincent BRIDIER
a1424d0348 Merge branch 'develop' into trunk 2024-05-30 11:14:28 +02:00
Vincent BRIDIER
4a609d8285 Merge branch 'add-limit-to-modal' into 'develop'
Added a condition to hide the modal after 2024-06-30

See merge request ldc-web/projets/lionor!27
2024-05-30 09:13:48 +00:00
Noah Lancien
613d853229 Updated readme to remember to remove the dead code after the 2024-06-30 2024-05-30 10:28:37 +02:00
Noah Lancien
95e0d8841e Added a condition to hide the modal after 2024-06-30 2024-05-30 10:02:20 +02:00
Vincent BRIDIER
d495c928c8
Merge branch 'trunk' 2024-05-27 15:42:15 +02:00
Vincent BRIDIER
d4c9c96173
Merge branch 'develop' into trunk 2024-05-27 15:10:08 +02:00
Vincent BRIDIER
7be8c8fc17 Merge branch 'ad-modal-2024' into 'develop'
Added an advertising modal for the game

See merge request ldc-web/projets/lionor!26
2024-05-27 13:09:47 +00:00
Noah Lancien
befd6848e0 Added an advertising modal for the game 2024-05-27 14:46:07 +02:00
Vincent BRIDIER
ba94a40144 Update manifest 2023-12-11 11:14:32 +00:00
Noah Lancien
984746ce41 Replaced unoptimized pictures 2023-11-10 16:29:28 +01:00
Vincent BRIDIER
59b3db0ae1
Merge branch 'trunk' 2023-11-08 11:22:43 +01:00
Vincent BRIDIER
ac7335c312
Merge branch 'develop' into trunk 2023-11-08 11:22:26 +01:00
Vincent BRIDIER
849a21be60 Fix sitemap error 2023-11-08 10:21:55 +00:00
Vincent BRIDIER
9177972a4c Merge branch 'trunk' 2023-11-03 09:47:39 +01:00
Vincent BRIDIER
dec24e1342 Merge branch 'develop' into trunk 2023-11-03 09:47:25 +01:00
Vincent BRIDIER
6204166b00 Fix #33 2023-11-03 08:05:21 +00:00
Vincent BRIDIER
949c80e6d3
Merge branch 'trunk' 2023-11-02 14:49:21 +01:00
Vincent BRIDIER
a37537b48b
Merge branch 'develop' into trunk 2023-11-02 14:49:03 +01:00
Vincent BRIDIER
49c0bac402
Fix reCaptcha for contact 2023-11-02 14:48:50 +01:00
Vincent BRIDIER
d1ff745707
Merge branch 'trunk' 2023-11-02 12:41:31 +01:00
Vincent BRIDIER
52f144d96e
Merge branch 'develop' into trunk 2023-11-02 12:41:10 +01:00
Vincent BRIDIER
1917f514b5
Remove useless cookie notice file 2023-11-02 12:23:54 +01:00
Vincent BRIDIER
937d267b74
Remove false conception credit 2023-11-02 12:21:36 +01:00
Jérémy Munsch
689fe2b23d
Merge branch 'trunk' 2023-10-31 15:14:50 +01:00
Jérémy Munsch
ecb359a73a
Merge branch 'develop' into trunk 2023-10-25 12:22:41 +02:00
Jérémy Munsch
994834d812
Fix CSP Rules 2023-10-25 12:22:30 +02:00
Jérémy Munsch
bef0cc1cc7
Merge branch 'develop' into trunk 2023-10-25 09:36:47 +02:00