Marion Muszynski
|
13b68d20ae
|
moving gift message to shopping cart step
|
2017-06-30 12:57:06 +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
|
904f9865e7
|
fix price tax on product page add to cart box
|
2017-06-14 10:58:27 +02:00 |
|
Marion Muszynski
|
58aafd79c1
|
fix trad mobile
|
2017-06-08 15:41:22 +02:00 |
|
Marion Muszynski
|
96c04a1d8d
|
Merge branch 'ticket-9103-TradCategoryscroll' into develop
|
2017-06-08 13:06:36 +02:00 |
|
Marion Muszynski
|
7d1934296b
|
fix translation module categoryscroll
|
2017-06-08 13:06:19 +02:00 |
|
Marion Muszynski
|
d313207099
|
Merge branch 'ticket-9103-saleBg' into develop
|
2017-06-08 11:51:50 +02:00 |
|
Marion Muszynski
|
043cfee852
|
fix cookie close bug on mobile
|
2017-06-02 15:19:06 +02:00 |
|
Marion Muszynski
|
cfe960cfa2
|
fix logo carrier when it is a dropshipping
|
2017-06-02 10:21:06 +02:00 |
|
Marion Muszynski
|
0cde6166bb
|
Merge branch 'ticket-13306-ModifES' into develop
|
2017-06-01 12:59:39 +02:00 |
|
Marion Muszynski
|
2395374281
|
checked cdc for es version
|
2017-06-01 12:59:00 +02:00 |
|
Marion Muszynski
|
2ba4eb0a09
|
Merge branch 'ticket-13306-ModifES' into develop
|
2017-06-01 12:53:29 +02:00 |
|
Marion Muszynski
|
221bc66f44
|
modif for carrier logo
|
2017-06-01 12:53:13 +02:00 |
|
Marion Muszynski
|
fc042bbd16
|
Merge branch 'ticket-13306-ModifES' into develop
|
2017-06-01 12:27:24 +02:00 |
|
Marion Muszynski
|
d97e11d79c
|
change logo and fix colissimo choice in carrier step
|
2017-06-01 12:26:41 +02:00 |
|
Marion Muszynski
|
dc0ff8e9b6
|
Merge branch 'fix-OnCustomerRemoving' into develop
|
2017-06-01 10:53:25 +02:00 |
|
Marion Muszynski
|
487a5c4c00
|
Merge branch 'Ticket-10648-MobileModif'
|
2017-05-17 16:39:34 +02:00 |
|
Marion Muszynski
|
14aa04ee1d
|
fix length
|
2017-05-17 16:39:22 +02:00 |
|
Marion Muszynski
|
c8f5eb8273
|
Merge branch 'Ticket-10648-MobileModif'
|
2017-05-17 16:36:46 +02:00 |
|
Marion Muszynski
|
49137526de
|
fix
|
2017-05-17 16:36:35 +02:00 |
|
Marion Muszynski
|
e6a948861e
|
Merge branch 'Ticket-10648-MobileModif'
|
2017-05-17 16:34:42 +02:00 |
|
Marion Muszynski
|
db786b07ca
|
fix name ps in home mobile
|
2017-05-17 16:34:26 +02:00 |
|
Marion Muszynski
|
633b163638
|
fix gclid in redirection
|
2017-05-17 16:04:42 +02:00 |
|
Marion Muszynski
|
96cb372568
|
Merge branch 'add-LogPaybox' into develop
|
2017-05-17 11:33:01 +02:00 |
|
Marion Muszynski
|
6b058474c3
|
fix - prevent scroll on description short
|
2017-05-17 10:46:22 +02:00 |
|
Marion Muszynski
|
20bca1c110
|
fix mobile
|
2017-05-17 10:28:41 +02:00 |
|
Marion Muszynski
|
dc33a0af8c
|
some fixes
|
2017-05-16 11:35:03 +02:00 |
|
Nolwenn
|
c5ed75ed58
|
Merge branch 'mobile' into develop
|
2017-05-10 11:15:33 +02:00 |
|
Nolwenn
|
900c528fcf
|
suite recette
|
2017-05-10 11:15:04 +02:00 |
|
Nolwenn
|
419e9ce268
|
Merge branch 'mobile' into develop
|
2017-05-10 10:38:56 +02:00 |
|
Nolwenn
|
0d96ebce2c
|
truncate nom produit
|
2017-05-10 09:50:39 +02:00 |
|
Nolwenn
|
f77ecbda85
|
recette client mobile
|
2017-05-10 09:48:13 +02:00 |
|
root
|
b1082032a2
|
fix from prod
|
2017-05-09 15:54:17 +02:00 |
|
root
|
4c72d94cdf
|
fix from prod
|
2017-05-09 15:48:05 +02:00 |
|
root
|
652c005888
|
fix from prod
|
2017-05-09 15:30:32 +02:00 |
|
Marion Muszynski
|
68537be426
|
Merge branch 'mobile'
|
2017-05-09 14:46:10 +02:00 |
|
Marion Muszynski
|
cdf448b6e6
|
Merge branch 'mobile' into develop
|
2017-05-09 14:44:38 +02:00 |
|
Marion Muszynski
|
fa2db797b8
|
Merge branch 'ticket-12962-LandingPage' into develop
|
2017-04-28 11:05:31 +02:00 |
|
Marion Muszynski
|
de1c8e211e
|
addition of new landing page on home
|
2017-04-28 11:05:12 +02:00 |
|
Nolwenn
|
0d7c20c9d2
|
fixs
|
2017-04-27 17:00:47 +02:00 |
|
Nolwenn
|
b27f9ef4c3
|
mobile suite
|
2017-04-27 14:24:48 +02:00 |
|
Nolwenn
|
c33d9a9254
|
mobile suite
|
2017-04-26 17:15:51 +02:00 |
|
Nolwenn
|
ce5649b1f8
|
skin mobile home
|
2017-04-26 11:08:23 +02:00 |
|
Marion Muszynski
|
f280695772
|
fix conflicts
|
2017-04-25 15:04:54 +02:00 |
|
Marion Muszynski
|
8fbeb85cd0
|
fix conflicts
|
2017-04-24 11:28:57 +02:00 |
|
Marion Muszynski
|
9613ed7857
|
Merge branch 'ticket-12827-BugFilterProductList' into develop
|
2017-04-20 10:50:48 +02:00 |
|
Marion Muszynski
|
2d5c17ac1e
|
cleaning before merge
|
2017-04-20 10:50:15 +02:00 |
|
Marion Muszynski
|
a7394fdc93
|
fix bug when product is not found from filter options
|
2017-04-20 10:48:53 +02:00 |
|
Marion Muszynski
|
691c5ac4a3
|
fix conflicts
|
2017-04-20 09:48:17 +02:00 |
|
Marion Muszynski
|
32e7d65395
|
fix block filter on scroll category
|
2017-04-20 09:47:13 +02:00 |
|
Marion Muszynski
|
f2273997dd
|
Merge branch 'ticket-13023-MultilangThumbCat' into develop
|
2017-04-18 12:48:57 +02:00 |
|
Marion Muszynski
|
90dd61b5bb
|
add multilang on category img thumbs
|
2017-04-18 12:48:42 +02:00 |
|
Marion Muszynski
|
35e33703b7
|
fix conflicts
|
2017-04-13 12:32:44 +02:00 |
|
Marion Muszynski
|
66b25a2e07
|
remove quantity delete from cart and blockcart
|
2017-04-13 12:12:46 +02:00 |
|
Marion Muszynski
|
8f62586369
|
fix conflict
|
2017-04-11 12:08:19 +02:00 |
|
Marion Muszynski
|
bd54b64402
|
Merge branch 'ticket-12754-MailAlert' into develop
|
2017-03-30 12:10:49 +02:00 |
|
Marion Muszynski
|
82e2916c8a
|
fix balise p tpl product
|
2017-03-29 15:01:17 +02:00 |
|
Marion Muszynski
|
cb25685aad
|
Merge branch 'ticket-12857-addInfoProduct' into develop
|
2017-03-29 11:37:57 +02:00 |
|
Marion Muszynski
|
b585f50621
|
addition of info sentence in product tpl
|
2017-03-29 11:37:34 +02:00 |
|
Marion Muszynski
|
bc8a76bb3d
|
Merge branch 'ticket-12574-RemoveProductFromBlockcart'
|
2017-03-29 10:22:01 +02:00 |
|
Marion Muszynski
|
0987a1f866
|
Merge branch 'ticket-12574-RemoveProductFromBlockcart' into develop
|
2017-03-29 10:20:17 +02:00 |
|
Marion Muszynski
|
d060194a88
|
resize sub and add img
|
2017-03-29 10:20:00 +02:00 |
|
Marion Muszynski
|
e7d37116b3
|
Merge branch 'ticket-12574-RemoveProductFromBlockcart' into develop
|
2017-03-27 12:42:36 +02:00 |
|
Marion Muszynski
|
b390e60aaa
|
changement img for qty up and down
|
2017-03-27 12:42:16 +02:00 |
|
Marion Muszynski
|
396444b912
|
Merge branch 'ticket-12487-HTTPS'
|
2017-03-27 11:28:22 +02:00 |
|
Marion Muszynski
|
cbcbe2a3c9
|
Merge branch 'ticket-12830-OrderConf' into develop
|
2017-03-23 15:30:50 +01:00 |
|
Marion Muszynski
|
9fc6235a0e
|
change sentences and link in order confirmation tpl
|
2017-03-23 15:30:33 +01:00 |
|
Marion Muszynski
|
6f501e8c42
|
fix trad
|
2017-03-23 15:19:18 +01:00 |
|
Marion Muszynski
|
15cb213c18
|
Merge branch 'ticket-12643-OpenLoyaltyEs' into develop
|
2017-03-22 17:12:01 +01:00 |
|
Marion Muszynski
|
e9aec9809c
|
opening in blockuserinfo
|
2017-03-22 17:11:46 +01:00 |
|
Marion Muszynski
|
241e91c05b
|
Merge branch 'ticket-11985-MondialRelay_part2' into develop
|
2017-03-21 16:29:36 +01:00 |
|
Marion Muszynski
|
2233093d7e
|
Mr fancy box css modif
|
2017-03-21 16:29:14 +01:00 |
|
Marion Muszynski
|
8084e3cf36
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-09 12:48:53 +01:00 |
|
Marion Muszynski
|
862850afa1
|
fix facebook link
|
2017-03-09 12:48:38 +01:00 |
|
Marion Muszynski
|
4823dd518b
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-09 11:07:29 +01:00 |
|
Marion Muszynski
|
52a3477a1e
|
fix //static
|
2017-03-09 11:07:11 +01:00 |
|
Marion Muszynski
|
ba2adf4ec8
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-09 11:00:36 +01:00 |
|
Marion Muszynski
|
1bd2edfe4d
|
other fix getpagelink
|
2017-03-09 11:00:20 +01:00 |
|
Marion Muszynski
|
17c6ac82b6
|
fix bugs
|
2017-03-08 16:11:36 +01:00 |
|
Marion Muszynski
|
2e6e1d23ec
|
start of changement to full https
|
2017-03-08 16:10:35 +01:00 |
|
Marion Muszynski
|
8bd907d1bd
|
Merge branch 'ticket-12591-MarketingModifications' into develop
|
2017-03-07 13:26:08 +01:00 |
|
Marion Muszynski
|
ee271d98c8
|
continuation of updating of market data with addition of remove from cart to GA and addition of name of sale when product is sent to GA
|
2017-03-07 13:25:46 +01:00 |
|
Marion Muszynski
|
a6fe73118a
|
Merge branch 'ticket-12591-MarketingModifications' into develop
|
2017-03-03 13:21:23 +01:00 |
|
Marion Muszynski
|
92c5988b96
|
differentiation of url order
|
2017-03-03 13:21:08 +01:00 |
|
Marion Muszynski
|
0da43afb39
|
Merge branch 'ticket-12574-RemoveProductFromBlockcart' into develop
|
2017-03-01 17:24:04 +01:00 |
|
Marion Muszynski
|
1aca7305b8
|
addition possibility to up/down or remove from blockcart list
|
2017-03-01 17:23:45 +01:00 |
|
Marion Muszynski
|
7a956baf2e
|
addition of sentence in blocktext2
|
2017-03-01 11:34:40 +01:00 |
|
Marion Muszynski
|
c17728cdfe
|
Merge branch 'ticket-12563-TrustedBadge'
|
2017-02-27 16:46:39 +01:00 |
|
Marion Muszynski
|
e016c0057a
|
fix conflicts
|
2017-02-27 11:03:20 +01:00 |
|
Marion Muszynski
|
197f48052c
|
Merge branch 'ticket-12563-TrustedBadge' into develop
|
2017-02-24 18:08:12 +01:00 |
|
Marion Muszynski
|
456c33e769
|
fix badge to have comment
|
2017-02-24 18:07:55 +01:00 |
|
Marion Muszynski
|
cac2e4099a
|
Merge branch 'ticket-12563-TrustedBadge' into develop
|
2017-02-24 17:28:35 +01:00 |
|
Marion Muszynski
|
5b5e1933c4
|
changement position of badge
|
2017-02-24 14:20:53 +01:00 |
|
Marion Muszynski
|
c4edb90c2b
|
fix js tooltips in product-list
|
2017-02-23 15:37:06 +01:00 |
|
Marion Muszynski
|
3f23070f12
|
fix css tooltip
|
2017-02-23 15:21:42 +01:00 |
|
Marion Muszynski
|
acb257335d
|
Merge branch 'ticket-12571-randomProduct' into develop
|
2017-02-21 11:57:25 +01:00 |
|
Marion Muszynski
|
17633b00f8
|
add picto in categoryscroll
|
2017-02-21 11:57:07 +01:00 |
|
Marion Muszynski
|
40596721a0
|
fix conflicts
|
2017-02-21 11:51:37 +01:00 |
|
Marion Muszynski
|
2837aea4a5
|
addition of picto for random product
|
2017-02-21 11:49:55 +01:00 |
|
Marion Muszynski
|
eeac92d0ef
|
fix conflicts
|
2017-02-07 16:35:59 +01:00 |
|
Marion Muszynski
|
5159283a8a
|
making order choice required
|
2017-02-07 16:34:03 +01:00 |
|
Marion Muszynski
|
1c36dc6731
|
fix conflicts
|
2017-01-24 12:35:45 +01:00 |
|
Marion Muszynski
|
9fe2c90d1c
|
revert changement
|
2017-01-24 12:34:44 +01:00 |
|
Marion Muszynski
|
e02f19c21b
|
fix conflict
|
2017-01-24 11:30:02 +01:00 |
|
Marion Muszynski
|
4eaa76f76a
|
hide relay select for widget socol
|
2017-01-24 11:27:47 +01:00 |
|
Marion Muszynski
|
63a0b72670
|
Merge branch 'ticket-12200-FuturSalesInMenu' into develop
|
2017-01-23 15:11:06 +01:00 |
|
Marion Muszynski
|
fe1aed864a
|
remove click on future sale links
|
2017-01-23 15:10:48 +01:00 |
|
Marion Muszynski
|
eaf807cff3
|
Merge branch 'ticket-12200-FuturSalesInMenu' into develop
|
2017-01-23 11:28:51 +01:00 |
|
Marion Muszynski
|
7d5783ac32
|
adding future sales in privatesale menu
|
2017-01-23 11:28:33 +01:00 |
|
Marion Muszynski
|
1bd6618395
|
Merge branch 'ticket-12204-ImportEan' into develop
|
2017-01-17 13:25:53 +01:00 |
|
Marion Muszynski
|
217c96b383
|
fix css 2
|
2017-01-13 12:47:30 +01:00 |
|
Marion Muszynski
|
17bf597781
|
fix css
|
2017-01-13 12:42:49 +01:00 |
|
Marion Muszynski
|
682d0b48f8
|
fix conflicts
|
2017-01-11 15:55:31 +01:00 |
|
Marion Muszynski
|
5192561bac
|
update BlockOrderSummary, AdminPrivateSalesSale, ParentOrderController, AdminLogistic, logistic, OrderDetailController, order_detail tpl, mondial relay tpl for Mondial Relay
|
2017-01-11 15:33:44 +01:00 |
|
Marion Muszynski
|
dce506d50b
|
Merge branch 'ticket-12199-PopupAddToCart' into develop
|
2017-01-09 11:11:23 +01:00 |
|
Marion Muszynski
|
92bb810bb7
|
fix top again
|
2017-01-09 11:11:05 +01:00 |
|
Marion Muszynski
|
f62b3b6993
|
Merge branch 'ticket-12199-PopupAddToCart' into develop
|
2017-01-09 10:44:30 +01:00 |
|
Marion Muszynski
|
13f86ed0f5
|
fix top of add to cart popup
|
2017-01-09 10:44:12 +01:00 |
|
Marion Muszynski
|
4f3b7c2b15
|
Merge branch 'ticket-12122-ModifNewStatus' into develop
|
2016-12-23 14:00:01 +01:00 |
|
Marion Muszynski
|
9d79455930
|
fix trad
|
2016-12-21 12:50:35 +01:00 |
|
Marion Muszynski
|
b3b9d7313f
|
Merge branch 'ticket-12052-PreventDelivery' into develop
|
2016-12-15 12:02:48 +01:00 |
|
Marion Muszynski
|
a13396baa8
|
restriction for delivery to ceuta and melina
|
2016-12-15 12:02:32 +01:00 |
|
Marion Muszynski
|
b5f2e365ad
|
fix conflicts
|
2016-12-12 16:09:07 +01:00 |
|
Marion Muszynski
|
809cc513a4
|
addition of delivery info in product tpl mobile version
|
2016-12-12 15:45:59 +01:00 |
|
Marion Muszynski
|
8c5dec2293
|
beginning
|
2016-12-09 15:26:22 +01:00 |
|
Marion Muszynski
|
ee8cd5807a
|
remove background of vp logo in product tpl
|
2016-12-07 15:39:03 +01:00 |
|
Marion Muszynski
|
f26aaab52b
|
Merge branch 'ticket-11957-removePersonalData' into develop
|
2016-12-06 12:07:40 +01:00 |
|
Marion Muszynski
|
655a7515d7
|
remove other personal datas
|
2016-12-06 12:07:23 +01:00 |
|
Marion Muszynski
|
908f81cea3
|
Merge branch 'ticket-11957-removePersonalData' into develop
|
2016-12-06 11:53:59 +01:00 |
|