Commit graph

1936 commits

Author SHA1 Message Date
Jérémy Munsch
73eeec3e75
Merge branch 'trunk' 2023-06-27 09:28:53 +02:00
Jérémy Munsch
4890e1d55f
Merge branch 'develop' into trunk 2023-06-27 09:27:47 +02:00
Jérémy Munsch
7115c777ca Merge branch 'remove-the-e' into 'develop'
Replaced civilitée by civilité and recaptacha by recaptcha

See merge request ldc-web/projets/le-gaulois!59
2023-06-27 07:25:00 +00:00
Noah Lancien
cfff5d676d Replaced civilitée by civilité and recaptacha by recaptcha 2023-06-27 08:59:13 +02:00
Vincent BRIDIER
6b86c4f4bc Merge branch 'issue-19-fix' into 'develop'
fix #19 migration on remove ocb type egg

Closes #19

See merge request ldc-web/projets/le-gaulois!58
2023-06-26 16:29:05 +00:00
Jérémy Munsch
bae249c704
fix .env.example
(cherry picked from commit d318a16d501187a6ab6fa6f6e397556408aae0d4)
2023-06-26 18:04:53 +02:00
Jérémy Munsch
ae78359251
fix #19 migration on remove ocb type egg
(cherry picked from commit d4657fd99177026061e068633c0dbe83cd9d1e7e)
2023-06-26 18:04:46 +02:00
Vincent BRIDIER
1f34c77256
Merge branch 'trunk' 2023-06-26 17:48:47 +02:00
Vincent BRIDIER
49a02d3e2d
Merge branch 'develop' into trunk 2023-06-26 17:47:49 +02:00
Vincent BRIDIER
78e388c9df Merge branch 'issue-14' into 'develop'
Issue 14

See merge request ldc-web/projets/le-gaulois!57
2023-06-26 15:46:54 +00:00
Noah Lancien
62cd74f250 Merge branch 'develop' into issue-14 2023-06-26 17:37:29 +02:00
Noah Lancien
fccb7cd3f6 fixed cookies for video : revert changes to quickly fix other videos 2023-06-26 17:33:00 +02:00
Vincent BRIDIER
c4f3ae1929 Merge branch 'issue-19' into 'develop'
Issue 19

Closes #19

See merge request ldc-web/projets/le-gaulois!56
2023-06-26 14:13:19 +00:00
Jérémy Munsch
b106e9ac67
phpcs on enums 2023-06-26 16:02:23 +02:00
Jérémy Munsch
43837f3937
Closes #19 Remove OCB completement Egg 2023-06-26 16:02:08 +02:00
Vincent BRIDIER
aca7083436
Merge branch 'trunk' 2023-06-26 15:50:13 +02:00
Jérémy Munsch
2689ec1bfc
phpcs update 2023-06-26 15:47:49 +02:00
Vincent BRIDIER
6b234cd0cc
Merge branch 'develop' into trunk 2023-06-26 15:16:34 +02:00
Vincent BRIDIER
e24bfaf301 Merge branch 'issue-14' into 'develop'
Videos from vimeo are now playable if the vimeo cookie is enabled

Closes #14

See merge request ldc-web/projets/le-gaulois!47
2023-06-21 15:16:52 +00:00
noah.lancien
a5bd28fb69 Videos from vimeo are now playable if the vimeo cookie is enabled 2023-06-21 15:16:52 +00:00
Vincent BRIDIER
7ca36a0913 Merge branch 'ts-1570' into 'develop'
Fix optin condition bug in customer informations page

See merge request ldc-web/projets/le-gaulois!55
2023-06-21 15:04:02 +00:00
sebastien.hattry
bca4fa327a Fix optin condition bug in customer informations page 2023-06-21 15:04:02 +00:00
Noah Lancien
43b63c8da1 Removed console.logs and renamed youtube-play-button -> vimeo-play-button 2023-06-21 13:21:36 +02:00
Vincent BRIDIER
a9af7cfe7a Merge branch '15-ts-1379' into 'develop'
Resolve "ts-1379"

Closes #15

