Commit Graph

523 Commits

Author SHA1 Message Date
Michael RICOIS
4a63488b51 Style 2018-03-05 17:28:11 +01:00
Michael RICOIS
2c870b56f4 Add captcha 2018-03-05 17:05:47 +01:00
Michael RICOIS
7cea4e23ba Language 2018-02-26 16:13:35 +01:00
Michael RICOIS
1903c42573 Enable/Disable credit display 2018-02-14 14:54:13 +01:00
Michael RICOIS
7b734c9b60 Remove samrtbanner error 2018-02-14 12:46:25 +01:00
David
ac6a5c1667 banner not clickable 2018-01-31 18:17:56 +01:00
Michael RICOIS
82b4072df7 Trad 2018-01-29 15:26:30 +01:00
Michael RICOIS
a7f38bf474 Merge branch 'ticket/15099-facebookpixel' 2018-01-22 10:28:29 +01:00
Michael RICOIS
64d33eafb7 Fix currency with facebook pixel 2018-01-22 10:24:57 +01:00
Michael RICOIS
fd00430307 Reduce z-index 2018-01-19 15:34:53 +01:00
Michael RICOIS
8e2a1ba4a3 Fix conflict 2018-01-19 11:23:42 +01:00
Michael RICOIS
f010de6d2d Merge branch 'ticket-14904-achatexpressmobile' of
git@gitlab.antadis.net:dev-antadis/bebeboutik.git into
ticket-14904-achatexpressmobile

Conflicts:
	themes/site_mobile/css/style.css
2018-01-19 11:23:26 +01:00
Michael RICOIS
3f98533689 Rebase and fix 2018-01-19 11:22:07 +01:00
Michael RICOIS
a367324847 Change image - better quality 2018-01-19 11:13:31 +01:00
Michael RICOIS
dfbb1407eb z-index on expresscart 2018-01-19 11:12:55 +01:00
Michael RICOIS
1f24d1b88b Add a select for mobile 2018-01-19 11:08:12 +01:00
Michael RICOIS
ab90b9214c Change image - better quality 2018-01-18 14:34:22 +01:00
Michael RICOIS
00657ccd4e z-index on expresscart 2018-01-11 11:10:02 +01:00
Michael RICOIS
8b2476e6a7 Add a select for mobile 2018-01-10 17:55:44 +01:00
David
b2130305b2 js files need to be downloaded from the same domain. 2018-01-09 18:53:38 +01:00
David
3db4b0a411 post merge fix 2018-01-09 16:51:48 +01:00
David
371ad472aa Merge branch 'ticket-14904-achatexpressmobile'
# Conflicts:
#	themes/site_mobile/css/style.css
#	themes/site_mobile/product-list.tpl
2018-01-09 16:21:17 +01:00
David
225f857725 Merge branch 'ticket-14826-fix-product-title' 2018-01-09 12:26:12 +01:00
David
6006429bea Missing translations ES / FR 2018-01-08 17:24:42 +01:00
David
584ee64e5a fixed bug related to cart and translation 2018-01-08 13:12:51 +01:00
David
9694bb685b Fixed style position 2018-01-08 11:39:05 +01:00
David
306858b179 css fix 2018-01-02 11:58:33 +01:00
David
4664d8f6fa attempt at correccting ajax add to cart 2018-01-02 11:51:07 +01:00
David
44da8e13b1 Additionnal information will not break the template anymore 2017-12-29 18:22:13 +01:00
David
5b2ee8b7aa Merge branch 'ticket-14826-fix-product-title' 2017-12-29 13:04:30 +01:00
David
b8612b7dfd product title is longer in async product list 2017-12-29 12:19:17 +01:00
Michael RICOIS
e56e0fd53f Delete old smartbanner 2017-12-21 15:59:20 +01:00
Michael RICOIS
e12922da5c New smartbanner 2017-12-21 15:51:21 +01:00
Michael RICOIS
07b607cfc2 Merge remote-tracking branch 'origin/ticket/15014-invite_credits' 2017-12-20 11:04:41 +01:00
David
9e25127b26 fix 2017-12-18 15:54:59 +01:00
David
1376e0af07 Product name is longer in product list and product page 2017-12-18 15:12:38 +01:00
David
3355f94386 Fixed jquery compatibility 2017-12-18 12:09:50 +01:00
Michael RICOIS
19a7b71030 Merge branch 'ticket/15116-nous-contacter-display' 2017-12-14 09:40:01 +01:00
Michael RICOIS
ad584e21e0 Merge branch 'ticket-14698-sensefuel' 2017-12-13 17:57:49 +01:00
Michael RICOIS
517ae660e7 set form class to std 2017-12-13 16:14:04 +01:00
Michael RICOIS
f73558c4d7 Merge branch 'feature/appmobile' 2017-12-13 15:00:09 +01:00
Michael RICOIS
29aa020049 SmartBanner as bricoprive.com 2017-12-13 14:53:48 +01:00
Michael RICOIS
ea28f83b52 Add smartbanner 2017-12-13 13:06:33 +01:00
Michael RICOIS
80c97d2867 Add hidden field to mobile 2017-12-13 11:49:06 +01:00
Michael RICOIS
6927c87ce0 Fill email2 2017-12-13 11:43:33 +01:00
Michael RICOIS
e5f83c46b4 Add invisible field 2017-12-13 11:29:56 +01:00
Michael RICOIS
d77173316f Merge branch 'feature/appmobile' 2017-12-13 10:36:10 +01:00
Michael RICOIS
1210b3de6e Add meta for app mobile 2017-12-13 10:20:56 +01:00
Michael RICOIS
3382d89a7e Get currency ISO 2017-12-12 17:58:23 +01:00
Michael RICOIS
2052dd1174 Style 2017-12-12 16:39:34 +01:00