Commit Graph

Select branches

Hide Pull Requests

1.5

1.6

bootstrap

carrierwizard

development

export_excel

ignore_stock_without_combination

master

patch-1

1.5.0.0

1.5.0.1

1.5.0.13

1.5.0.15

1.5.0.17

1.5.0.2

1.5.0.3

1.5.0.5

1.5.0.9

1.5.1.0

1.5.2.0

1.5.3.0

1.5.3.1

1.5.4.0

1.5.4.1

1.5.5.0

1.5.6.0

1.5.6.1

1.6.0.1

Mono Color

• e4800accf3 When no warehouse configurated set 0 instead of seting '' Alexander Otchenashev 2013-01-19 22:56:47 +02:00
• 95490676e4 When no warehouse configurated set 0 instead of seting '' Alexander Otchenashev 2013-01-19 22:56:47 +02:00
• 0d058a5d50 [-] BO: Fix #PSCFV-6367 don't display the payment modules on BackOffice orders if they are disabled Rémi Gaillard 2013-01-18 17:01:47 +01:00
• 67d4f21dfa [-] BO: Fix #PSCFV-6367 don't display the payment modules on BackOffice orders if they are disabled Rémi Gaillard 2013-01-18 17:01:47 +01:00
• c0e46bbf07 // DbQuery could now use multiple tables for FROM Rémi Gaillard 2013-01-18 16:01:31 +01:00
• e97d593c2d // DbQuery could now use multiple tables for FROM Rémi Gaillard 2013-01-18 16:01:31 +01:00
• b38c9d0484 // lower memory usage for SpecificPrice::getProductIdByDate Rémi Gaillard 2013-01-18 14:18:59 +01:00
• 80797e8c43 // lower memory usage for SpecificPrice::getProductIdByDate Rémi Gaillard 2013-01-18 14:18:59 +01:00
• fb27c9d5cc [-] BO: Standard Norm PrestaEdit 2013-01-18 00:08:38 +01:00
• dcfcda4ae2 [-] BO: Standard Norm PrestaEdit 2013-01-18 00:08:38 +01:00
• d59ea3e6dd [*] BO: use lang for input file PrestaEdit 2013-01-17 23:29:11 +01:00
• 4fd9908953 [*] BO : use the employee lang PrestaEdit 2013-01-17 22:00:44 +01:00
• db8b027896 [*] BO : use the employee lang PrestaEdit 2013-01-17 22:00:44 +01:00
• 3fe27697a8 // Something was missing in commit ee62ed8d27 Rémi Gaillard 2013-01-17 17:27:59 +01:00
• 30c516619d // Something was missing in commit ee62ed8d27 Rémi Gaillard 2013-01-17 17:27:59 +01:00
• 0b177232a3 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-01-17 13:58:55 +01:00
• 3edef3b387 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-01-17 13:58:55 +01:00
• f76427fd22 [-] FO : fixed bug #PSCFV-5635 - Mobile Theme tax displayed vAugagneur 2013-01-17 13:58:48 +01:00
• 043bb745dd [-] FO : fixed bug #PSCFV-5635 - Mobile Theme tax displayed vAugagneur 2013-01-17 13:58:48 +01:00
• c550a6494e // Module upload error message Francois Gaillard 2013-01-17 10:26:45 +01:00
• 8d795f46ad // Module upload error message François Gaillard 2013-01-17 10:26:45 +01:00
• 4059f95086 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-01-17 09:28:13 +01:00
• 1c0d0969fa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-01-17 09:28:13 +01:00
• af3f89812d //update localization for canada vAugagneur 2013-01-17 09:28:06 +01:00
• 874beec806 //update localization for canada vAugagneur 2013-01-17 09:28:06 +01:00
• 1060bb3141 Merge branch 'development' of http://github.com/PrestaShop/PrestaShop into development Francois Gaillard 2013-01-16 18:47:39 +01:00
• b9dde1d50e Merge branch 'development' of http://github.com/PrestaShop/PrestaShop into development François Gaillard 2013-01-16 18:47:39 +01:00
• 9390dd63af // AdminHomeController, syntax changed Francois Gaillard 2013-01-16 18:47:29 +01:00
• 338ba1ce85 // AdminHomeController, syntax changed François Gaillard 2013-01-16 18:47:29 +01:00
• 6d46644cc4 [-] BO : fixed bug #PSCFV-5601 - AddressFormat wrongly forbid the 'other' field from the Address to be part of the address format vAugagneur 2013-01-16 18:24:11 +01:00
• 94a45b0572 [-] BO : fixed bug #PSCFV-5601 - AddressFormat wrongly forbid the 'other' field from the Address to be part of the address format vAugagneur 2013-01-16 18:24:11 +01:00
• f6fa20c3d5 [-] FO : fixed reduction display on product page #PSCFV-6308 Damien Metzger 2013-01-16 15:03:07 +01:00
• 46cf4e514f [-] FO : fixed reduction display on product page #PSCFV-6308 Damien Metzger 2013-01-16 15:03:07 +01:00
• 7393e6bf7f [-] BO : fixed quick access for upgrade from 1.4 #PSCFV-6370 Damien Metzger 2013-01-16 14:43:54 +01:00
• f66da4a6f8 [-] BO : fixed quick access for upgrade from 1.4 #PSCFV-6370 Damien Metzger 2013-01-16 14:43:54 +01:00
• 80422f5640 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-01-16 15:51:08 +01:00
• aee1eb457e Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-01-16 15:51:08 +01:00
• 1959075a27 [-] BO - fixed bug #PSCFV-5549 - vAugagneur 2013-01-16 15:50:52 +01:00
• 04c336fa63 [-] BO - fixed bug #PSCFV-5549 - vAugagneur 2013-01-16 15:50:52 +01:00
• 969e5d5bb5 [-] Core: Hook actionUpdateQuantity was not called for product without attributes which depends on the physical stock Rémi Gaillard 2013-01-16 14:08:33 +01:00
• d0074ed724 [-] Core: Hook actionUpdateQuantity was not called for product without attributes which depends on the physical stock Rémi Gaillard 2013-01-16 14:08:33 +01:00
• 508cd6e028 [-] BO : fixed bug #PSCFV-6381 - Customer Service mixing groups of shops (Multistore) vAugagneur 2013-01-16 12:20:02 +01:00
• 72bf8d0c88 [-] BO : fixed bug #PSCFV-6381 - Customer Service mixing groups of shops (Multistore) vAugagneur 2013-01-16 12:20:02 +01:00
• a2eda82603 //reduced informations block and added click to see more link vAugagneur 2013-01-16 11:07:29 +01:00
• 177cf36fa6 //reduced informations block and added click to see more link vAugagneur 2013-01-16 11:07:29 +01:00
• 2ea46c15a6 [-] FO : fixed bug #PSCFV-6533 - CMS categories: This page does not exist. vAugagneur 2013-01-16 10:47:00 +01:00
• 51a067c34c [-] FO : fixed bug #PSCFV-6533 - CMS categories: This page does not exist. vAugagneur 2013-01-16 10:47:00 +01:00
• 1c6a4c842c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-01-16 10:36:29 +01:00
• f7124f6cee Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-01-16 10:36:29 +01:00
• 3e0081a5d1 [-] BO : fixed bug #PSCFV-6623 - fixed Parse error vAugagneur 2013-01-16 10:36:24 +01:00
• 46aa9eeca7 [-] BO : fixed bug #PSCFV-6623 - fixed Parse error vAugagneur 2013-01-16 10:36:24 +01:00
• 57727a4cfa [-] FO : fixed voucher highlighting in the cart #PSCFV-6422 Damien Metzger 2013-01-15 20:07:44 +01:00
• c30f7b48e0 [-] FO : fixed voucher highlighting in the cart #PSCFV-6422 Damien Metzger 2013-01-15 20:07:44 +01:00
• 571f6a4d71 [-] FO : fixed +/- Tx on the customer voucher page #PSCFV-6642 Damien Metzger 2013-01-15 20:00:24 +01:00
• 9f9565ebb2 [-] FO : fixed +/- Tx on the customer voucher page #PSCFV-6642 Damien Metzger 2013-01-15 20:00:24 +01:00
• 46b4570e14 [-] MO : fixed phone number in mailalert #PSCFV-6667 Damien Metzger 2013-01-15 19:30:48 +01:00
• 83930c1b2e [-] MO : fixed phone number in mailalert #PSCFV-6667 Damien Metzger 2013-01-15 19:30:48 +01:00
• eed3f3453b [-] BO: Fix #PSCFV-6616 id_shop should be loaded from cart when no order is created on Admin Carts Rémi Gaillard 2013-01-15 19:31:21 +01:00
• e5e62ba00b [-] BO: Fix #PSCFV-6616 id_shop should be loaded from cart when no order is created on Admin Carts Rémi Gaillard 2013-01-15 19:31:21 +01:00
• adf928d60c // opti Rémi Gaillard 2013-01-15 18:56:42 +01:00
• a4997405dc // opti Rémi Gaillard 2013-01-15 18:56:42 +01:00
• b86b1a089e [-] FO: Fix Pack::getItemTable with some PHP versions Rémi Gaillard 2013-01-15 18:53:01 +01:00
• 02bbfb25d6 [-] FO: Fix Pack::getItemTable with some PHP versions Rémi Gaillard 2013-01-15 18:53:01 +01:00
• aeb60a0eb9 // Fixed typo Damien Metzger 2013-01-15 18:36:49 +01:00
• d450a259c4 // Fixed typo Damien Metzger 2013-01-15 18:36:49 +01:00
• 76dc6970d2 // Fixed potential warning Damien Metzger 2013-01-15 18:09:37 +01:00
• 36aad94b6a // Fixed potential warning Damien Metzger 2013-01-15 18:09:37 +01:00
• bcbbc7e63e // Welcome 2013 PrestaEdit 2013-01-15 17:52:04 +01:00
• 6fefecbcc4 // Welcome 2013 PrestaEdit 2013-01-15 17:52:04 +01:00
• a17802f621 [-] Small Fix: change documentation URL PrestaEdit 2013-01-15 17:48:28 +01:00
• e8d9516a8a [-] Small Fix: change documentation URL PrestaEdit 2013-01-15 17:48:28 +01:00
• dd0a29eeee Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-01-15 17:15:37 +01:00
• 71bd641b55 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-01-15 17:15:37 +01:00
• 6724491cfe [-] BO : fixed bug #PSCFV-6623 - multistore edit greek encoding vAugagneur 2013-01-15 17:15:30 +01:00
• 61b3135f6b [-] BO : fixed bug #PSCFV-6623 - multistore edit greek encoding vAugagneur 2013-01-15 17:15:30 +01:00
• 50ab651c4f [-] FO : recycled package should be disabled by default (because the option can be deactivated) #PSCFV-6639 Damien Metzger 2013-01-15 15:37:02 +01:00
• 610bd9d8c5 [-] FO : recycled package should be disabled by default (because the option can be deactivated) #PSCFV-6639 Damien Metzger 2013-01-15 15:37:02 +01:00
• 4526b48acc // Removed deprecated file Damien Metzger 2013-01-15 15:07:27 +01:00
• 7aec6663b9 // Removed deprecated file Damien Metzger 2013-01-15 15:07:27 +01:00
• 15d5b1ae07 //revert boulette vAugagneur 2013-01-15 15:04:20 +01:00
• 2c0bebef47 //revert boulette vAugagneur 2013-01-15 15:04:20 +01:00
• 34364e0801 //small fix vAugagneur 2013-01-15 14:52:57 +01:00
• e3e9651f39 //small fix vAugagneur 2013-01-15 14:52:57 +01:00
• 76abac8ae0 // Translations Damien Metzger 2013-01-15 14:46:55 +01:00
• 7e3accbb8a // Translations Damien Metzger 2013-01-15 14:46:55 +01:00
• f3374a5afb // Translation Damien Metzger 2013-01-15 14:15:33 +01:00
• c97b8927a8 // Translation Damien Metzger 2013-01-15 14:15:33 +01:00
• 49f8b7c7af [-] FO : fixed shipping number in e-mail #PSCFV-6584 Damien Metzger 2013-01-15 13:56:39 +01:00
• 9f99ec01b5 [-] FO : fixed shipping number in e-mail #PSCFV-6584 Damien Metzger 2013-01-15 13:56:39 +01:00
• 710feb595a // Fixed typo Damien Metzger 2013-01-15 13:54:06 +01:00
• e48c0cfc67 // Fixed typo Damien Metzger 2013-01-15 13:54:06 +01:00
• 4bad5fa3b1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-01-15 10:20:50 +01:00
• 915244d1b7 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-01-15 10:20:50 +01:00
• 95ab473198 // clean the output buffer before print PDF in BO Rémi Gaillard 2013-01-15 10:20:37 +01:00
• 433a446a35 // clean the output buffer before print PDF in BO Rémi Gaillard 2013-01-15 10:20:37 +01:00
• 1348291415 [WS] images are only shown as jpg or gif nturato 2013-01-15 10:17:02 +01:00
• de9e75cc0d [WS] images are only shown as jpg or gif nturato 2013-01-15 10:17:02 +01:00
• 2b54d38f70 //fixed bug #PSCFV-6645 missing translation vAugagneur 2013-01-15 10:01:29 +01:00
• 4af9ddd83f //fixed bug #PSCFV-6645 missing translation vAugagneur 2013-01-15 10:01:29 +01:00
• 9a933d8818 //recovered View my shop button vAugagneur 2013-01-14 17:59:18 +01:00