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 |
|