David
|
2df3466462
|
Merge branch 'ticket-15629-new-landing' into develop
|
2018-02-20 11:10:57 +01:00 |
|
David
|
d89616320f
|
Removed useless link
|
2018-02-20 11:09:45 +01:00 |
|
David
|
89bc626e0c
|
Merge branch 'ticket-15629-new-landing' into develop
# Conflicts:
# modules/invite/invite.php
|
2018-02-20 11:01:43 +01:00 |
|
David
|
9e706f18d4
|
Image integration
|
2018-02-20 10:42:38 +01:00 |
|
David
|
33753fc289
|
Allow now the combo between invite / sponsor email in landingpage module
Fix on desktop
|
2018-02-19 20:02:23 +01:00 |
|
David
|
2df6c80619
|
Removed dead code
|
2018-02-19 11:54:31 +01:00 |
|
David
|
9e3eb8d991
|
Merge branch 'ticket-15629-new-landing' into develop
|
2018-02-19 11:16:48 +01:00 |
|
David
|
674d095cf0
|
Added file field in admin form
Finished page integration
|
2018-02-16 15:52:35 +01:00 |
|
Michael RICOIS
|
36d74c72d8
|
Merge branch 'ticket/r16108-test-sponsor' into develop
|
2018-02-14 12:47:33 +01:00 |
|
Michael RICOIS
|
7b734c9b60
|
Remove samrtbanner error
|
2018-02-14 12:46:25 +01:00 |
|
David
|
f73be8dba4
|
New landing
XSS vulnerabilities fix
|
2018-02-02 10:52:55 +01:00 |
|
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 |
|