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

• fa878720f6 [*] FO : Fix #PSCFV-7463 No Add to favorite for Chrome gRoussac 2013-02-13 10:44:06 +01:00
• 718ae699ac [-] FO : Fix Bug #PSCFV-7439 radio input css gRoussac 2013-02-13 09:58:24 +01:00
• 8effbd8c68 [-] FO : Fix Bug #PSCFV-7439 radio input css gRoussac 2013-02-13 09:58:24 +01:00
• d6f5566e65 [+] BO : added new marketing tab vAugagneur 2013-02-13 09:57:30 +01:00
• fa34534654 [+] BO : added new marketing tab vAugagneur 2013-02-13 09:57:30 +01:00
• aff0c2e965 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-02-13 09:51:24 +01:00
• 43269e594d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-02-13 09:51:24 +01:00
• 8b2868d07b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Gregory Roussac 2013-02-12 16:40:56 +01:00
• 2ee34ebda6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Gregory Roussac 2013-02-12 16:40:56 +01:00
• 3e9d0dda55 [-] FO : Fix Bug #PSCFV-7339 available date on product page gRoussac 2013-02-12 16:40:26 +01:00
• d9fbe89270 [-] FO : Fix Bug #PSCFV-7339 available date on product page gRoussac 2013-02-12 16:40:26 +01:00
• 51e458bccc [-] FO : Fix Bug PSCFI-7016 available date on product page gRoussac 2013-02-12 16:37:44 +01:00
• 5c4613a74a [-] FO : Fix Bug PSCFI-7016 available date on product page gRoussac 2013-02-12 16:37:44 +01:00
• 0ab55781ee //remove modules_list.xml vAugagneur 2013-02-12 14:36:43 +01:00
• cca3f642fd //remove modules_list.xml vAugagneur 2013-02-12 14:36:43 +01:00
• ba3f3b88b5 // php notice Rémi Gaillard 2013-02-12 12:06:09 +01:00
• 6b6e3a5ba1 // php notice Rémi Gaillard 2013-02-12 12:06:09 +01:00
• d007136149 [-] MO : applied unachieved patch on blockbestsellers Damien Metzger 2013-02-12 12:03:17 +01:00
• 6a5565e28b [-] MO : applied unachieved patch on blockbestsellers Damien Metzger 2013-02-12 12:03:17 +01:00
• f5cf54ef3b [*] BO: Add an option to htaccess generator to disable mod_security (some rules reject ajax file upload) Rémi Gaillard 2013-02-12 11:35:10 +01:00
• 887092d292 [*] BO: Add an option to htaccess generator to disable mod_security (some rules reject ajax file upload) Rémi Gaillard 2013-02-12 11:35:10 +01:00
• d6f21bd9f9 // small fix for change position Rémi Gaillard 2013-02-12 10:46:48 +01:00
• 61e691d3a6 // small fix for change position Rémi Gaillard 2013-02-12 10:46:48 +01:00
• 9709339084 // Fix SQL error Rémi Gaillard 2013-02-11 18:45:00 +01:00
• 5e5cbb0d65 // Fix SQL error Rémi Gaillard 2013-02-11 18:45:00 +01:00
• 808fec8f4c // translations dSkrbic 2013-02-11 18:42:50 +01:00
• 8348e28cac [-] FO: Fix PHP warning on update quantity in cart with customizables products Rémi Gaillard 2013-02-11 18:04:23 +01:00
• 1197d9248b [-] FO: Fix PHP warning on update quantity in cart with customizables products Rémi Gaillard 2013-02-11 18:04:23 +01:00
• 61dbe6a2e2 Merge pull request #266 from anat/development Rémi Gaillard 2013-02-11 08:53:31 -08:00
• 372ec5e940 Merge pull request #266 from anat/development Rémi Gaillard 2013-02-11 08:53:31 -08:00
• 4990028dc2 [+] WS : Add product bundle retrieval from Web services anat 2013-02-11 17:51:18 +01:00
• 8400eb53e5 [+] WS : Add product bundle retrieval from Web services anat 2013-02-11 17:51:18 +01:00
• 0ec4f02502 [-] FO: don't load medias if error on product page to avoid JS bugs Rémi Gaillard 2013-02-11 17:33:19 +01:00
• adecde6ee1 [-] FO: don't load medias if error on product page to avoid JS bugs Rémi Gaillard 2013-02-11 17:33:19 +01:00
• cc15bf0243 [-] FO: Fix Cart::getDeliveryOption() cache Rémi Gaillard 2013-02-11 16:59:16 +01:00
• 03842da02d [-] FO: Fix Cart::getDeliveryOption() cache Rémi Gaillard 2013-02-11 16:59:16 +01:00
• d2ce6050d2 [-] MO: Clear blockcategories_footer.tpl cache Rémi Gaillard 2013-02-11 16:30:04 +01:00
• 41069dc231 [-] MO: Clear blockcategories_footer.tpl cache Rémi Gaillard 2013-02-11 16:30:04 +01:00
• 498904d22a Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Gregory Roussac 2013-02-11 16:14:22 +01:00
• 2fe55e3eb0 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Gregory Roussac 2013-02-11 16:14:22 +01:00
• 2c2f67dfa8 [-] FO : Fix bug #PSCFI-6686 when url param has no value set 1 to valuePSCFI-6686 gRoussac 2013-02-11 16:13:46 +01:00
• 0763774707 [-] FO : Fix bug #PSCFI-6686 when url param has no value set 1 to valuePSCFI-6686 gRoussac 2013-02-11 16:13:46 +01:00
• 5154585bb2 [-] BO: Fix #PSCFV-7462 bad sql request for ordering by price in adminproducts Rémi Gaillard 2013-02-11 15:54:53 +01:00
• 7e8d0a27ff [-] BO: Fix #PSCFV-7462 bad sql request for ordering by price in adminproducts Rémi Gaillard 2013-02-11 15:54:53 +01:00
• 3cf99fe042 [-] FO: Fix product restriction by shop Rémi Gaillard 2013-02-11 15:21:54 +01:00
• 9dc31dd415 [-] FO: Fix product restriction by shop Rémi Gaillard 2013-02-11 15:21:54 +01:00
• 387c124a6d [-] FO : Fix bug #PSCFV-7491 special characters in direct search gRoussac 2013-02-11 15:07:43 +01:00
• 069814051d [-] FO : Fix bug #PSCFV-7491 special characters in direct search gRoussac 2013-02-11 15:07:43 +01:00
• cd11ab288e [*] TR : update translations for FR and DE gRoussac 2013-02-11 14:32:19 +01:00
• dfb917ef6d [*] TR : update translations for FR and DE gRoussac 2013-02-11 14:32:19 +01:00
• c5d3c6e293 [-] FO : Fix bug #PSCFV-7562 no availability date in tempalte gRoussac 2013-02-11 14:31:08 +01:00
• e17874cc55 [-] FO : Fix bug #PSCFV-7562 no availability date in tempalte gRoussac 2013-02-11 14:31:08 +01:00
• ea2a1eb122 [-] CORe : Fix #PSCFV-7314 unregisterHook and unregisterExceptions in module::uninstall gRoussac 2013-02-11 12:00:54 +01:00
• 3bd56273ef [-] CORe : Fix #PSCFV-7314 unregisterHook and unregisterExceptions in module::uninstall gRoussac 2013-02-11 12:00:54 +01:00
• c3ad73cd2c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-02-11 11:46:02 +01:00
• c94bf2a823 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-02-11 11:46:02 +01:00
• 57d782956d [-] FO: Fix infinite loop on overriding Module::getPaymentModules and executing hook on it #PSCFV-7760 Rémi Gaillard 2013-02-11 11:45:42 +01:00
• 7ed1a548a2 [-] FO: Fix infinite loop on overriding Module::getPaymentModules and executing hook on it #PSCFV-7760 Rémi Gaillard 2013-02-11 11:45:42 +01:00
• 70be828219 [-] PDF : Fixed unecessary slash in manufacturer image path test nezenmoins 2013-02-11 11:33:06 +01:00
• 64915d390c [-] PDF : Fixed unecessary slash in manufacturer image path test nezenmoins 2013-02-11 11:33:06 +01:00
• 3c00b28107 [-] PDF : Fixed unecessary slash in overriden template path Michel Courtade 2013-02-11 10:53:46 +01:00
• 01de5920c3 [-] PDF : Fixed unecessary slash in overriden template path Michel Courtade 2013-02-11 10:53:46 +01:00
• b1c39da837 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-02-11 10:30:38 +01:00
• becee63434 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-02-11 10:30:38 +01:00
• 57e883d6b2 [-] BO : fixed bug #PSCFV-7575 - BO shipping price by zones ang weigth error js vAugagneur 2013-02-11 10:30:32 +01:00
• 9e342d5183 [-] BO : fixed bug #PSCFV-7575 - BO shipping price by zones ang weigth error js vAugagneur 2013-02-11 10:30:32 +01:00
• 70b4ca535e [-] BO: Fix #PSCFV-7427 group id used for price computation on order edition Rémi Gaillard 2013-02-08 15:02:15 +01:00
• ba11328cec [-] BO: Fix #PSCFV-7427 group id used for price computation on order edition Rémi Gaillard 2013-02-08 15:02:15 +01:00
• 3a5dd223a4 Update modules/blocksupplier/blocksupplier.php ldecoker 2013-02-08 11:37:14 +01:00
• 5eb63feecc Update modules/blocksupplier/blocksupplier.php ldecoker 2013-02-08 11:37:14 +01:00
• 1127dc35b4 // small fix on displayError in Admincountries gRoussac 2013-02-07 18:40:20 +01:00
• c83a0fda3f // small fix on displayError in Admincountries gRoussac 2013-02-07 18:40:20 +01:00
• 26a01f0a41 // Translations Damien Metzger 2013-02-07 18:20:12 +01:00
• 4ab7b7eff4 // Translations Damien Metzger 2013-02-07 18:20:12 +01:00
• 623ba4e7c7 [-] BO: Fix connection with Addons on AdminModules Rémi Gaillard 2013-02-07 18:01:53 +01:00
• 90462ad746 [-] BO: Fix connection with Addons on AdminModules Rémi Gaillard 2013-02-07 18:01:53 +01:00
• ad5b6b875f [-] FO: Fix #PSCFV-7714 quantity discounts displaying in product page for specific customer Rémi Gaillard 2013-02-07 16:57:56 +01:00
• 40a81674ba [-] FO: Fix #PSCFV-7714 quantity discounts displaying in product page for specific customer Rémi Gaillard 2013-02-07 16:57:56 +01:00
• f013fdbc2d // Disallow click to install steps during process Rémi Gaillard 2013-02-07 16:40:19 +01:00
• a6a46e3cce // Disallow click to install steps during process Rémi Gaillard 2013-02-07 16:40:19 +01:00
• cdde16496e [-] FO: Fix #PSCFV-7627 customer group reduction was applied on combinations for unidentified users on the product page Rémi Gaillard 2013-02-07 16:06:32 +01:00
• f6d9771de8 [-] FO: Fix #PSCFV-7627 customer group reduction was applied on combinations for unidentified users on the product page Rémi Gaillard 2013-02-07 16:06:32 +01:00
• 7ad5729b06 // AdminRequestSql::returnBytes is useless Rémi Gaillard 2013-02-07 14:19:08 +01:00
• 5ba95dddc9 // AdminRequestSql::returnBytes is useless Rémi Gaillard 2013-02-07 14:19:08 +01:00
• e46aa10991 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-02-07 10:46:37 +01:00
• 97481cbe84 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-02-07 10:46:37 +01:00
• 6d18f2e7f4 //small fix vAugagneur 2013-02-07 10:46:31 +01:00
• 34870f6c40 //small fix vAugagneur 2013-02-07 10:46:31 +01:00
• 655ab84d07 [-] BO: Forbid to add a pack into a pack Rémi Gaillard 2013-02-06 20:10:59 +01:00
• 76c80680a2 [-] BO: Forbid to add a pack into a pack Rémi Gaillard 2013-02-06 20:10:59 +01:00
• c6c27548f4 [-] CORE : file_put_contents() returns the number of bytes that were written to the file, or FALSE on failure. gRoussac 2013-02-06 19:21:23 +01:00
• 5e98812e19 [-] CORE : file_put_contents() returns the number of bytes that were written to the file, or FALSE on failure. gRoussac 2013-02-06 19:21:23 +01:00
• c1d8f7ee00 [+] CORE : Add .txt extention to CHANGELOG gRoussac 2013-02-06 16:46:01 +01:00
• a7588f5cc0 [+] CORE : Add .txt extention to CHANGELOG gRoussac 2013-02-06 16:46:01 +01:00
• 435519dee7 // use curl against file_get_contents if allow_url_fopen is disabled for contextual help Rémi Gaillard 2013-02-06 16:36:07 +01:00
• ac686b6b48 // use curl against file_get_contents if allow_url_fopen is disabled for contextual help Rémi Gaillard 2013-02-06 16:36:07 +01:00
• d2954b17f6 // something missing in the last commit Rémi Gaillard 2013-02-06 15:48:16 +01:00
• 08d5440c7f // something missing in the last commit Rémi Gaillard 2013-02-06 15:48:16 +01:00
• 022464c578 [*] BO: Improvements on customer services - you are now able to create new threads for synced emails Rémi Gaillard 2013-02-06 15:28:57 +01:00
• fbf48fadf8 [*] BO: Improvements on customer services - you are now able to create new threads for synced emails Rémi Gaillard 2013-02-06 15:28:57 +01:00