David
|
539d777960
|
Merge branch 'ticket-14811-title-not-clickable' into develop
|
2018-01-31 18:18:40 +01:00 |
|
David
|
ac6a5c1667
|
banner not clickable
|
2018-01-31 18:17:56 +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
|
0e1461391a
|
Merge branch 'ticket-14904-achatexpressmobile' into develop
|
2018-01-19 15:35:22 +01:00 |
|
Michael RICOIS
|
fd00430307
|
Reduce z-index
|
2018-01-19 15:34:53 +01:00 |
|
Michael RICOIS
|
f3594c4300
|
Fix achatexpress style
|
2018-01-19 11:41:14 +01:00 |
|
Michael RICOIS
|
25a4512f0f
|
Merge remote-tracking branch 'origin/ticket-14904-achatexpressmobile'
into develop
Conflicts:
themes/site_mobile/css/style.css
|
2018-01-19 11:30:33 +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
|
69d2c02608
|
Merge branch 'ticket/r11982-ganalytics' into develop
|
2018-01-17 10:23:43 +01:00 |
|
Michael RICOIS
|
cd7483274d
|
Facebook currency
|
2018-01-15 12:52:00 +01:00 |
|
Michael RICOIS
|
9012485ba3
|
Merge branch 'ticket-14904-achatexpressmobile' into develop
Conflicts:
themes/site_mobile/css/style.css
|
2018-01-11 11:33:04 +01:00 |
|
Michael RICOIS
|
00657ccd4e
|
z-index on expresscart
|
2018-01-11 11:10:02 +01:00 |
|
Michael RICOIS
|
2b897d2010
|
Merge remote-tracking branch 'origin/ticket-14904-achatexpressmobile' into develop
|
2018-01-10 17:56:20 +01:00 |
|
Michael RICOIS
|
8b2476e6a7
|
Add a select for mobile
|
2018-01-10 17:55:44 +01:00 |
|
David
|
0c44a48f99
|
Merge branch 'fix/domain-issue-ajax-express-cart' into develop
|
2018-01-09 19:01:58 +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
|
428fd82c38
|
Merge branch 'ticket-14904-achatexpressmobile' into develop
|
2018-01-08 17:27:00 +01:00 |
|
David
|
6006429bea
|
Missing translations ES / FR
|
2018-01-08 17:24:42 +01:00 |
|
David
|
68df3e7e6a
|
Merge branch 'ticket-14904-achatexpressmobile' into develop
|
2018-01-08 13:13:22 +01:00 |
|
David
|
584ee64e5a
|
fixed bug related to cart and translation
|
2018-01-08 13:12:51 +01:00 |
|
David
|
c7718cc938
|
Merge branch 'ticket-14826-fix-product-title' into develop
# Conflicts:
# themes/site_mobile/css/style.css
|
2018-01-08 12:02:00 +01:00 |
|
David
|
9694bb685b
|
Fixed style position
|
2018-01-08 11:39:05 +01:00 |
|
David
|
059d483841
|
Merge branch 'ticket-14826-fix-product-title' into develop
|
2018-01-02 12:36:44 +01:00 |
|
David
|
306858b179
|
css fix
|
2018-01-02 11:58:33 +01:00 |
|
David
|
c71c1e7712
|
Merge branch 'ticket-14826-fix-product-title' into develop
# Conflicts:
# themes/site_mobile/product-list.tpl
|
2018-01-02 11:52:06 +01:00 |
|
David
|
4664d8f6fa
|
attempt at correccting ajax add to cart
|
2018-01-02 11:51:07 +01:00 |
|
David
|
2d84b8127e
|
Merge branch 'ticket-14826-fix-product-title' into develop
# Conflicts:
# themes/site_mobile/css/style.css
# themes/site_mobile/product-list.tpl
|
2017-12-29 18:25:28 +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
|
5d1065ab7e
|
Merge branch 'ticket-14826-fix-product-title' into develop
|
2017-12-29 12:20:39 +01:00 |
|
David
|
b8612b7dfd
|
product title is longer in async product list
|
2017-12-29 12:19:17 +01:00 |
|
Michael RICOIS
|
c4c97cb837
|
Merge branch 'fix/smartbanner' into develop
|
2017-12-21 15:59:48 +01:00 |
|
Michael RICOIS
|
e56e0fd53f
|
Delete old smartbanner
|
2017-12-21 15:59:20 +01:00 |
|
Michael RICOIS
|
78c1c15990
|
Merge branch 'fix/smartbanner' into develop
|
2017-12-21 15:56:46 +01:00 |
|
Michael RICOIS
|
e12922da5c
|
New smartbanner
|
2017-12-21 15:51:21 +01:00 |
|
David
|
e2a6393cea
|
Merge branch 'ticket-14826-fix-product-title' into develop
|
2017-12-18 15:55:23 +01:00 |
|
David
|
9e25127b26
|
fix
|
2017-12-18 15:54:59 +01:00 |
|
David
|
8e74921024
|
Merge branch 'ticket-14826-fix-product-title' into develop
|
2017-12-18 15:51:07 +01:00 |
|
David
|
1376e0af07
|
Product name is longer in product list and product page
|
2017-12-18 15:12:38 +01:00 |
|
David
|
c80e60272c
|
Merge branch 'fix/smartbanner' into develop
|
2017-12-18 12:46:47 +01:00 |
|