Commit graph

198 commits

Author SHA1 Message Date
Olivier Legat
d0c8b42eb6 fix direct access with non fr navigator 2022-11-16 18:14:26 +01:00
Vincent BRIDIER
20d1188e87
Merge branch 'trunk' 2022-11-16 10:52:08 +01:00
Vincent BRIDIER
564fbf424e
Merge branch 'develop' into trunk 2022-11-16 10:51:57 +01:00
Vincent BRIDIER
35bc5a6c4f
Fix Lang Middleware 2022-11-16 10:51:46 +01:00
Vincent BRIDIER
1028507a53
Merge branch 'trunk' 2022-11-16 09:22:08 +01:00
Vincent BRIDIER
280285caef
Merge branch 'develop' into trunk 2022-11-16 09:21:42 +01:00
Vincent BRIDIER
8530d45a35
MEP Other langs 2022-11-16 09:21:21 +01:00
Vincent BRIDIER
01ffe3a81a
Update CI 2022-11-16 09:03:33 +01:00
Vincent BRIDIER
d97aac17a9
Merge remote-tracking branch 'origin/hotfix' 2022-09-22 13:41:48 +02:00
Vincent BRIDIER
045dbddaa3
Merge remote-tracking branch 'origin/hotfix' into develop 2022-09-22 13:41:11 +02:00
Olivier Legat
903ca68ad3
fix first access redirect to browser lang, prevent any lang check waiting for langs activations 2022-09-22 12:43:27 +02:00
Olivier Legat
1da2de7020 Merge branch 'trunk' 2022-09-15 14:10:31 +02:00
Olivier Legat
0d114c0816 Merge branch 'develop' into trunk 2022-09-15 14:09:48 +02:00
Olivier Legat
562b8551dc
css tweaks for longer texts in spanish 2022-09-15 14:08:51 +02:00
Olivier Legat
48e0e60f2d Merge branch 'trunk' 2022-09-15 12:45:58 +02:00
Olivier Legat
5029870627 Merge branch 'develop' into trunk 2022-09-15 12:45:28 +02:00
Olivier Legat
932ec18103
add missing translatable text 2022-09-15 12:44:14 +02:00
Olivier Legat
c415db569e Merge branch 'trunk' 2022-09-15 11:45:35 +02:00
Olivier Legat
803f2150c6 Merge branch 'develop' into trunk 2022-09-15 11:43:39 +02:00
Olivier Legat
b17126f74b Merge branch 'translate-blade-to-DB' into 'develop'
Translate blade to db

See merge request service-web-lab/doux!8
2022-09-15 09:39:56 +00:00
Olivier Legat
bf86a009f8
composer require refresh sitemap, config for sitemap 2022-09-15 11:35:58 +02:00
Olivier Legat
bf208d3c17
composer update 2022-09-15 11:18:26 +02:00
Olivier Legat
40e5a6fb9e
update with data lang from DEV, fix Text model 2022-09-15 11:09:33 +02:00
Olivier Legat
54ecb00638
phpcs clean 2022-08-29 17:23:10 +02:00
Vincent BRIDIER
f4f3256ce5
Clean + Update PHPCS.xml + PHPCBF 2022-08-11 12:34:27 +02:00
Olivier Legat
94374cf378
composer security compliance : update guzzle 2022-07-27 15:19:29 +02:00
Olivier Legat
16f829b634
phpcs warning compliance manual corrections 2022-07-27 15:15:15 +02:00
Olivier Legat
5ab87b7274
phpcs compliance manual corrections 2022-07-27 14:53:32 +02:00
Olivier Legat
e48a257513
passage phpcbf 2022-07-27 14:33:56 +02:00
Olivier Legat
7ffae283c0
maj gitlab ci 2022-07-27 14:29:58 +02:00
Olivier Legat
cd9c94df9c
switch to db storage for translations 2022-07-27 13:16:09 +02:00
Vincent BRIDIER
f06ab30f0c
Merge branch 'trunk' 2022-07-18 12:37:45 +02:00
Vincent BRIDIER
fe0e054487
Merge branch 'develop' into trunk 2022-07-18 12:37:01 +02:00
Vincent BRIDIER
99e4d5e957 Merge branch 'fix-bugs_sh01' into 'develop'
Fix bugs sh01

See merge request service-web-lab/doux!7
2022-07-18 10:36:38 +00:00
Sebastien Hattry
b60513fb72 Fix bugs sh01 2022-07-18 10:36:38 +00:00
Olivier Legat
101703f730 Merge branch 'trunk' into 'master'
Trunk

See merge request service-web-lab/doux!6
2022-06-02 15:36:21 +00:00
Olivier Legat
fbd0a1aad6 Merge branch 'develop' into 'trunk'
Develop

See merge request service-web-lab/doux!5
2022-06-02 15:35:46 +00:00
Olivier Legat
ef8c1279f6 Merge branch 'ticket-901_sh01' into 'develop'
chnage postal code in contact page

See merge request service-web-lab/doux!4
2022-06-02 15:33:57 +00:00
S. Hattry
a75e3029d0 chnage postal code in contact page 2022-06-02 15:23:30 +00:00
Olivier Legat
33622aa8cc Merge branch 'trunk' 2022-06-02 17:18:30 +02:00
Olivier Legat
3ae8fcf2ed Merge branch 'develop' into trunk 2022-06-02 17:16:39 +02:00
Olivier Legat
6d3bf04035 Merge branch 'ticket-901_sh01' into 'develop'
Ticket 901 sh01

See merge request service-web-lab/doux!3
2022-06-02 15:13:57 +00:00
S. Hattry
e6566be20e change postal code 2022-06-02 15:02:55 +00:00
S. Hattry
3b62dcbf5e npm audit fix 2022-06-02 14:16:33 +00:00
Olivier Legat
85e1cb0d25 Merge branch 'trunk' 2022-05-19 16:55:15 +02:00
Olivier Legat
9052e9b412 Merge branch 'develop' into trunk 2022-05-19 16:54:25 +02:00
Vincent BRIDIER
bbffacd811 Merge branch 't890-893-newcookies' into 'develop'
T890 893 newcookies

See merge request service-web-lab/doux!2
2022-05-19 14:45:40 +00:00
Olivier Legat
3f89036054 T890 893 newcookies 2022-05-19 14:45:40 +00:00
Vincent BRIDIER
9c52c0fc22
Merge branch 'trunk' 2022-05-19 12:03:27 +02:00
Vincent BRIDIER
4ab9e3d58f
Merge branch 'develop' into trunk 2022-05-19 12:02:58 +02:00