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

• 13425aff53 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release vAugagneur 2012-12-18 16:00:20 +01:00
• 9b0dbae730 [-] CORE : fixed bug #PSCFV-5116 Horizontal top menu cache vAugagneur 2012-12-18 16:00:10 +01:00
• a91fafe05a [-] CORE : fixed bug #PSCFV-5116 Horizontal top menu cache vAugagneur 2012-12-18 16:00:10 +01:00
• 85b1127be2 // small change Rémi Gaillard 2012-12-18 15:59:57 +01:00
• ee4534a548 // small change Rémi Gaillard 2012-12-18 15:59:57 +01:00
• 62e70850fb [-] BO : Fixed warning in helper #PSCFV-6183 Damien Metzger 2012-12-18 15:47:09 +01:00
• 96d6abe2af [-] BO : Fixed warning in helper #PSCFV-6183 Damien Metzger 2012-12-18 15:47:09 +01:00
• d431802e7e [-] Core: The emails can now be sent with amazon SES when logo is in png Rémi Gaillard 2012-12-18 15:45:43 +01:00
• 26d95d1ea4 [-] Core: The emails can now be sent with amazon SES when logo is in png Rémi Gaillard 2012-12-18 15:45:43 +01:00
• ef9e58a27c [-] MO : crossselling - Added in condition to test element is present. Damon Skelhorn 2012-12-18 14:38:48 +00:00
• 144081ae9e [-] MO : crossselling - Added in condition to test element is present. Damon Skelhorn 2012-12-18 14:38:48 +00:00
• ef0eb49ba9 [-] CORE : fixed bug #PSCFV-4754 Image sizes are the same for all shops and themes vAugagneur 2012-12-18 14:59:34 +01:00
• 17350c6149 [-] CORE : fixed bug #PSCFV-4754 Image sizes are the same for all shops and themes vAugagneur 2012-12-18 14:59:34 +01:00
• 270ae41d15 [-] BO : fixed weight and distance units validation Damien Metzger 2012-12-18 14:40:43 +01:00
• c138e2dc5b [-] BO : fixed weight and distance units validation Damien Metzger 2012-12-18 14:40:43 +01:00
• a80a5414cc // Grumpf Damien Metzger 2012-12-18 14:35:28 +01:00
• 86547e0b79 // Grumpf Damien Metzger 2012-12-18 14:35:28 +01:00
• d581396b0f // Not enough Damien Metzger 2012-12-18 14:34:33 +01:00
• bd17218001 // Not enough Damien Metzger 2012-12-18 14:34:33 +01:00
• 975310f18b [-] BO : fixed weight and distance units validation Damien Metzger 2012-12-18 14:27:11 +01:00
• c24da4aafc [-] BO : fixed weight and distance units validation Damien Metzger 2012-12-18 14:27:11 +01:00
• 985062f56f [*] MO : crossselling - moved javascript include into header hook. Damon Skelhorn 2012-12-18 11:52:25 +00:00
• 403ce760b2 [*] MO : crossselling - moved javascript include into header hook. Damon Skelhorn 2012-12-18 11:52:25 +00:00
• 4aa5655613 [-] Core : do not die in production mode! #PSCFV-5751 Damien Metzger 2012-12-18 11:48:50 +01:00
• 7869a43d16 [-] Core : do not die in production mode! #PSCFV-5751 Damien Metzger 2012-12-18 11:48:50 +01:00
• a8c86f09e7 [-] FO : fixed CSS compression when using inline images #PSCFV-5326 Damien Metzger 2012-12-18 11:15:01 +01:00
• 122c3e5a86 [-] FO : fixed CSS compression when using inline images #PSCFV-5326 Damien Metzger 2012-12-18 11:15:01 +01:00
• 3954d7381d Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release vAugagneur 2012-12-17 18:05:25 +01:00
• 06345eab9a Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release vAugagneur 2012-12-17 18:05:25 +01:00
• fde175ac4f revert modif on product.js vAugagneur 2012-12-17 18:05:22 +01:00
• a7ad0d9b30 revert modif on product.js vAugagneur 2012-12-17 18:05:22 +01:00
• d2fedaf40d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2012-12-17 16:51:36 +01:00
• 8d6de37870 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2012-12-17 16:51:36 +01:00
• f127d22ba0 //added more details in some error messages vAugagneur 2012-12-17 16:51:21 +01:00
• 3a55ff9ee9 //added more details in some error messages vAugagneur 2012-12-17 16:51:21 +01:00
• 12be2627f2 [-] FO : fixed multishipping crash when too many products and addresses Damien Metzger 2012-12-17 16:27:47 +01:00
• c705d1eb4b [-] FO : fixed multishipping crash when too many products and addresses Damien Metzger 2012-12-17 16:27:47 +01:00
• 6e53faa91b [-] FO : fixed multishipping crash when too many products and addresses Damien Metzger 2012-12-17 16:18:57 +01:00
• 2076690383 [-] FO : fixed multishipping crash when too many products and addresses Damien Metzger 2012-12-17 16:18:57 +01:00
• 5b7069f0bf [-] FO: Fix cache product features #PSCFV-6138 Rémi Gaillard 2012-12-17 15:52:52 +01:00
• c9ef2c44ae [-] FO: Fix cache product features #PSCFV-6138 Rémi Gaillard 2012-12-17 15:52:52 +01:00
• ffa72b0b93 [-] BO : fixed image upload (except with OVH firewall) #PSCFV-6152 #PSCFV-6157 #PSCFV-5862 #PSCFV-5756 #PSCFV-6074 #PSCFV-5459 Damien Metzger 2012-12-17 15:45:40 +01:00
• a0f51e20c2 [-] BO : fixed image upload (except with OVH firewall) #PSCFV-6152 #PSCFV-6157 #PSCFV-5862 #PSCFV-5756 #PSCFV-6074 #PSCFV-5459 Damien Metzger 2012-12-17 15:45:40 +01:00
• 4c873cf61d [-] BO : fixed image upload (except with OVH firewall) #PSCFV-6152 #PSCFV-6157 #PSCFV-5862 #PSCFV-5756 #PSCFV-6074 #PSCFV-5459 Damien Metzger 2012-12-17 15:45:40 +01:00
• 3d1663279a [-] BO : fixed image upload (except with OVH firewall) #PSCFV-6152 #PSCFV-6157 #PSCFV-5862 #PSCFV-5756 #PSCFV-6074 #PSCFV-5459 Damien Metzger 2012-12-17 15:45:40 +01:00
• 1c181b7c20 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release vAugagneur 2012-12-17 15:26:00 +01:00
• 4785acb7f9 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release vAugagneur 2012-12-17 15:26:00 +01:00
• e472ff7239 [-] FO : fixed loop redirect when pagination have 0 product vAugagneur 2012-12-17 15:25:56 +01:00
• 20b87785e3 [-] FO : fixed loop redirect when pagination have 0 product vAugagneur 2012-12-17 15:25:56 +01:00
• 3a72d1676c [-] BO: Fix #PSCFV-6172 don't htmlentities the cart rule name && increase size of name order_cart_rule field Rémi Gaillard 2012-12-17 14:42:24 +01:00
• 35013b82fe [-] BO: Fix #PSCFV-6172 don't htmlentities the cart rule name && increase size of name order_cart_rule field Rémi Gaillard 2012-12-17 14:42:24 +01:00
• 3e89821b1d [-] Core: Fix #PSCFV-6162 - can't add no tax for specific zip code or state Rémi Gaillard 2012-12-17 12:29:29 +01:00
• 4320f4c30c [-] Core: Fix #PSCFV-6162 - can't add no tax for specific zip code or state Rémi Gaillard 2012-12-17 12:29:29 +01:00
• 3d35871fd5 //small fix in admin modules vAugagneur 2012-12-17 09:58:33 +01:00
• 9f474669e6 //small fix in admin modules vAugagneur 2012-12-17 09:58:33 +01:00
• fff026ca7d //display import button only on listing vAugagneur 2012-12-17 09:55:31 +01:00
• 1176a0eeb0 //display import button only on listing vAugagneur 2012-12-17 09:55:31 +01:00
• 49319cbe4e // Typo in the name of an image Damien Metzger 2012-12-14 17:14:01 +01:00
• 1e7963ec12 // Typo in the name of an image Damien Metzger 2012-12-14 17:14:01 +01:00
• 912971263b [-] BO : fixed bug #PSCFV-5408 - Affect a new zone button for selected states in States doesn't work correctly vAugagneur 2012-12-14 16:12:25 +01:00
• c841ddfcf5 [-] BO : fixed bug #PSCFV-5408 - Affect a new zone button for selected states in States doesn't work correctly vAugagneur 2012-12-14 16:12:25 +01:00
• 623300419d [-] MO : pagesnotfound module fixed #PSCFV-5949 Damien Metzger 2012-12-14 15:51:45 +01:00
• 3de6356240 [-] MO : pagesnotfound module fixed #PSCFV-5949 Damien Metzger 2012-12-14 15:51:45 +01:00
• 4b9e70a092 [-] Core : removed outdated file that may interfere with override #PSCFV-5911 Damien Metzger 2012-12-14 15:31:25 +01:00
• 770be469f6 [-] Core : removed outdated file that may interfere with override #PSCFV-5911 Damien Metzger 2012-12-14 15:31:25 +01:00
• 5d32c7004e [-] Core : maxmind geoip API was outdated #PSCFV-5941 Damien Metzger 2012-12-14 15:29:35 +01:00
• 3fd4fd6f70 [-] Core : maxmind geoip API was outdated #PSCFV-5941 Damien Metzger 2012-12-14 15:29:35 +01:00
• 02b4df024b [-] MO : fixed override deployment from module #PSCFV-5999 Damien Metzger 2012-12-14 14:58:35 +01:00
• 2b06e54e78 [-] MO : fixed override deployment from module #PSCFV-5999 Damien Metzger 2012-12-14 14:58:35 +01:00
• cba1bdf9ee // Fixed confirmation message display in some modules Damien Metzger 2012-12-14 14:53:14 +01:00
• 1abfedbf5e // Fixed confirmation message display in some modules Damien Metzger 2012-12-14 14:53:14 +01:00
• 310eac9f69 [-] Core : cannot throw an exception in the autoload #PSCFV-6018 Damien Metzger 2012-12-14 14:28:33 +01:00
• c3c29e3abd [-] Core : cannot throw an exception in the autoload #PSCFV-6018 Damien Metzger 2012-12-14 14:28:33 +01:00
• 689a10d9bd [-] FO : fixed default order by manufacturer #PSCFV-6105 Damien Metzger 2012-12-14 10:30:13 +01:00
• 3c2ae9efa7 [-] FO : fixed default order by manufacturer #PSCFV-6105 Damien Metzger 2012-12-14 10:30:13 +01:00
• d930c479fb [-] BO : added check on a key in the helper list #PSCFV-6137 Damien Metzger 2012-12-14 10:13:28 +01:00
• 630b41ec71 [-] BO : added check on a key in the helper list #PSCFV-6137 Damien Metzger 2012-12-14 10:13:28 +01:00
• eb423f1a09 [-] BO : fixed duplicate code management on cart rules #PSCFV-6119 Damien Metzger 2012-12-14 09:48:16 +01:00
• c13c378418 [-] BO : fixed duplicate code management on cart rules #PSCFV-6119 Damien Metzger 2012-12-14 09:48:16 +01:00
• ec760c6eef // Handle fatal error in modules (after an upgrade for example) Damien Metzger 2012-12-13 19:05:50 +01:00
• be5b678f85 // Handle fatal error in modules (after an upgrade for example) Damien Metzger 2012-12-13 19:05:50 +01:00
• 28a3856bfa //added check on field lenght in install and fix sql in upgrade vAugagneur 2012-12-13 16:26:38 +01:00
• e7e156c261 //added check on field lenght in install and fix sql in upgrade vAugagneur 2012-12-13 16:26:38 +01:00
• 1c27ae15f9 //order opc js fix vAugagneur 2012-12-13 14:55:26 +01:00
• 367a442c08 //order opc js fix vAugagneur 2012-12-13 14:55:26 +01:00
• 6e2ebf1c07 // Cleaned modules call Damien Metzger 2012-12-13 13:35:17 +01:00
• ee19d3d62b // Cleaned modules call Damien Metzger 2012-12-13 13:35:17 +01:00
• b391fc176a // Cleaned modules call Damien Metzger 2012-12-13 13:35:17 +01:00
• 2bf6b3a82e // Cleaned modules call Damien Metzger 2012-12-13 13:35:17 +01:00
• 7fe6b95a38 //rename upgrade file vAugagneur 2012-12-13 10:06:46 +01:00
• 60d2aee83b //rename upgrade file vAugagneur 2012-12-13 10:06:46 +01:00
• cb4f2bd889 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2012-12-13 09:41:32 +01:00
• df06579e02 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2012-12-13 09:41:32 +01:00
• 003c9666c1 [-] FO : small js fix on gift checkbox update on mobile vAugagneur 2012-12-13 09:41:20 +01:00
• 668a7e35e7 [-] FO : small js fix on gift checkbox update on mobile vAugagneur 2012-12-13 09:41:20 +01:00
• 8a8c674a95 // French translations Damien Metzger 2012-12-13 09:31:43 +01:00
• e4d7a331fd // French translations Damien Metzger 2012-12-13 09:31:43 +01:00
• cfa1359c87 [-] FO : small fix on mobile logo url vAugagneur 2012-12-13 09:30:55 +01:00
• c1bbd15fb0 [-] FO : small fix on mobile logo url vAugagneur 2012-12-13 09:30:55 +01:00
• 06a3e4709b [*] BO : moved sample csv file vAugagneur 2012-12-13 09:16:03 +01:00