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
|
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
|
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
|
11fc4769b6
|
fix fatal
|
2017-03-27 16:05:55 +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
|
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
|
396444b912
|
Merge branch 'ticket-12487-HTTPS'
|
2017-03-27 11:28:22 +02: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
|
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 |
|
Marion Muszynski
|
bb4e4c8249
|
Merge branch 'evo-AdminPrivateSaleSales' into develop
|
2017-03-21 15:46:02 +01:00 |
|
Marion Muszynski
|
647a917f7d
|
fix js id_category change
|
2017-03-21 15:45:45 +01:00 |
|
Marion Muszynski
|
62794cd4bc
|
fix conflicts
|
2017-03-21 15:17:25 +01:00 |
|
Marion Muszynski
|
c919001821
|
Merge branch 'evo-AdminPrivateSaleSales' into develop
|
2017-03-21 14:57:41 +01:00 |
|
Marion Muszynski
|
24d1d1fb33
|
fix 2
|
2017-03-21 14:57:26 +01:00 |
|
Marion Muszynski
|
f0850ce461
|
Merge branch 'evo-AdminPrivateSaleSales' into develop
|
2017-03-21 14:54:27 +01:00 |
|
Marion Muszynski
|
b58b5a4f39
|
fix font-size
|
2017-03-21 14:54:06 +01:00 |
|
Marion Muszynski
|
bb9c991c2d
|
Merge branch 'evo-AdminPrivateSaleSales' into develop
|
2017-03-21 14:45:00 +01:00 |
|
Marion Muszynski
|
ac57693101
|
fix css
|
2017-03-21 14:44:39 +01:00 |
|
Marion Muszynski
|
2e3d56135e
|
Merge branch 'evo-AdminPrivateSaleSales' into develop
|
2017-03-21 14:40:02 +01:00 |
|
Marion Muszynski
|
8d08040017
|
addition of delay in sale list
|
2017-03-21 14:39:43 +01:00 |
|
Marion Muszynski
|
0aef5e434f
|
fix conflicts
|
2017-03-21 13:29:38 +01:00 |
|
Marion Muszynski
|
e5a329fc18
|
modif flag and fix update position
|
2017-03-21 13:07:20 +01:00 |
|
Marion Muszynski
|
8fe32a145b
|
Merge branch 'ticket-12804-CacheFooter' into develop
|
2017-03-21 10:50:11 +01:00 |
|
Marion Muszynski
|
b7e014f924
|
fix https
|
2017-03-21 10:49:56 +01:00 |
|
Marion Muszynski
|
b23f1a0fa0
|
Merge branch 'ticket-12804-CacheFooter' into develop
|
2017-03-21 10:47:13 +01:00 |
|
Marion Muszynski
|
5aae2a217f
|
moving from ps cache to saved data in txt
|
2017-03-21 10:46:54 +01:00 |
|
Marion Muszynski
|
0cd71bde80
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-09 15:11:41 +01:00 |
|
Marion Muszynski
|
b343fc4666
|
fix ps_url paiement.php paybox
|
2017-03-09 15:11:22 +01:00 |
|
Marion Muszynski
|
06e546dfae
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-09 12:35:16 +01:00 |
|
Marion Muszynski
|
0b969badd1
|
fix protocol in paybox module
|
2017-03-09 12:35:04 +01:00 |
|
Marion Muszynski
|
b28f3dbd7e
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-09 12:17:21 +01:00 |
|
Marion Muszynski
|
fefd5442ac
|
fix protocol in soflexibilite module
|
2017-03-09 12:17:04 +01:00 |
|
Marion Muszynski
|
61ec78cab3
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-09 11:54:39 +01:00 |
|
Marion Muszynski
|
85b5bb049d
|
fix console log
|
2017-03-09 11:53:55 +01:00 |
|
Marion Muszynski
|
e87b0ce97b
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-09 11:45:02 +01:00 |
|
Marion Muszynski
|
c73143d5b5
|
fix https in skinStatic module
|
2017-03-09 11:44:41 +01:00 |
|
Marion Muszynski
|
4823dd518b
|
Merge branch 'ticket-12487-HTTPS' into develop
|
2017-03-09 11:07:29 +01:00 |
|