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

• 8e43f1e38f //recovered View my shop button vAugagneur 2013-01-14 17:59:18 +01:00
• 71e863c6f5 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-01-14 17:44:54 +01:00
• 5f490483d1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-01-14 17:44:54 +01:00
• ffbc326454 //clean duplicate css in BO vAugagneur 2013-01-14 17:44:34 +01:00
• cbb87e4bbc //clean duplicate css in BO vAugagneur 2013-01-14 17:44:34 +01:00
• 886f6d864b [+] BO : Added customer language on the customer page Damien Metzger 2013-01-14 16:45:21 +01:00
• 4efaad145f [+] BO : Added customer language on the customer page Damien Metzger 2013-01-14 16:45:21 +01:00
• 6d748d46d2 [-] FO: Fix #PSCFV-6456 price of default attribute with specific price on product comparison Rémi Gaillard 2013-01-14 15:16:50 +01:00
• bfffc48b82 [-] FO: Fix #PSCFV-6456 price of default attribute with specific price on product comparison Rémi Gaillard 2013-01-14 15:16:50 +01:00
• 7e8192280b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-01-14 14:24:14 +01:00
• 451383e4c0 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-01-14 14:24:14 +01:00
• 7e4897034d //BO more compliant with 1024x768 vAugagneur 2013-01-14 14:24:05 +01:00
• 61371b5b4c //BO more compliant with 1024x768 vAugagneur 2013-01-14 14:24:05 +01:00
• 5cecff7251 // fix php warning Rémi Gaillard 2013-01-14 14:12:14 +01:00
• c2261cc7fc // fix php warning Rémi Gaillard 2013-01-14 14:12:14 +01:00
• 968d6b4cfd Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-01-14 12:08:26 +01:00
• f496b844db Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-01-14 12:08:26 +01:00
• ef904c9083 [-] BO: Fix #PSCFV-5930 #PSCFV-5939 the filters are handled as the same between tabs which can cause sql errors Rémi Gaillard 2013-01-14 12:08:12 +01:00
• 76a12eb369 [-] BO: Fix #PSCFV-5930 #PSCFV-5939 the filters are handled as the same between tabs which can cause sql errors Rémi Gaillard 2013-01-14 12:08:12 +01:00
• 3f4bf5f559 [-] FO: improvement shopping cart voucher sLorenzini 2013-01-14 11:24:33 +01:00
• 6659bdceca [-] FO: improvement shopping cart voucher sLorenzini 2013-01-14 11:24:33 +01:00
• 556955a7f0 // small fix for smarty pre-compile Rémi Gaillard 2013-01-14 11:05:42 +01:00
• f516409fc0 // small fix for smarty pre-compile Rémi Gaillard 2013-01-14 11:05:42 +01:00
• 4dad9522e5 [-] CORE : fixed bug #PSCFV-6555 - Custom theme not working properly with image size vAugagneur 2013-01-14 10:38:41 +01:00
• 60260c4757 [-] CORE : fixed bug #PSCFV-6555 - Custom theme not working properly with image size vAugagneur 2013-01-14 10:38:41 +01:00
• 3f4f5f5df0 [*] Installer: pre-compile the smarty templates to improve the loading time of first connection Rémi Gaillard 2013-01-11 18:13:28 +01:00
• 2c855558cd [*] Installer: pre-compile the smarty templates to improve the loading time of first connection Rémi Gaillard 2013-01-11 18:13:28 +01:00
• 542d3aa1da [-] FO: fixed bug CSS sLorenzini 2013-01-10 17:23:32 +01:00
• 52a6a67f74 [-] FO: fixed bug CSS sLorenzini 2013-01-10 17:23:32 +01:00
• c2a1e1f150 [-] FO: fixed Css issue in BO - #PSCFV-6408 sLorenzini 2013-01-10 17:14:14 +01:00
• 6ca6a83412 [-] FO: fixed Css issue in BO - #PSCFV-6408 sLorenzini 2013-01-10 17:14:14 +01:00
• 90b3c7c467 [-] FO: Fix add to cart for product packs with no quantity and out of stock allowed #PSCFV-4788 Rémi Gaillard 2013-01-10 11:30:41 +01:00
• 2b9f64b790 [-] FO: Fix add to cart for product packs with no quantity and out of stock allowed #PSCFV-4788 Rémi Gaillard 2013-01-10 11:30:41 +01:00
• 6e3c743948 [-] FO : fixed bug #PSCFV-5569 - Trying to get property of non-object in SitemapController vAugagneur 2013-01-10 09:31:46 +01:00
• 74774be65e [-] FO : fixed bug #PSCFV-5569 - Trying to get property of non-object in SitemapController vAugagneur 2013-01-10 09:31:46 +01:00
• 2fad90640d [-] FO : fixed bug #PSCFV-6529 Vincent Augagneur 2013-01-09 23:18:09 +01:00
• 195c2c48f8 [-] FO : fixed bug #PSCFV-6529 Vincent Augagneur 2013-01-09 23:18:09 +01:00
• d72a5d4d94 [-] BO : fixed bug #PSCFV-6536 indefined index in toolbar.tpl vAugagneur 2013-01-09 23:03:20 +01:00
• 796b02bb68 [-] BO : fixed bug #PSCFV-6536 indefined index in toolbar.tpl vAugagneur 2013-01-09 23:03:20 +01:00
• c0d35d6d28 [-] BO: Disallow advanced stock management if the product become a pa Rémi Gaillard 2013-01-09 19:09:49 +01:00
• c740199e4f [-] BO: Disallow advanced stock management if the product become a pa Rémi Gaillard 2013-01-09 19:09:49 +01:00
• ada8d3e28a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-01-09 19:09:09 +01:00
• a933346af9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-01-09 19:09:09 +01:00
• 1956accc32 // small typo fix Rémi Gaillard 2013-01-09 18:27:42 +01:00
• 97626fc251 // small typo fix Rémi Gaillard 2013-01-09 18:27:42 +01:00
• ffa3be6e89 [-] FO : fix #PSCFV-6165 cart update when inactive country in old address gRoussac 2013-01-09 18:23:40 +01:00
• 015037c65f [-] FO : fix #PSCFV-6165 cart update when inactive country in old address gRoussac 2013-01-09 18:23:40 +01:00
• 84b6222de1 [-] FO : Fix backslashes for smartyTranslate and js=1 gRoussac 2013-01-09 18:20:25 +01:00
• 06b339fab0 [-] FO : Fix backslashes for smartyTranslate and js=1 gRoussac 2013-01-09 18:20:25 +01:00
• 6abb99552e [-] FO : Bad html entities for alert of order-address.js gRoussac 2013-01-09 17:09:15 +01:00
• 9771af9e28 [-] FO : Bad html entities for alert of order-address.js gRoussac 2013-01-09 17:09:15 +01:00
• b672b3281e [-] FO : Do not suggest states that are not active gRoussac 2013-01-09 17:05:33 +01:00
• 882b20bd81 [-] FO : Do not suggest states that are not active gRoussac 2013-01-09 17:05:33 +01:00
• f768081aa0 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-01-09 17:00:48 +01:00
• d76123db2f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-01-09 17:00:48 +01:00
• 6629542a22 [-] CORE : fixed bug #PSCFV-5433 - Order confirmation email doesn't report customization vAugagneur 2013-01-09 17:00:41 +01:00
• 6632b1674d [-] CORE : fixed bug #PSCFV-5433 - Order confirmation email doesn't report customization vAugagneur 2013-01-09 17:00:41 +01:00
• 554dd4aba4 // Fix PHP warning Rémi Gaillard 2013-01-09 16:55:28 +01:00
• 3d6b3d2cb0 // Fix PHP warning Rémi Gaillard 2013-01-09 16:55:28 +01:00
• 425a108aab [-] FO : Fix #PSCFV-5905 Fatal error: "no default carrier" gRoussac 2013-01-09 15:55:48 +01:00
• 3e5289c812 [-] FO : Fix #PSCFV-5905 Fatal error: "no default carrier" gRoussac 2013-01-09 15:55:48 +01:00
• 1eefd74994 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-01-09 15:47:03 +01:00
• 735c934702 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-01-09 15:47:03 +01:00
• 05b4e197b4 [-] FO : fixed bug #PSCFV-5312 - Error Uncaught TypeError: Cannot read property top of null in ajax-cart.js when Cart Block is not on product page vAugagneur 2013-01-09 15:46:50 +01:00
• 5e2a2a0781 [-] FO : fixed bug #PSCFV-5312 - Error Uncaught TypeError: Cannot read property top of null in ajax-cart.js when Cart Block is not on product page vAugagneur 2013-01-09 15:46:50 +01:00
• c46521883c // small perf optimization Rémi Gaillard 2013-01-09 14:35:06 +01:00
• 4a8c138a2c // small perf optimization Rémi Gaillard 2013-01-09 14:35:06 +01:00
• c855621e17 // performances improvement Rémi Gaillard 2013-01-09 14:16:22 +01:00
• db162ee987 // performances improvement Rémi Gaillard 2013-01-09 14:16:22 +01:00
• 108dfb292c [-] BO : fixed bug #PSCFV-4961 - Strange behavior when reordering categories vAugagneur 2013-01-09 13:44:19 +01:00
• 66974a05e0 [-] BO : fixed bug #PSCFV-4961 - Strange behavior when reordering categories vAugagneur 2013-01-09 13:44:19 +01:00
• 39e4dc96d4 //small fix part 2 vAugagneur 2013-01-09 12:06:00 +01:00
• b64098f3f2 //small fix part 2 vAugagneur 2013-01-09 12:06:00 +01:00
• 107295e570 //small fix vAugagneur 2013-01-09 11:58:48 +01:00
• 26055c26e7 //small fix vAugagneur 2013-01-09 11:58:48 +01:00
• e9726f2463 [-] BO : fixed bug #PSCFV-4668 - added check if module folder is writable before upgrade it vAugagneur 2013-01-09 11:37:02 +01:00
• 58100276a6 [-] BO : fixed bug #PSCFV-4668 - added check if module folder is writable before upgrade it vAugagneur 2013-01-09 11:37:02 +01:00
• b3e54c78b8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-01-09 10:34:08 +01:00
• 68e5a6746a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-01-09 10:34:08 +01:00
• 5480cb4691 [-] BO : bad initialization of context due to miss define of _PS_ADMIN_DIR_ in displayImage.php vAugagneur 2013-01-09 10:33:57 +01:00
• bb558446e8 [-] BO : bad initialization of context due to miss define of _PS_ADMIN_DIR_ in displayImage.php vAugagneur 2013-01-09 10:33:57 +01:00
• d52c1c4516 // small fix Rémi Gaillard 2013-01-09 10:28:28 +01:00
• 2dac490089 // small fix Rémi Gaillard 2013-01-09 10:28:28 +01:00
• 9154984c78 [-] CORE : fixed bug #PSCFV-4523 - Static _PS_DEFAULT_CUSTOMER_GROUP_ is still use in code even if deprecated 1.5.0.1 vAugagneur 2013-01-09 10:26:16 +01:00
• 857b8c2009 [-] CORE : fixed bug #PSCFV-4523 - Static _PS_DEFAULT_CUSTOMER_GROUP_ is still use in code even if deprecated 1.5.0.1 vAugagneur 2013-01-09 10:26:16 +01:00
• 9edb5e8911 // initialize also the link in config.inc.php for retrocompatibility Rémi Gaillard 2013-01-08 15:52:31 +01:00
• 32d10acf79 // initialize also the link in config.inc.php for retrocompatibility Rémi Gaillard 2013-01-08 15:52:31 +01:00
• 7dffb963ba [*] FO : Fix #PSCFV-6122 for better adresses aliasing in shopping-cart gRoussac 2013-01-08 15:39:11 +01:00
• a05f1db4bd [*] FO : Fix #PSCFV-6122 for better adresses aliasing in shopping-cart gRoussac 2013-01-08 15:39:11 +01:00
• 30e4b19b34 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Gregory Roussac 2013-01-08 11:46:31 +01:00
• 778302980b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Gregory Roussac 2013-01-08 11:46:31 +01:00
• 6ecd23a743 [-] FO : fix PSCFV-5934 bad redirection from https to http for CMS gRoussac 2013-01-08 11:45:41 +01:00
• d7f4a578a8 [-] FO : fix PSCFV-5934 bad redirection from https to http for CMS gRoussac 2013-01-08 11:45:41 +01:00
• 868effab13 [-] Fix: OrderHistory::changeIdOrderState Shagshag 2013-01-08 10:51:42 +01:00
• abdafca46b [-] Fix: OrderHistory::changeIdOrderState Shagshag 2013-01-08 10:51:42 +01:00
• d18eec1c14 [*] MO: Add smarty cache on editorial module Rémi Gaillard 2013-01-08 10:39:44 +01:00
• 49104743e8 [*] MO: Add smarty cache on editorial module Rémi Gaillard 2013-01-08 10:39:44 +01:00
• a45811590d [*] MO: Add smarty cache on blocksocial Rémi Gaillard 2013-01-08 10:34:57 +01:00
• 8ede60847b [*] MO: Add smarty cache on blocksocial Rémi Gaillard 2013-01-08 10:34:57 +01:00
• 6c99b48ebf [*] MO: Add smarty cache on blocksearch Rémi Gaillard 2013-01-08 10:32:09 +01:00