Commit graph

412 commits

Author SHA1 Message Date
Vincent BRIDIER
45ee252bad Merge branch 'fix-contact' into 'develop'
Fix contact

See merge request service-web-lab/le-gaulois-pro!66
2023-01-18 10:37:54 +00:00
Vincent BRIDIER
8c3bd1c92d Merge branch 'issue-113' into 'develop'
Fix image decoration positionning

Closes #113

See merge request service-web-lab/le-gaulois-pro!65
2023-01-18 10:36:59 +00:00
Vincent BRIDIER
100d046e30 Merge branch 'issue-78' into 'develop'
delete unwanted line background image

Closes #78

See merge request service-web-lab/le-gaulois-pro!63
2023-01-18 10:31:50 +00:00
Vincent BRIDIER
3398a49de2 Merge branch 'issue-116' into 'develop'
change route tips to recipes

Closes #116

See merge request service-web-lab/le-gaulois-pro!62
2023-01-18 10:30:51 +00:00
Alexis Gousseau
6ea5256a59 Contact: fix message if there is no selected products 2023-01-18 11:08:14 +01:00
Alexis Gousseau
ae1fecc24b Contact: fix html structure for tabulation 2023-01-18 10:59:26 +01:00
Sebastien Hattry
62541ed415 Fix image decoration positionning 2023-01-18 09:56:48 +00:00
Alexis Gousseau
983aa56531 Contact: fix activity value 2023-01-18 10:50:48 +01:00
Vincent BRIDIER
0d6303e566
merge front-dev into develop 2023-01-18 10:29:33 +01:00
Sebastien Hattry
5b9885b490 delete unwanted line background image 2023-01-18 10:17:13 +01:00
Olivier Legat
434679cb54
change route tips to recipes 2023-01-18 10:16:44 +01:00
Vincent BRIDIER
b80bf4a0ad Merge branch 'issue-112' into 'develop'
half revert on commit c6dafb664f

Closes #112

See merge request service-web-lab/le-gaulois-pro!61
2023-01-18 09:15:27 +00:00
Vincent BRIDIER
afbb6930a0
fix https on recipes 2023-01-18 10:12:50 +01:00
Vincent BRIDIER
972b150f27
Fix https url 2023-01-18 10:02:35 +01:00
Olivier Legat
33b1d70d56
half revert on commit c6dafb664f 2023-01-18 10:00:23 +01:00
Vincent BRIDIER
f3455fa2c3 Merge branch 'issue-111' into 'develop'
coalesce null seo desc for create form

Closes #111

See merge request service-web-lab/le-gaulois-pro!60
2023-01-18 08:49:06 +00:00
Vincent BRIDIER
dcf1a0d6a9
issue 110 2023-01-18 09:46:56 +01:00
Olivier Legat
70c058287b
coalesce null seo desc for create form 2023-01-18 09:28:39 +01:00
Vincent BRIDIER
946126a6be Merge branch 'fix-print-recipes' into 'develop'
Fix print action

See merge request service-web-lab/le-gaulois-pro!59
2023-01-18 07:53:22 +00:00
Jérémy Munsch
f8000df9c3
Fix print action 2023-01-17 20:25:50 +01:00
Vincent BRIDIER
efa30280e3 Merge branch 'fix-expertise-recipes' into 'develop'
Fix expertise related recipes (force showing only products, not tips)

See merge request service-web-lab/le-gaulois-pro!58
2023-01-17 19:22:33 +00:00
Jérémy Munsch
5ece2580fa
Fix expertise related recipes (force showing only products, not tips) 2023-01-17 20:18:10 +01:00
Vincent BRIDIER
ade85cd53b Merge branch 'issue-92' into 'develop'
Fixes #92 overflow scroll on popup on product.show

Closes #92

See merge request service-web-lab/le-gaulois-pro!57
2023-01-17 19:05:51 +00:00
Vincent BRIDIER
d2ec26681d Merge branch 'issue-93' into 'develop'
Fixes #93:

