Commit graph

872 commits

Author SHA1 Message Date
Jérémy Munsch
e7c2ab784e fix recipes.show on chrome 2021-05-04 16:14:19 +02:00
Vincent BRIDIER
e8c3aa5a82 - Fix order 2021-05-04 16:02:44 +02:00
Jérémy Munsch
5fe590d779 fix recipes.show on chrome 2021-05-04 15:59:32 +02:00
Jérémy Munsch
89c0f3a3f3 push fix recipe and product associated 2021-05-04 15:51:14 +02:00
Jérémy Munsch
b6f12bc8e7 ticket 117 2021-05-04 13:23:37 +02:00
Jérémy Munsch
725d3a7f43 ticket 113 2021-05-04 12:59:51 +02:00
Vincent BRIDIER
6c1fdf3da5 Merge branch 'trunk' 2021-05-04 12:54:31 +02:00
Vincent BRIDIER
c43223108e Merge branch 'develop' into trunk 2021-05-04 12:53:15 +02:00
Vincent BRIDIER
807d51d129 - Fix status 1 2021-05-04 12:51:35 +02:00
Jérémy Munsch
b7704b586e Merge branch 'trunk' 2021-05-04 12:41:28 +02:00
Jérémy Munsch
676e3fc4cc Merge branch 'develop' into trunk 2021-05-04 12:39:39 +02:00
Jérémy Munsch
9b8fa09f77 multiple fix 2021-05-04 12:19:48 +02:00
Vincent BRIDIER
c789b7a2a6 Merge branch 'trunk' 2021-05-04 09:32:46 +02:00
Vincent BRIDIER
e9cdcc5b2a Merge branch 'develop' into trunk 2021-05-04 09:32:18 +02:00
Vincent BRIDIER
ba88aa00c4 - Fix 2021-05-04 09:27:59 +02:00
Vincent BRIDIER
9de8a68468 Merge branch 'trunk' 2021-05-03 15:26:22 +02:00
Vincent BRIDIER
1b376d9d57 Merge branch 'develop' into trunk 2021-05-03 15:25:54 +02:00
Vincent BRIDIER
4be9301bfa - Migrate boutique 2021-05-03 15:25:29 +02:00
Vincent BRIDIER
d6d6d6cd12 Merge branch 'trunk' 2021-05-03 15:10:44 +02:00
Vincent BRIDIER
2e18f2183b Merge branch 'develop' into trunk 2021-05-03 15:10:05 +02:00
Vincent BRIDIER
211f8f6288 - Update Articles migrations 2021-05-03 15:09:41 +02:00
Vincent BRIDIER
9bbcff11e2 Merge branch 'trunk' 2021-05-03 12:31:02 +02:00
Vincent BRIDIER
2462f8e329 Merge branch 'develop' into trunk 2021-05-03 12:30:35 +02:00
Vincent BRIDIER
f02d0c0904 - Update cn 2021-05-03 12:29:49 +02:00
Vincent BRIDIER
5f531aaa85 Merge branch 'trunk' 2021-05-03 12:19:29 +02:00
Vincent BRIDIER
51e906824c Merge branch 'develop' into trunk 2021-05-03 12:17:35 +02:00
Vincent BRIDIER
3e281493de - Update MesBR 2021-05-03 12:16:54 +02:00
Vincent BRIDIER
3172cdd177 Merge branch 'trunk' 2021-05-03 10:26:03 +02:00
Vincent BRIDIER
1e0bf310b9 Merge branch 'develop' into trunk 2021-05-03 10:25:14 +02:00
Vincent BRIDIER
72830cc943 - Update Mercanet 2021-05-03 10:24:30 +02:00
Jérémy Munsch
bbe2d23e8b Merge branch 'trunk' 2021-05-03 09:32:05 +02:00
Jérémy Munsch
0880df1d3f Merge branch 'develop' into trunk 2021-05-03 09:31:26 +02:00
Jérémy Munsch
d41ddd2f4b add /frame to ignore sitemap 2021-05-03 09:30:16 +02:00
Jérémy Munsch
f7db49659c Merge branch 'trunk' 2021-05-02 19:04:55 +02:00
Jérémy Munsch
4a920f54d6 Merge branch 'develop' into trunk 2021-05-02 18:59:11 +02:00
Jérémy Munsch
c7c4390f42 Print recipes and disable print product 2021-05-02 18:55:57 +02:00
Jérémy Munsch
57929bdde5 hide recipes mots clés 2021-05-02 18:21:06 +02:00
Jérémy Munsch
84756e9cf2 remove fslightbox-vue 2021-05-02 18:14:51 +02:00
Jérémy Munsch
497c562a90 npm r fslightbox-vue 2021-05-02 18:02:46 +02:00
Jérémy Munsch
7509ecf81c Cookie notice videos 2021-05-02 15:10:09 +02:00
Jérémy Munsch
d8798fbfad OCB breeder add missing parts + responsive 2021-05-02 14:36:53 +02:00
Jérémy Munsch
37973e732e gmap vuejs fix 2021-05-02 13:55:52 +02:00
Jérémy Munsch
7a1cec8920 Secure Headers 2021-05-02 13:54:13 +02:00
Jérémy Munsch
bbb900a32e Merge branch 'develop' into trunk 2021-05-02 12:27:31 +02:00
Jérémy Munsch
9f87a60da0 Error display pages enhance 2021-05-02 12:27:01 +02:00
Jérémy Munsch
a8fd837c7a Merge branch 'trunk' 2021-05-02 12:11:52 +02:00
Jérémy Munsch
0296e94554 Merge branch 'develop' into trunk 2021-05-02 12:10:43 +02:00
Jérémy Munsch
85d5545c83 Boutique
- Add mutex for validate order ajax submit
- Add loading spinner for confirm order
- remove auth:customer for mercanet routes
- add missing messages + return url on validated
- generate unique ref for boutique
2021-05-02 12:09:47 +02:00
Jérémy Munsch
2800b82db5 Merge branch 'trunk' 2021-05-01 18:17:16 +02:00
Jérémy Munsch
094b9f80d4 Merge branch 'develop' into trunk 2021-05-01 18:16:37 +02:00