Marion Muszynski
|
bd54b64402
|
Merge branch 'ticket-12754-MailAlert' into develop
|
2017-03-30 12:10:49 +02:00 |
|
Marion Muszynski
|
21ca232a11
|
addition of order status option in mail alert module
|
2017-03-30 12:10:32 +02:00 |
|
Marion Muszynski
|
dcba09e9c9
|
Merge branch 'ticket-12857-addInfoProduct'
|
2017-03-29 15:01:32 +02:00 |
|
Marion Muszynski
|
82e2916c8a
|
fix balise p tpl product
|
2017-03-29 15:01:17 +02:00 |
|
Marion Muszynski
|
dce18889d5
|
Merge branch 'ticket-12857-addInfoProduct'
|
2017-03-29 12:03:01 +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
|
dc9ec01fce
|
Merge branch 'fix-bestSellerCache'
|
2017-03-29 11:01:56 +02:00 |
|
Marion Muszynski
|
7174dc2f25
|
Merge branch 'fix-bestSellerCache' into develop
|
2017-03-29 10:56:13 +02:00 |
|
Marion Muszynski
|
82a396a094
|
remove presta cache system for bestseller
|
2017-03-29 10:55:52 +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
|
eedf8a37cf
|
Merge branch 'fix-bestSellerCache'
|
2017-03-29 10:11:47 +02:00 |
|
Marion Muszynski
|
53372852bf
|
Merge branch 'fix-bestSellerCache' into develop
|
2017-03-29 10:08:15 +02:00 |
|
Marion Muszynski
|
85ca91ccfc
|
remove presta cache system for similar products
|
2017-03-29 10:07:59 +02:00 |
|
Marion Muszynski
|
79b2174ae3
|
Merge branch 'ticket-12742-AntCreationCat'
|
2017-03-28 10:33:56 +02:00 |
|
Marion Muszynski
|
bcf9fe9792
|
Merge branch 'ticket-12574-RemoveProductFromBlockcart' into develop
|
2017-03-28 10:29:14 +02:00 |
|
Marion Muszynski
|
d9f183aacb
|
fix add to cart combination id
|
2017-03-28 10:28:57 +02:00 |
|
Marion Muszynski
|
35f047278f
|
Merge branch 'ticket-12574-RemoveProductFromBlockcart' into develop
|
2017-03-28 10:10:07 +02:00 |
|
Marion Muszynski
|
dafc4e16f0
|
fix remove from block cart
|
2017-03-28 10:09:35 +02:00 |
|
Marion Muszynski
|
8fd14dbaeb
|
Merge branch 'ticket-12742-AntCreationCat' into develop
|
2017-03-27 18:10:27 +02:00 |
|
Marion Muszynski
|
f886f5c02e
|
fix
|
2017-03-27 18:10:05 +02:00 |
|
Marion Muszynski
|
75fe225844
|
Merge branch 'ticket-12742-AntCreationCat' into develop
|
2017-03-27 18:03:47 +02:00 |
|
Marion Muszynski
|
36147fbf40
|
change to add , in category names
|
2017-03-27 18:03:30 +02:00 |
|
Marion Muszynski
|
5ff3f45264
|
Merge branch 'ticket-12828-cleanMenuCache'
|
2017-03-27 16:06:10 +02:00 |
|
Marion Muszynski
|
11fc4769b6
|
fix fatal
|
2017-03-27 16:05:55 +02:00 |
|
Marion Muszynski
|
f7e7d832c4
|
Merge branch 'ticket-12828-cleanMenuCache'
|
2017-03-27 13:24:48 +02:00 |
|
Marion Muszynski
|
b649aa1435
|
Merge branch 'ticket-12828-cleanMenuCache' into develop
|
2017-03-27 13:24:23 +02:00 |
|
Marion Muszynski
|
49cc2ef838
|
addition clean menu on category creation and updating
|
2017-03-27 13:24:03 +02:00 |
|
Marion Muszynski
|
20442f61db
|
Merge branch 'ticket-12828-cleanMenuCache'
|
2017-03-27 13:13:51 +02:00 |
|
Marion Muszynski
|
96fbc506d7
|
Merge branch 'ticket-12828-cleanMenuCache' into develop
|
2017-03-27 13:13:03 +02:00 |
|
Marion Muszynski
|
4e96e4abe9
|
addition of clean menu when ps is created/updated/deleted
|
2017-03-27 13:12:47 +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
|
c95612653d
|
Merge branch 'ticket-12830-OrderConf'
|
2017-03-23 15:34:22 +01: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
|
53068ca88c
|
Merge branch 'ticket-12643-OpenLoyaltyEs'
|
2017-03-23 15:19:32 +01:00 |
|
Marion Muszynski
|
6f501e8c42
|
fix trad
|
2017-03-23 15:19:18 +01:00 |
|
Marion Muszynski
|
3aea2dbe0f
|
Merge branch 'ticket-12643-OpenLoyaltyEs'
|
2017-03-23 15:05:05 +01:00 |
|
Marion Muszynski
|
e7ef07618b
|
Merge branch 'ticket-12643-OpenLoyaltyEs' into develop
|
2017-03-23 15:03:09 +01:00 |
|
Marion Muszynski
|
dde5791b86
|
fix opening on order status updating
|
2017-03-23 15:02:55 +01:00 |
|
Marion Muszynski
|
872b3592a2
|
Merge branch 'ticket-12462-returnMR' into develop
|
2017-03-23 09:51:43 +01:00 |
|
Marion Muszynski
|
308f65b702
|
modif return mail
|
2017-03-23 09:51:28 +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
|
45e607b627
|
Merge branch 'ticket-12643-OpenLoyaltyEs' into develop
|
2017-03-22 17:00:55 +01:00 |
|
Marion Muszynski
|
53946880d9
|
opening to es version
|
2017-03-22 17:00:37 +01:00 |
|