forge-joniko/ldc-doux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
167 commits 8 branches 0 tags 38 MiB
Commit graph

167 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Vincent BRIDIER
c39569e9cc
Clean page contact 2022-05-19 11:32:54 +02:00
Vincent BRIDIER
5acf77c872
Clean Utils.php 2022-05-19 10:27:34 +02:00
Vincent BRIDIER
69fdadd330
Add Handler Exception package 2022-05-19 10:22:56 +02:00
Vincent BRIDIER
5b85ba36df
Fix font path 2022-05-19 10:11:02 +02:00
Vincent BRIDIER
0ef8dc5c13
Fix readme.md 2022-05-19 10:06:10 +02:00
Vincent BRIDIER
953c154cab
clean .env.example 2022-05-19 10:05:51 +02:00
Olivier Legat
d9bb6725f1 Merge branch 'develop' into trunk 2022-05-19 09:07:08 +02:00
Olivier Legat
49314c202e update translations from re7 - 19052022-0905 2022-05-19 09:04:50 +02:00
Olivier Legat
3a0319aa51 Merge branch 'develop' into trunk 2022-05-13 13:55:41 +02:00
Olivier Legat
1741ea72f0
MEP ready for FR only 2022-05-13 13:54:53 +02:00
Olivier Legat
9abc162003 Merge branch 'develop' into trunk 2022-05-13 13:44:41 +02:00
Olivier Legat
c328424e95
oubli traduction url 'produit' 2022-05-13 13:43:49 +02:00
Olivier Legat
74ce9e0557 Merge branch 'develop' into trunk 2022-05-13 13:39:17 +02:00
Olivier Legat
66dc8cb800 Merge branch 'finalisation-recette' into develop 2022-05-13 13:38:21 +02:00
Olivier Legat
49ec7ea85c
url translated suggestions 2022-05-13 13:36:35 +02:00
Olivier Legat
08b6e155a3
cleanup backend view shares 2022-05-13 13:25:28 +02:00
Olivier Legat
7648291bd0
cleanup sitewide view shares 2022-05-13 13:19:40 +02:00
Olivier Legat
739320b334 translatable urls 2022-05-13 12:49:18 +02:00
Olivier Legat
df4f4e63ed Merge branch 'develop' into trunk 2022-05-12 16:06:08 +02:00
Olivier Legat
1a3ca80f66
title,description et keywords seo 2022-05-12 16:03:40 +02:00
Olivier Legat
6db6113fea
suppression du bouton en savoir plus dans food service 2022-05-12 10:34:21 +02:00
Olivier Legat
0613a68901
separate products in home page and products in news page. remove limit for products in food service page 2022-05-12 10:31:59 +02:00
Olivier Legat
d0dc939b5f Merge branch 'develop' into trunk 2022-05-10 12:28:45 +02:00
Olivier Legat
2886f44849
remove food service from gammes count 2022-05-10 12:28:00 +02:00
Olivier Legat
e9fa40f7c9 Merge branch 'develop' into trunk 2022-05-10 11:58:48 +02:00
Olivier Legat
3420215894 Squashed commit of the following: 
commit 90d19907852ca25053bfcf4258f57b69e50babff
Author: Olivier Legat <olivier.legat@ldc.fr>
Date:   Tue May 10 11:06:25 2022 +0200

    rgpd translations rationalize

commit bf45a713770c54cd9ae7d90c9169f1a881624fb3
Author: Olivier Legat <olivier.legat@ldc.fr>
Date:   Tue May 10 10:44:38 2022 +0200

    mark country and dpt as mandatory in contact form

commit 3fa698fd8392c74b8baa98e11d05c8bbd29405ce
Author: Olivier Legat <olivier.legat@ldc.fr>
Date:   Tue May 10 10:35:45 2022 +0200

    get translations from recette

commit a9f103c1536a77713818985e57cc5205284ffe76
Author: Olivier Legat <olivier.legat@ldc.fr>
Date:   Tue May 10 10:24:00 2022 +0200

    install instructions

commit 1abc30a3dd77b9b5c17f3c63bfd9b53a93b7969e
Author: Olivier Legat <olivier.legat@ldc.fr>
Date:   Tue May 10 10:01:39 2022 +0200

    remove mixed assets form repo

commit 80f42ba1b140e36c1a4d29ad324332ae9bdc80b6
Author: Olivier Legat <olivier.legat@ldc.fr>
Date:   Tue May 10 09:39:09 2022 +0200

    better halal picto for product page
 2022-05-10 11:57:30 +02:00
Olivier Legat
8e32524d35
stack ready 2022-05-10 09:36:01 +02:00
Olivier Legat
2312a1823d Merge branch 'develop' into trunk 2022-04-26 10:07:49 +02:00
Olivier Legat
af783dbb86 maj translations 2022-04-26 10:07:35 +02:00
Olivier Legat
1f2592ffc8 Merge branch 'develop' into trunk 2022-04-26 09:43:20 +02:00
Olivier Legat
fee051a7de Squashed commit of the following: 
commit c87deb1d185b5cce65e417fde124a2691e268355
Author: Sebastien Hattry <sebastien.hattry@ldc.fr>
Date:   Wed Apr 13 10:58:17 2022 +0200

    Fix bug when product not published but display

commit 93de503ce91b3f36251f00340344046aa8218b36
Author: Sebastien Hattry <sebastien.hattry@ldc.fr>
Date:   Wed Apr 13 10:57:11 2022 +0200

    Product in BO - Gamme required setting

commit b1da45a5fba0c4a8aacbe10d06ada6ef93e748a0
Author: Sebastien Hattry <sebastien.hattry@ldc.fr>
Date:   Tue Apr 12 17:45:21 2022 +0200

    Header - Size of search picture fix bug in IOS

commit 590772a2483be51dc9e89aa44822e20eb414dca6
Author: Sebastien Hattry <sebastien.hattry@ldc.fr>
Date:   Tue Apr 12 10:18:46 2022 +0200

    Slide - Remove title and text display in BO

commit 08daf95799ab591167f33dfad6a6fec37aa4090a
Author: Sebastien Hattry <sebastien.hattry@ldc.fr>
Date:   Tue Apr 12 10:13:41 2022 +0200

    form Contact : add drom list if france choose

commit f5ba031076bbb51655eaa2451bce06902191c116
Author: Sebastien Hattry <sebastien.hattry@ldc.fr>
Date:   Tue Apr 12 09:59:16 2022 +0200

    Add story line Svg if needed
 2022-04-26 09:42:40 +02:00