See merge request ldc-web/projets/le-gaulois!54
2023-06-16 10:09:27 +00:00
nicolas.demangeat
73e4dc877e Resolve "ts-1379" 2023-06-16 10:09:26 +00:00
Vincent BRIDIER
370019285d Merge branch '16-ts-1572' into 'develop'
Resolve "ts-1572"

Closes #16

See merge request ldc-web/projets/le-gaulois!53
2023-06-16 09:40:37 +00:00
Vincent BRIDIER
512009cbe9 Merge branch 'issue-17' into 'develop'
logo remplacement in resources/assets/images/danslespres/logoDLP.png

Closes #17

See merge request ldc-web/projets/le-gaulois!51
2023-06-16 09:39:33 +00:00
Nicolas Demangeat
a0f663bdd9 URL modification opinsta 2023-06-16 11:32:49 +02:00
Nicolas Demangeat
fdde79d369 logo remplacement in resources/assets/images/danslespres/logoDLP.png 2023-06-15 16:23:33 +02:00
Vincent BRIDIER
a0b9d408d2 Merge branch 'fix-sitemap' into 'develop'
revert kwaadpepper/refresh-sitemap to 1.0.0 as not compatible with 1.1.0

See merge request ldc-web/projets/le-gaulois!48
2023-06-15 07:30:48 +00:00
Vincent BRIDIER
1b177d78f6 Merge branch 'fix-route-cache' into 'develop'
Fix route cache comme sur caliope

See merge request ldc-web/projets/le-gaulois!49
2023-06-15 07:30:16 +00:00
Jérémy Munsch
7d89800ca8
Fix route cache comme sur caliope 2023-06-15 09:21:37 +02:00
Jérémy Munsch
e2189efbbf
revert kwaadpepper/refresh-sitemap to 1.0.0 as not compatible with 1.1.0 2023-06-13 16:14:46 +02:00
Noah Lancien
7ac5a22c9b Fixed video style 2023-06-12 16:39:19 +02:00
Noah Lancien
d2ce6edec5 WIP: video can now be played but the 'play' icon doesn't display correctly 2023-06-09 17:06:20 +02:00
Noah Lancien
00b4e85525 Fixed youtube cookie script 2023-06-07 15:26:34 +02:00
Noah Lancien
7072c92832 Fixed vimeo cookie script 2023-06-07 15:25:41 +02:00
Noah Lancien
88af03ceb0 player.vimeo line was missing in SecureHeaders 2023-06-07 10:25:27 +00:00
Jérémy Munsch
9074b02916
Fix kwaadpepper/serial-int-caster to 1.0.1 Bordel de merde 2023-06-05 16:55:33 +02:00
Vincent BRIDIER
ecbf1a8837
Merge branch 'trunk' 2023-05-02 17:15:52 +02:00
Vincent BRIDIER
1c0d7bae5e
Merge branch 'develop' into trunk 2023-05-02 17:15:44 +02:00
Vincent BRIDIER
c9ba12c99d
Update OP Insta post PROD 2023-05-02 17:15:32 +02:00
Vincent BRIDIER
0d61ee8295
Merge branch 'trunk' 2023-04-27 15:14:30 +02:00
Vincent BRIDIER
cb0fa25557
Merge branch 'develop' into trunk 2023-04-27 10:59:25 +02:00
Vincent BRIDIER
0d8b4543e5 Merge branch 'opinsta' into 'develop'
Opinsta

Closes #13

See merge request ldc-web/projets/le-gaulois!46
2023-04-25 10:10:08 +00:00
Jérémy Munsch
859b1f3625 Op Insta 2023-04-25 10:10:08 +00:00
Vincent BRIDIER
00865f4eff
Merge branch 'trunk' 2023-04-17 12:57:46 +02:00
Vincent BRIDIER
8ab156452f
Merge branch 'develop' into trunk 2023-04-17 12:57:34 +02:00
Vincent BRIDIER
e8eefa158a
Bump cookie notice 2023-04-17 12:57:24 +02:00
Vincent BRIDIER
0dc4021a18
Fix nonce on error pages 2023-04-17 12:55:09 +02:00