Closes #93

See merge request service-web-lab/le-gaulois-pro!56
2023-01-17 19:02:10 +00:00
Vincent BRIDIER
e76612dad7 Merge branch 'develop' into 'issue-93'
# Conflicts:
#   resources/views/fo/pages/products/product.blade.php
2023-01-17 19:02:05 +00:00
Vincent BRIDIER
ce867e8a4c Merge branch 'issue106' into 'develop'
fix images in recipe show

Closes #106

See merge request service-web-lab/le-gaulois-pro!55
2023-01-17 19:00:27 +00:00
Jérémy Munsch
d878b413ea
Fixes #92 overflow scroll on popup on product.show 2023-01-17 20:00:25 +01:00
Vincent BRIDIER
5b58c4e709
Fix BO Product word counter 2023-01-17 19:59:25 +01:00
Jérémy Munsch
52df70c33a
Fixes #93:
- npm i print-js
- partial fix on product print for now
2023-01-17 19:50:34 +01:00
Olivier Legat
263c1b8d6f
fix images in recipe show 2023-01-17 19:50:14 +01:00
Vincent BRIDIER
90e94189dd Merge branch 'issue-71' into 'develop'
Expertise product: fix rendering images + fix nutriscore

Closes #71

See merge request service-web-lab/le-gaulois-pro!54
2023-01-17 18:45:14 +00:00
Alexis Gousseau
685486971f Expertise product: fix rendering images + fix nutriscore 2023-01-17 19:40:09 +01:00
Vincent BRIDIER
29e5cafebc
issue 101 2023-01-17 19:23:44 +01:00
Alexis Gousseau
1f200a83d8 Add translations on the footer to access the contact 2023-01-17 19:14:41 +01:00
Alexis Gousseau
c39e57b347 Product: remove default padding on small card 2023-01-17 19:14:41 +01:00
Alexis Gousseau
38eb5234c8 Product: fix recipes time (cooking_time + preparation_time) 2023-01-17 19:14:41 +01:00
Alexis Gousseau
6dd2e1a2ad blade: move all includes of banner in a specific section 2023-01-17 19:14:33 +01:00
Vincent BRIDIER
722c8aa159 Merge branch 'issue-61' into 'develop'
Fixes #61 Best effort on chorme pixel perfect separator spacing

Closes #61

See merge request service-web-lab/le-gaulois-pro!53
2023-01-17 18:14:04 +00:00
Alexis Gousseau
a3fc41f35d end contact form + sending email 2023-01-17 19:12:45 +01:00
Alexis Gousseau
e867a5ccf4 ProductsController: remove unued imports 2023-01-17 19:12:45 +01:00
Alexis Gousseau
b034450616 Add fixme in Advice model 2023-01-17 19:12:45 +01:00
Alexis Gousseau
6b0e7bd8d1 Refqctor prodcut . show getting random products 2023-01-17 19:12:45 +01:00
Alexis Gousseau
26eca3ba66 Contact page + workking basket (add and remove) 2023-01-17 19:12:45 +01:00
Alexis Gousseau
196b35b03c AjaxAddProductBasket: Fixed attributes on validation errors 2023-01-17 19:12:45 +01:00
Alexis Gousseau
cf71720450 SaveProductComponent: remove useless condition 2023-01-17 19:12:45 +01:00
Alexis Gousseau
d1a34b2b15 contact form mail 2023-01-17 19:12:45 +01:00
Vincent BRIDIER
14decc45e2
Fix products home 2023-01-17 19:10:12 +01:00
Vincent BRIDIER
e3fcd9ab40
issue 99 2023-01-17 19:07:26 +01:00
Jérémy Munsch
c6dafb664f
Fixes #61 Best effort on chorme pixel perfect separator spacing 2023-01-17 18:59:16 +01:00
Vincent BRIDIER
0ff2ef74bd
Fix TS 2023-01-17 18:42:05 +01:00