1112 Commits

Author SHA1 Message Date
Marion Muszynski
83599a72e6 fix 2017-04-11 12:32:58 +02:00
Marion Muszynski
8f62586369 fix conflict 2017-04-11 12:08:19 +02:00
Marion Muszynski
d6e3e16a51 modif rss flux catalogue 2017-04-10 16:33:42 +02:00
Marion Muszynski
400feb54e1 modification flux catalogue to https 2017-04-10 16:31:20 +02:00
Marion Muszynski
c7facde1f8 fix 2017-04-07 12:21:21 +02:00
Marion Muszynski
7d9b3dfcd7 fix for https 2017-04-07 11:47:42 +02:00
Marion Muszynski
20a07e3273 Merge branch 'ticket-12754-MailAlert' 2017-04-03 14:22:24 +02:00
Marion Muszynski
028fb3b087 http to https for newsletter 2017-04-03 12:52:49 +02:00
Marion Muszynski
b7f52f26ef addition of mail sending to contact@bebeboutik.com 2017-04-03 10:43:38 +02:00
Marion Muszynski
aefba6f752 fix mail sending when no discount added 2017-03-31 10:05:50 +02:00
Marion Muszynski
21ca232a11 addition of order status option in mail alert module 2017-03-30 12:10:32 +02:00
Marion Muszynski
dc9ec01fce Merge branch 'fix-bestSellerCache' 2017-03-29 11:01:56 +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
85ca91ccfc remove presta cache system for similar products 2017-03-29 10:07:59 +02:00
Marion Muszynski
d9f183aacb fix add to cart combination id 2017-03-28 10:28:57 +02:00
Marion Muszynski
dafc4e16f0 fix remove from block cart 2017-03-28 10:09:35 +02:00
Marion Muszynski
f886f5c02e fix 2017-03-27 18:10:05 +02:00
Marion Muszynski
36147fbf40 change to add , in category names 2017-03-27 18:03:30 +02:00
Marion Muszynski
11fc4769b6 fix fatal 2017-03-27 16:05:55 +02:00
Marion Muszynski
49cc2ef838 addition clean menu on category creation and updating 2017-03-27 13:24: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
396444b912 Merge branch 'ticket-12487-HTTPS' 2017-03-27 11:28:22 +02:00
Marion Muszynski
dde5791b86 fix opening on order status updating 2017-03-23 15:02:55 +01:00
Marion Muszynski
53946880d9 opening to es version 2017-03-22 17:00:37 +01:00
Marion Muszynski
647a917f7d fix js id_category change 2017-03-21 15:45:45 +01:00
Marion Muszynski
24d1d1fb33 fix 2 2017-03-21 14:57:26 +01:00
Marion Muszynski
b58b5a4f39 fix font-size 2017-03-21 14:54:06 +01:00
Marion Muszynski
ac57693101 fix css 2017-03-21 14:44:39 +01:00
Marion Muszynski
8d08040017 addition of delay in sale list 2017-03-21 14:39:43 +01:00
Marion Muszynski
e5a329fc18 modif flag and fix update position 2017-03-21 13:07:20 +01:00
Marion Muszynski
b7e014f924 fix https 2017-03-21 10:49:56 +01:00
Marion Muszynski
5aae2a217f moving from ps cache to saved data in txt 2017-03-21 10:46:54 +01:00
Marion Muszynski
b343fc4666 fix ps_url paiement.php paybox 2017-03-09 15:11:22 +01:00
Marion Muszynski
0b969badd1 fix protocol in paybox module 2017-03-09 12:35:04 +01:00
Marion Muszynski
fefd5442ac fix protocol in soflexibilite module 2017-03-09 12:17:04 +01:00
Marion Muszynski
85b5bb049d fix console log 2017-03-09 11:53:55 +01:00
Marion Muszynski
c73143d5b5 fix https in skinStatic module 2017-03-09 11:44:41 +01:00
Marion Muszynski
52a3477a1e fix //static 2017-03-09 11:07:11 +01:00
Marion Muszynski
1bd2edfe4d other fix getpagelink 2017-03-09 11:00:20 +01:00
Marion Muszynski
e9b9f368a1 Merge branch 'ticket-12659-PrintEan' 2017-03-09 10:36:14 +01:00
Marion Muszynski
bac4ebbbc2 modif with addition of product name and attribute name 2017-03-09 10:35:56 +01:00
Marion Muszynski
2e6e1d23ec start of changement to full https 2017-03-08 16:10:35 +01:00
Marion Muszynski
8fabe0bfa7 Merge branch 'ticket-12591-MarketingModifications' 2017-03-07 15:54:28 +01:00
Marion Muszynski
179f73f171 fix 2017-03-07 14:40:09 +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
28241acf6b add ref and name for print ean management in product BO 2017-03-06 17:05:28 +01:00
Marion Muszynski
601e396791 Merge branch 'ticket-12692-LabelGenerate' 2017-03-06 12:57:59 +01:00
Marion Muszynski
eae3fc73a4 last fix for label size 2017-03-06 12:57:45 +01:00
Marion Muszynski
b2b75a6fca addition of MR and title/alias fix 2017-03-06 12:54:14 +01:00