Commit graph

214 commits

Author SHA1 Message Date
Vincent BRIDIER
3f92e46d8a
Merge branch 'trunk' 2023-06-26 14:28:57 +02:00
Vincent BRIDIER
6154eeeea4
Merge branch 'develop' into trunk 2023-06-26 14:21:07 +02:00
Vincent BRIDIER
16505c9cad
Fix CSP analytics 2023-06-26 14:20:40 +02:00
Vincent BRIDIER
1341877704
Merge branch 'develop' into trunk 2023-06-26 11:21:47 +02:00
Vincent BRIDIER
25beaee908
Move uwil package gitlabe instance 2023-06-26 11:21:35 +02:00
Vincent BRIDIER
cc76e61a10
Merge branch 'develop' into trunk 2023-06-26 11:07:24 +02:00
Vincent BRIDIER
d73afadd66 Merge branch 'ts-1556' into 'develop'
Ts 1556

See merge request ldc-web/projets/doux!11
2023-06-26 08:57:42 +00:00
Vincent BRIDIER
416f778de7
Merge branch 'develop' into ts-1556 2023-06-26 10:55:13 +02:00
Vincent BRIDIER
274f35ae74 Merge branch 'ts-888' into 'develop'
Ts 888

See merge request ldc-web/projets/doux!10
2023-06-26 08:52:32 +00:00
sebastien.hattry
6f266751f9 Ts 888 2023-06-26 08:52:32 +00:00
Sebastien Hattry
9b673b9ed8 Fix blue bg in food service page 2023-06-09 13:49:39 +00:00
Sebastien Hattry
de8e3c9026 Change Gitlab domaine name 2023-06-09 13:49:31 +00:00
Sebastien Hattry
cff49f7421 npm audit fix 2023-06-09 13:47:10 +00:00
Vincent BRIDIER
1ca5297f04
Merge branch 'trunk' 2022-11-17 16:52:43 +01:00
Vincent BRIDIER
e13a294f63
Merge branch 'develop' into trunk 2022-11-17 16:52:30 +01:00
Vincent BRIDIER
2fb5a930b7
fix direct access from other langs 2022-11-17 16:52:14 +01:00
Vincent BRIDIER
d3e780a139
Fix PHPCS 2022-11-16 11:00:05 +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