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

• 4eef24de19 // Changed default phone number Damien Metzger 2013-02-06 14:13:34 +01:00
• 85e09e2a0a // Changed default phone number Damien Metzger 2013-02-06 14:13:34 +01:00
• 588276cfb1 [-] FO: Fix fatal error when a customer is deleted and still logged Rémi Gaillard 2013-02-06 11:56:23 +01:00
• 19795c1cea [-] FO: Fix fatal error when a customer is deleted and still logged Rémi Gaillard 2013-02-06 11:56:23 +01:00
• 7b7b964f6a Merge pull request #253 from Prestaworks/patch-7 Damien Metzger 2013-02-06 01:14:43 -08:00
• 70a5a1247a Merge pull request #253 from Prestaworks/patch-7 Damien Metzger 2013-02-06 01:14:43 -08:00
• 09f5879851 Update classes/Manufacturer.php Daniel 2013-02-06 11:35:15 +08:00
• 6c7c571381 Update classes/Manufacturer.php Daniel 2013-02-06 11:35:15 +08:00
• 9a231ac737 [-] MO: Display real price instead of Free for product which are not gifts on blockcart #PSCFV-6423 Rémi Gaillard 2013-02-05 18:25:40 +01:00
• 73143db07f [-] MO: Display real price instead of Free for product which are not gifts on blockcart #PSCFV-6423 Rémi Gaillard 2013-02-05 18:25:40 +01:00
• 11d4b76c8e Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-02-05 18:22:58 +01:00
• 604602a6b6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-02-05 18:22:58 +01:00
• d30677ef8b [-] FO : you need to execute CartRule::autoAddToCart() after CartRule::autoRemoveFromCart(), everytime #PSCFV-7674 Damien Metzger 2013-02-05 18:19:22 +01:00
• 063e6597e3 [-] FO : you need to execute CartRule::autoAddToCart() after CartRule::autoRemoveFromCart(), everytime #PSCFV-7674 Damien Metzger 2013-02-05 18:19:22 +01:00
• 15badf72e0 // Fixed conversion commar/dot for floating value in CSV import Damien Metzger 2013-02-05 18:09:20 +01:00
• 38cc7103fb // Fixed conversion commar/dot for floating value in CSV import Damien Metzger 2013-02-05 18:09:20 +01:00
• 2704d5e836 // Cannot import in a shop that does not exists Damien Metzger 2013-02-05 17:20:28 +01:00
• 2df3e7ee8b // Cannot import in a shop that does not exists Damien Metzger 2013-02-05 17:20:28 +01:00
• 9c816410c0 [-] BO: Forbid to delete the defaults return statuses Rémi Gaillard 2013-02-05 17:04:17 +01:00
• 4fe6006e20 [-] BO: Forbid to delete the defaults return statuses Rémi Gaillard 2013-02-05 17:04:17 +01:00
• 801b73055e [-] BO: Fix error message for new language creation and iso code not exists Rémi Gaillard 2013-02-05 16:33:29 +01:00
• 61265e587f [-] BO: Fix error message for new language creation and iso code not exists Rémi Gaillard 2013-02-05 16:33:29 +01:00
• 4518c8132d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Gregory Roussac 2013-02-05 16:13:59 +01:00
• 89fba01aa1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Gregory Roussac 2013-02-05 16:13:59 +01:00
• 7013babeda [-] FO: fixed bug rendering Problems in IE6 with default theme - #PSCFV-7628 sLorenzini 2013-02-05 15:53:54 +01:00
• b53b7479ab [-] FO: fixed bug rendering Problems in IE6 with default theme - #PSCFV-7628 sLorenzini 2013-02-05 15:53:54 +01:00
• ec7ca41c3e //fix small css bug vAugagneur 2013-02-05 15:44:02 +01:00
• 2f8f1bf745 //fix small css bug vAugagneur 2013-02-05 15:44:02 +01:00
• 66f82b119c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-02-05 15:28:28 +01:00
• 3e0e22f25a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-02-05 15:28:28 +01:00
• c80e0f48be [-] BO: Don't display delete icon for order carts Rémi Gaillard 2013-02-05 15:28:09 +01:00
• d2ba246a08 [-] BO: Don't display delete icon for order carts Rémi Gaillard 2013-02-05 15:28:09 +01:00
• 49d310fe49 [*] Core : added automatic conversion of ',' into '.' for floating values Damien Metzger 2013-02-05 15:02:29 +01:00
• 0052a9a94a [*] Core : added automatic conversion of ',' into '.' for floating values Damien Metzger 2013-02-05 15:02:29 +01:00
• 5156081b0d [-] TR : Fix #PSCFI-6818 increase input vars in french gRoussac 2013-02-05 14:18:34 +01:00
• 2d31bd19e8 [-] TR : Fix #PSCFI-6818 increase input vars in french gRoussac 2013-02-05 14:18:34 +01:00
• df860f1f47 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-02-05 14:16:58 +01:00
• 5330f4da40 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-02-05 14:16:58 +01:00
• b73ca29b58 //added getWidthSize and getHeightSize method in tpl thanks to @PrestaEdit vAugagneur 2013-02-05 14:16:47 +01:00
• 64764c4c1e //added getWidthSize and getHeightSize method in tpl thanks to @PrestaEdit vAugagneur 2013-02-05 14:16:47 +01:00
• 64d7655c6e [-] BO: Not allow to give an existing email when editing an employee Rémi Gaillard 2013-02-05 12:20:46 +01:00
• 0836efb02f [-] BO: Not allow to give an existing email when editing an employee Rémi Gaillard 2013-02-05 12:20:46 +01:00
• d336c05164 [-] CORE : Set default customer group to old default group when upgrading from 1.4.X gRoussac 2013-02-05 11:53:44 +01:00
• 6721387e7b [-] CORE : Set default customer group to old default group when upgrading from 1.4.X gRoussac 2013-02-05 11:53:44 +01:00
• a28d23211a [-] BO: Fix #PSCFV-6497 display of list when deleting customers Rémi Gaillard 2013-02-05 11:27:17 +01:00
• 9c31710092 [-] BO: Fix #PSCFV-6497 display of list when deleting customers Rémi Gaillard 2013-02-05 11:27:17 +01:00
• b9fec8eb0c // Fix merge bug Rémi Gaillard 2013-02-05 11:02:05 +01:00
• a84e91f973 // Fix merge bug Rémi Gaillard 2013-02-05 11:02:05 +01:00
• 4c87ee0fb0 [-] TR : now you can use " or ' in tpl files vAugagneur 2013-02-05 10:59:29 +01:00
• 3f8fce6720 [-] TR : now you can use " or ' in tpl files vAugagneur 2013-02-05 10:59:29 +01:00
• 57eaeb5efd Merge pull request #103 from damonsk/patch4 Vincent Augagneur 2013-02-05 01:42:46 -08:00
• 83183a7ee0 Merge pull request #103 from damonsk/patch4 Vincent Augagneur 2013-02-05 01:42:46 -08:00
• 973c8d8d4f [-] CORE : order state preparation now generate delivery slip vAugagneur 2013-02-05 10:15:53 +01:00
• fb7a82786c [-] CORE : order state preparation now generate delivery slip vAugagneur 2013-02-05 10:15:53 +01:00
• 0d9eb664d4 //failed to delete buffer. No buffer to delete in PDF vAugagneur 2013-02-05 10:12:00 +01:00
• 0ceab34c5e //failed to delete buffer. No buffer to delete in PDF vAugagneur 2013-02-05 10:12:00 +01:00
• 2aa0f3e93c Merge pull request #129 from PrestaEdit/Forum-#213412 Vincent Augagneur 2013-02-05 00:59:48 -08:00
• fdf5a4c3e1 Merge pull request #129 from PrestaEdit/Forum-#213412 Vincent Augagneur 2013-02-05 00:59:48 -08:00
• 288c3e1323 Merge pull request #134 from PrestaEdit/patch-2 Vincent Augagneur 2013-02-05 00:52:50 -08:00
• f8c97d8814 Merge pull request #134 from PrestaEdit/patch-2 Vincent Augagneur 2013-02-05 00:52:50 -08:00
• e1213badf8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-02-05 09:44:13 +01:00
• 7ffa731761 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-02-05 09:44:13 +01:00
• 606b3eedd5 [-] BO : error message on install module vAugagneur 2013-02-05 09:41:34 +01:00
• 4ef61eb8f8 [-] BO : error message on install module vAugagneur 2013-02-05 09:41:34 +01:00
• 63da844138 Merge pull request #210 from PrestaEdit/patch-15 Vincent Augagneur 2013-02-05 00:36:54 -08:00
• d39fb8a8e6 Merge pull request #210 from PrestaEdit/patch-15 Vincent Augagneur 2013-02-05 00:36:54 -08:00
• 35e5912def [-] Core: Fix #PSCFV-6067 stock was not reserved sometimes because of time Rémi Gaillard 2013-02-04 19:54:14 +01:00
• fdf7eeb629 [-] Core: Fix #PSCFV-6067 stock was not reserved sometimes because of time Rémi Gaillard 2013-02-04 19:54:14 +01:00
• d0d3180509 Merge branch 'dispatch_modules' into development vAugagneur 2013-02-04 18:20:24 +01:00
• b23aa76d6b Merge branch 'dispatch_modules' into development vAugagneur 2013-02-04 18:20:24 +01:00
• 947397c69b [+] BO : new display of payment modules in payment tab vAugagneur 2013-02-04 18:18:50 +01:00
• 0de5c242ca [+] BO : new display of payment modules in payment tab vAugagneur 2013-02-04 18:18:50 +01:00
• 168ccb2687 Merge pull request #243 from burhanbvk/patch-3 Damien Metzger 2013-02-04 09:14:20 -08:00
• a9106be306 Merge pull request #243 from burhanbvk/patch-3 Damien Metzger 2013-02-04 09:14:20 -08:00
• 3e5cb72f0f // small fix (installer) Damien Metzger 2013-02-04 16:18:51 +01:00
• 5d678ca69d // small fix (installer) Damien Metzger 2013-02-04 16:18:51 +01:00
• 0caea77c36 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-02-04 16:05:17 +01:00
• d4667abc63 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-02-04 16:05:17 +01:00
• 44d26d5804 [-] BO: Fix id_shop for configuration variables in global context for orders Rémi Gaillard 2013-02-04 16:05:01 +01:00
• 1dbf4855cc [-] BO: Fix id_shop for configuration variables in global context for orders Rémi Gaillard 2013-02-04 16:05:01 +01:00
• 2bf3df1c7d [-] Core : Fixed a lot of issue with free shipping vouchers #PSCFV-7325 Damien Metzger 2013-02-04 16:00:24 +01:00
• a53163feee [-] Core : Fixed a lot of issue with free shipping vouchers #PSCFV-7325 Damien Metzger 2013-02-04 16:00:24 +01:00
• a6a0dee0ca // Voucher cleaning Damien Metzger 2013-02-04 14:58:16 +01:00
• 10207ea6f9 // Voucher cleaning Damien Metzger 2013-02-04 14:58:16 +01:00
• 49ecd42395 // Voucher cleaning Damien Metzger 2013-02-04 14:53:44 +01:00
• 3c6f17b855 // Voucher cleaning Damien Metzger 2013-02-04 14:53:44 +01:00
• e9a7474bbe [-] FO : fixed voucher display in the customer view #PSCFV-7332 Damien Metzger 2013-02-04 13:47:39 +01:00
• 4f180b9b27 [-] FO : fixed voucher display in the customer view #PSCFV-7332 Damien Metzger 2013-02-04 13:47:39 +01:00
• 50794f89db [-] MO : statsforecast fixed #PSCFV-7399 Damien Metzger 2013-02-04 12:23:54 +01:00
• c385618fc2 [-] MO : statsforecast fixed #PSCFV-7399 Damien Metzger 2013-02-04 12:23:54 +01:00
• d72ce0d892 [-] BO: get the invoice prefix from the right shop Rémi Gaillard 2013-02-04 15:11:29 +01:00
• 7bd44ca1b1 [-] BO: get the invoice prefix from the right shop Rémi Gaillard 2013-02-04 15:11:29 +01:00
• a07d1b06fe // Fix PHP Notice Rémi Gaillard 2013-02-04 14:46:55 +01:00
• d6bd352844 // Fix PHP Notice Rémi Gaillard 2013-02-04 14:46:55 +01:00
• 8fd63e0f6e // PHP_SELF is only index.php Rémi Gaillard 2013-02-04 14:22:59 +01:00
• ceed2c996a // PHP_SELF is only index.php Rémi Gaillard 2013-02-04 14:22:59 +01:00
• 9c3f58b6a2 [-] FO : Fixed voucher value when it exceeds the product total #PSCFV-7421 Damien Metzger 2013-02-04 11:52:49 +01:00
• 3156093542 [-] FO : Fixed voucher value when it exceeds the product total #PSCFV-7421 Damien Metzger 2013-02-04 11:52:49 +01:00
• 197778c91a [-] FO : fixed customer discounts #PSCFV-7479 Damien Metzger 2013-02-04 10:51:43 +01:00
• 3cf9a1aa21 [-] FO : fixed customer discounts #PSCFV-7479 Damien Metzger 2013-02-04 10:51:43 +01:00