1130 Commits

Author SHA1 Message Date
Marion Muszynski
8d994ebcf7 fix be phone soflexibilite 2017-04-25 15:16:27 +02:00
Marion Muszynski
8fbeb85cd0 fix conflicts 2017-04-24 11:28:57 +02:00
Marion Muszynski
11516eca14 Merge branch 'ticket-13032' 2017-04-24 11:18:27 +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
32e7d65395 fix block filter on scroll category 2017-04-20 09:47:13 +02:00
Marion Muszynski
2bbc6d5fa6 addition of carrier filter for active ones 2017-04-19 12:36:41 +02:00
Marion Muszynski
7ef211bbf7 addition of another if statement to match eans with first 0 2017-04-18 17:01:00 +02:00
Marion Muszynski
90dd61b5bb add multilang on category img thumbs 2017-04-18 12:48:42 +02:00
Marion Muszynski
32822dbe49 fix when order is not valid 2017-04-13 14:10:43 +02:00
Marion Muszynski
ada530274e fix 2017-04-13 13:58:57 +02:00
Marion Muszynski
e89abbaee2 fix flag language 2017-04-13 13:51:04 +02:00
Marion Muszynski
841b995299 clean admin ps 2017-04-13 12:55:09 +02:00
Marion Muszynski
43bb64da79 Merge branch 'ticket-12487-HTTPS3' 2017-04-12 17:06:18 +02:00
Marion Muszynski
aad99bcea4 remove utm 2017-04-12 17:05:56 +02:00
Marion Muszynski
8d8c46d7b6 fix adminPrivateSaleSales 2017-04-12 09:52:43 +02:00
Marion Muszynski
01a8d528e2 fix sortable 2017-04-11 15:27:46 +02:00
Marion Muszynski
65ea663f75 fix conflict 2017-04-11 13:06:48 +02:00
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