1664 Commits

Author SHA1 Message Date
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
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
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
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
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
c95612653d Merge branch 'ticket-12830-OrderConf' 2017-03-23 15:34:22 +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
dde5791b86 fix opening on order status updating 2017-03-23 15:02:55 +01:00
Marion Muszynski
e9aec9809c opening in blockuserinfo 2017-03-22 17:11:46 +01:00
Marion Muszynski
53946880d9 opening to es version 2017-03-22 17:00:37 +01:00
Marion Muszynski
f7cef155e6 Merge branch 'ticket-12804-CacheFooter' 2017-03-21 10:52:58 +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
862850afa1 fix facebook link 2017-03-09 12:48:38 +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
33cd9f3d08 continuation 2017-03-09 11:37:44 +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
f1e3151dac fix ssl 2017-03-09 10:53:26 +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
8051a5e9c2 fix redirect loop 2017-03-08 18:05:04 +01:00
Marion Muszynski
0658afedc6 other fixes 2017-03-08 17:50:41 +01:00
Marion Muszynski
6a02d5ae5c add getPageLinkSsl 2017-03-08 17:35:26 +01:00
Marion Muszynski
ebcf6fe55b fix useSSL 2017-03-08 17:27:37 +01:00
Marion Muszynski
9581b90d6c fix protocol 2017-03-08 17:19:26 +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
ce784cd72b Merge branch 'ticket-12659-PrintEan' 2017-03-06 17:05: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
ef59b585a0 Merge branch 'ticket-12591-MarketingModifications' 2017-03-03 13:23:05 +01:00
Marion Muszynski
92c5988b96 differentiation of url order 2017-03-03 13:21:08 +01:00
Marion Muszynski
332c5fdecf Merge branch 'fix-exportSale' 2017-03-03 12:04:48 +01:00