Marion Muszynski
|
47965cf5ed
|
fix go next
|
2017-08-17 16:03:52 +02:00 |
|
Marion Muszynski
|
69ece0338f
|
fix conflicts
|
2017-08-17 11:25:24 +02:00 |
|
Marion Muszynski
|
abd8e88343
|
addition of new delivery delay and cleaning of sale combination
|
2017-08-17 11:22:54 +02:00 |
|
Marion Muszynski
|
5cc12c3b11
|
Merge branch 'ticket-13745-modifMobileLogo' into develop
|
2017-08-16 15:03:38 +02:00 |
|
Marion Muszynski
|
945db4ad17
|
change mobile logo according language
|
2017-08-16 15:03:23 +02:00 |
|
Marion Muszynski
|
39b9fe9a8f
|
Merge branch 'ticket-13564-giftOnShoppingCart' into develop
|
2017-08-16 11:04:44 +02:00 |
|
Marion Muszynski
|
889259d031
|
fix async bug for saving gift message of cart
|
2017-08-16 11:04:23 +02:00 |
|
Marion Muszynski
|
67aed06044
|
Merge branch 'ticket-13753-EvolBannerPromo' into develop
|
2017-07-24 11:57:58 +02:00 |
|
Marion Muszynski
|
34b55f8967
|
fix url
|
2017-07-24 11:57:47 +02:00 |
|
Marion Muszynski
|
cf80e281c7
|
Merge branch 'ticket-13753-EvolBannerPromo' into develop
|
2017-07-24 11:50:15 +02:00 |
|
Marion Muszynski
|
61cf5b99de
|
add link to banner
|
2017-07-24 11:49:58 +02:00 |
|
Marion Muszynski
|
ae39024da4
|
fix conflicts
|
2017-07-11 16:21:20 +02:00 |
|
Marion Muszynski
|
e2533c3033
|
add file upload on mobile contact form
|
2017-07-11 16:19:20 +02:00 |
|
Marion Muszynski
|
c94d2c4431
|
fix conflicts
|
2017-07-11 10:04:00 +02:00 |
|
Marion Muszynski
|
05c988412b
|
Merge branch 'ticket-13661-mobileReturn' into develop
|
2017-07-07 11:04:07 +02:00 |
|
Marion Muszynski
|
d775d69d33
|
fix mobile back from product
|
2017-07-07 11:03:51 +02:00 |
|
Marion Muszynski
|
441b94f1d8
|
Merge branch 'ticket-13564-giftOnShoppingCart' into develop
|
2017-07-06 17:50:23 +02:00 |
|
Marion Muszynski
|
dee10d158c
|
fix alert
|
2017-07-06 17:50:10 +02:00 |
|
Marion Muszynski
|
323e859e3f
|
Merge branch 'ticket-13564-giftOnShoppingCart' into develop
|
2017-07-06 17:30:30 +02:00 |
|
Marion Muszynski
|
92b2366ed1
|
fix
|
2017-07-06 17:30:16 +02:00 |
|
Marion Muszynski
|
389ba5467a
|
Merge branch 'ticket-13564-giftOnShoppingCart' into develop
|
2017-07-05 13:16:13 +02:00 |
|
Marion Muszynski
|
5670e21fa3
|
continuation of moving message gift to shipping cart
|
2017-07-05 13:15:51 +02:00 |
|
Marion Muszynski
|
eb39bdc47b
|
fix conflict
|
2017-07-05 11:07:43 +02:00 |
|
Marion Muszynski
|
7999a3d8f3
|
fix conflict
|
2017-07-04 16:06:55 +02:00 |
|
root
|
c23288a05b
|
push from prod for trad
|
2017-07-04 15:43:19 +02:00 |
|
Marion Muszynski
|
eef4d0f4b9
|
Merge branch 'ticket-13564-giftOnShoppingCart' into develop
|
2017-07-03 10:15:38 +02:00 |
|
Marion Muszynski
|
7a6771ba27
|
add javascript back to last page
|
2017-06-29 14:24:12 +02:00 |
|
Marion Muszynski
|
bdc241572a
|
Merge branch 'ticket-13560-BannerMobile' into develop
|
2017-06-28 12:18:17 +02:00 |
|
Marion Muszynski
|
cd390c8fb9
|
add promo banner for ps
|
2017-06-28 12:18:03 +02:00 |
|
Marion Muszynski
|
7ef886ba82
|
Merge branch 'ticket-13560-BannerMobile' into develop
|
2017-06-27 18:22:46 +02:00 |
|
Marion Muszynski
|
b87d25038f
|
addition of module ant_promobanner
|
2017-06-27 18:22:24 +02:00 |
|
Marion Muszynski
|
407da54291
|
ready for first tests
|
2017-06-27 12:10:10 +02:00 |
|
Marion Muszynski
|
d1ef2e6fe7
|
Merge branch 'ticket-13166-upgradeReturnPart2' into develop
|
2017-06-23 12:25:12 +02:00 |
|
Marion Muszynski
|
86c27e3ba3
|
Merge branch 'ticket-BandeauMobile'
|
2017-06-23 11:01:01 +02:00 |
|
Marion Muszynski
|
94fe7668a4
|
add promo in sale page
|
2017-06-23 11:00:46 +02:00 |
|
Marion Muszynski
|
013edd892f
|
Merge branch 'ticket-BandeauMobile'
|
2017-06-23 10:41:36 +02:00 |
|
Marion Muszynski
|
fd003a8443
|
add img promo
|
2017-06-23 10:41:25 +02:00 |
|
Marion Muszynski
|
2c78e0ac86
|
Merge branch 'ticket-BandeauMobile'
|
2017-06-23 10:40:33 +02:00 |
|
Marion Muszynski
|
c44bcdb281
|
add promo es on mobile version
|
2017-06-23 10:40:19 +02:00 |
|
Marion Muszynski
|
45431b2bb1
|
Merge branch 'ticket-13550-FixPayboxDirect'
|
2017-06-23 10:19:38 +02:00 |
|
Marion Muszynski
|
fe9de26a25
|
Merge branch 'ticket-13550-FixPayboxDirect' into develop
|
2017-06-23 10:11:24 +02:00 |
|
Marion Muszynski
|
6c4f773c7c
|
addition of promo on mobile
|
2017-06-22 17:34:21 +02:00 |
|
Marion Muszynski
|
4572379dfc
|
fix multi paiement and css
|
2017-06-22 16:53:29 +02:00 |
|
Marion Muszynski
|
77f3034f5f
|
Merge branch 'ticket-13324-pixelFB' into develop
|
2017-06-19 11:06:04 +02:00 |
|
Marion Muszynski
|
86ccf2ef15
|
check if customer already exists to prevent fb tracking resending for registration
|
2017-06-19 11:05:46 +02:00 |
|
Marion Muszynski
|
d11e800d34
|
Merge branch 'ticket-13473-IVAForEs' into develop
|
2017-06-14 11:57:41 +02:00 |
|
Marion Muszynski
|
96b66b0eae
|
fix translation
|
2017-06-14 11:57:18 +02:00 |
|
Marion Muszynski
|
a4b3b52b27
|
Merge branch 'ticket-13473-IVAForEs' into develop
|
2017-06-14 10:58:42 +02:00 |
|
Marion Muszynski
|
58aafd79c1
|
fix trad mobile
|
2017-06-08 15:41:22 +02:00 |
|
Marion Muszynski
|
d313207099
|
Merge branch 'ticket-9103-saleBg' into develop
|
2017-06-08 11:51:50 +02:00 |
|