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

• ba3a9de6df Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Gregory Roussac 2013-02-20 14:27:05 +01:00
• 30e1ef8cc1 [-] CORE : do not verify ssl certificate when using CURL gRoussac 2013-02-20 14:26:16 +01:00
• 477b0f8b1c [-] CORE : do not verify ssl certificate when using CURL gRoussac 2013-02-20 14:26:16 +01:00
• 755573184c [-] BO: improve payment module page on IE sLorenzini 2013-02-20 11:35:50 +01:00
• 3f22df2cfb [-] BO: improve payment module page on IE sLorenzini 2013-02-20 11:35:50 +01:00
• ae9b78dc0f [-] BO: improve module payment page sLorenzini 2013-02-20 11:08:20 +01:00
• 602c11079d [-] BO: improve module payment page sLorenzini 2013-02-20 11:08:20 +01:00
• 4ce88468df [-] BO: improve payment module page + header sLorenzini 2013-02-20 10:00:18 +01:00
• 110afe7b69 [-] BO: improve payment module page + header sLorenzini 2013-02-20 10:00:18 +01:00
• 3eeca3537a // fix 2 links in admincustomers view Rémi Gaillard 2013-02-19 16:38:52 +01:00
• 702679a3a0 // fix 2 links in admincustomers view Rémi Gaillard 2013-02-19 16:38:52 +01:00
• e152366d49 // small changes Rémi Gaillard 2013-02-19 15:02:09 +01:00
• 7e6728b342 // small changes Rémi Gaillard 2013-02-19 15:02:09 +01:00
• 9b85cb1f76 // delete useless commented code Rémi Gaillard 2013-02-19 14:45:25 +01:00
• 23733e0158 // delete useless commented code Rémi Gaillard 2013-02-19 14:45:25 +01:00
• 51c6e2384f [-] FO: Fix display specific prices for combinations in product page #PSCFV-7807 Rémi Gaillard 2013-02-18 20:30:53 +01:00
• 379381a5aa [-] FO: Fix display specific prices for combinations in product page #PSCFV-7807 Rémi Gaillard 2013-02-18 20:30:53 +01:00
• 6a89fc4b0f [-] CORE : Fix too big query for lastNoneOrderedCart gRoussac 2013-02-18 17:44:09 +01:00
• 3b4978af36 [-] CORE : Fix too big query for lastNoneOrderedCart gRoussac 2013-02-18 17:44:09 +01:00
• 690d880cb7 [-] FO : Fixed regexp for images embbed in description Damien Metzger 2013-02-18 16:15:17 +01:00
• 28e8653e9c [-] FO : Fixed regexp for images embbed in description Damien Metzger 2013-02-18 16:15:17 +01:00
• ad55093abb // Fixed fatal error Damien Metzger 2013-02-18 16:04:27 +01:00
• d811f74d6c // Fixed fatal error Damien Metzger 2013-02-18 16:04:27 +01:00
• 27fced430f // Added information Damien Metzger 2013-02-18 14:46:30 +01:00
• 4479aa7c41 // Added information Damien Metzger 2013-02-18 14:46:30 +01:00
• dd6a93d6f2 [-] BO: Fix #PSCFV-7851 - shop logo and name should depend of the order shop and from the context Rémi Gaillard 2013-02-18 15:43:37 +01:00
• 7c26ea32e7 [-] BO: Fix #PSCFV-7851 - shop logo and name should depend of the order shop and from the context Rémi Gaillard 2013-02-18 15:43:37 +01:00
• 96b86a79f3 [-] BO: Fix #PSCFV-7646 JS error when adding a product existing in an other shop Rémi Gaillard 2013-02-18 15:29:48 +01:00
• 08f5a01bd8 [-] BO: Fix #PSCFV-7646 JS error when adding a product existing in an other shop Rémi Gaillard 2013-02-18 15:29:48 +01:00
• 9b7c16ab9d [-] Core: Change cache key name of objectmodel now using classname against table name #PSCFV-7795 Rémi Gaillard 2013-02-18 10:56:00 +01:00
• 8ab6c87df0 [-] Core: Change cache key name of objectmodel now using classname against table name #PSCFV-7795 Rémi Gaillard 2013-02-18 10:56:00 +01:00
• c3dfe57036 [-] MO: regenerate the class_index after adding a new override Rémi Gaillard 2013-02-15 18:41:06 +01:00
• f593ec5b8a [-] MO: regenerate the class_index after adding a new override Rémi Gaillard 2013-02-15 18:41:06 +01:00
• b23a7fe061 // Delete empty override files - use IO/s for nothing Rémi Gaillard 2013-02-15 18:04:52 +01:00
• 0cd1033527 // Delete empty override files - use IO/s for nothing Rémi Gaillard 2013-02-15 18:04:52 +01:00
• 319ccf4e9e Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-02-15 17:26:06 +01:00
• d46868020f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Rémi Gaillard 2013-02-15 17:26:06 +01:00
• 804f88ec23 [-] BO: Fix #PSCFV-7730 update the multishop fields in adminproducts on default shop if context is all and if product is not associated to all shops Rémi Gaillard 2013-02-15 17:25:53 +01:00
• 4da97fe62e [-] BO: Fix #PSCFV-7730 update the multishop fields in adminproducts on default shop if context is all and if product is not associated to all shops Rémi Gaillard 2013-02-15 17:25:53 +01:00
• 15f8b1a19f //small fix vAugagneur 2013-02-15 17:06:16 +01:00
• 6ade01adaa //small fix vAugagneur 2013-02-15 17:06:16 +01:00
• f6f1cb409a [-] BO: Fix #PSCFV-7734 multiple order delivery number for the same order Rémi Gaillard 2013-02-15 16:24:46 +01:00
• 36c23c54cc [-] BO: Fix #PSCFV-7734 multiple order delivery number for the same order Rémi Gaillard 2013-02-15 16:24:46 +01:00
• 447ab05575 [-] FO : Fix warning #PSCFV-7805 gRoussac 2013-02-15 14:51:47 +01:00
• 1db843334a [-] FO : Fix warning #PSCFV-7805 gRoussac 2013-02-15 14:51:47 +01:00
• 4d4b0141f4 [-] Installer: fix upgrade __PS_BASE_URI__ Rémi Gaillard 2013-02-15 12:25:56 +01:00
• 56d8dcdef0 [-] Installer: fix upgrade __PS_BASE_URI__ Rémi Gaillard 2013-02-15 12:25:56 +01:00
• 2dd6ef4f19 [-] CORE : fixed bug #PSCFV-6545 - ImageManager::resize() error vAugagneur 2013-02-15 12:13:13 +01:00
• 88a8140c59 [-] CORE : fixed bug #PSCFV-6545 - ImageManager::resize() error vAugagneur 2013-02-15 12:13:13 +01:00
• 838a360092 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-02-15 11:33:06 +01:00
• 70f4142fbd Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-02-15 11:33:06 +01:00
• 6a97bdbb7b [-] BO : fixed bug #PSCFV-7551 - wrong breadcrumb when create root category vAugagneur 2013-02-15 11:33:00 +01:00
• 505bea4cef [-] BO : fixed bug #PSCFV-7551 - wrong breadcrumb when create root category vAugagneur 2013-02-15 11:33:00 +01:00
• 1e8fc6957c [-] Installer : Fix warning during upgrade when issues with shops tables gRoussac 2013-02-15 10:09:18 +01:00
• 4f0b5307a4 [-] Installer : Fix warning during upgrade when issues with shops tables gRoussac 2013-02-15 10:09:18 +01:00
• 40177dd4e3 // display image against standard error page for 404 on images Rémi Gaillard 2013-02-14 16:44:50 +01:00
• ee9e0b6380 // display image against standard error page for 404 on images Rémi Gaillard 2013-02-14 16:44:50 +01:00
• 1ce97b8463 [-] FO: Fix categories and products restriction for unidentified customers after upgrade Rémi Gaillard 2013-02-14 16:04:36 +01:00
• 05a64b9d66 [-] FO: Fix categories and products restriction for unidentified customers after upgrade Rémi Gaillard 2013-02-14 16:04:36 +01:00
• d473c04ebe [*] BO: store filter by category in admin products Rémi Gaillard 2013-02-14 14:51:51 +01:00
• f137de9613 [*] BO: store filter by category in admin products Rémi Gaillard 2013-02-14 14:51:51 +01:00
• 749c627b38 // file missing Rémi Gaillard 2013-02-14 11:09:11 +01:00
• 71d6a67de9 // file missing Rémi Gaillard 2013-02-14 11:09:11 +01:00
• 0e31de5b2f [-] FO : deprecated free_shipping var set to "false" Damien Metzger 2013-02-14 10:32:21 +01:00
• f4f6055bc3 [-] FO : deprecated free_shipping var set to "false" Damien Metzger 2013-02-14 10:32:21 +01:00
• f80b7abdfa // Fixed warning and wrong cart rule total Damien Metzger 2013-02-14 09:46:18 +01:00
• 2d0f54e0ee // Fixed warning and wrong cart rule total Damien Metzger 2013-02-14 09:46:18 +01:00
• 2890e439b5 [*] BO : the option for accented URLs is now available in the backend Damien Metzger 2013-02-14 09:14:48 +01:00
• 849c2da9eb [*] BO : the option for accented URLs is now available in the backend Damien Metzger 2013-02-14 09:14:48 +01:00
• c7e87eb195 [-] CORE : Fix warning when result from query is not a ressource gRoussac 2013-02-13 19:53:48 +01:00
• 876b4c09bc [-] CORE : Fix warning when result from query is not a ressource gRoussac 2013-02-13 19:53:48 +01:00
• ec7b47ba50 [-] Core: Fix rounding price computation with and without taxes #PSCFV-7796 Rémi Gaillard 2013-02-13 17:48:40 +01:00
• 7402d7b93d [-] Core: Fix rounding price computation with and without taxes #PSCFV-7796 Rémi Gaillard 2013-02-13 17:48:40 +01:00
• 67c0f98366 // something was missing Rémi Gaillard 2013-02-13 16:17:10 +01:00
• 2c2f4170bb // something was missing Rémi Gaillard 2013-02-13 16:17:10 +01:00
• e3e38b19e1 [*] BO: you can now export listing of some tabs in CSV Rémi Gaillard 2013-02-13 16:15:37 +01:00
• 9dcb75e572 [*] BO: you can now export listing of some tabs in CSV Rémi Gaillard 2013-02-13 16:15:37 +01:00
• cc1ff8ef0f // htmlspecialchars on the sql queries in the profiling mode Damien Metzger 2013-02-13 15:39:22 +01:00
• 725a3f9759 // htmlspecialchars on the sql queries in the profiling mode Damien Metzger 2013-02-13 15:39:22 +01:00
• 7fc33eb01c [-] Catch JSMin exception and return uncompressed js #PSCFV-7686 #PSCFV-5785 Damien Metzger 2013-02-13 15:16:17 +01:00
• dc5526c84c [-] Catch JSMin exception and return uncompressed js #PSCFV-7686 #PSCFV-5785 Damien Metzger 2013-02-13 15:16:17 +01:00
• ce9da19b49 // mod_filter is required with mod_deflate from apache 2.4 Damien Metzger 2013-02-13 14:46:34 +01:00
• 0986c1f594 // mod_filter is required with mod_deflate from apache 2.4 Damien Metzger 2013-02-13 14:46:34 +01:00
• 288021224c // Moved html and js compression from global smarty config to front office smarty config Damien Metzger 2013-02-13 14:38:43 +01:00
• c6331299cb // Moved html and js compression from global smarty config to front office smarty config Damien Metzger 2013-02-13 14:38:43 +01:00
• f9b3174b9c [-] Core: upgrade smarty to 3.1.13 Rémi Gaillard 2013-02-13 14:30:45 +01:00
• ec98e4630f [-] Core: upgrade smarty to 3.1.13 Rémi Gaillard 2013-02-13 14:30:45 +01:00
• 4b4b4b89f2 // small typo fix Rémi Gaillard 2013-02-13 12:04:42 +01:00
• cd5faf8932 // small typo fix Rémi Gaillard 2013-02-13 12:04:42 +01:00
• 8f5f202d60 // small fix Rémi Gaillard 2013-02-13 11:32:02 +01:00
• a994efc0f1 // small fix Rémi Gaillard 2013-02-13 11:32:02 +01:00
• 45fddec936 // List only module categories which contains at least 1 module Rémi Gaillard 2013-02-13 11:26:18 +01:00
• 2671b43dbd // List only module categories which contains at least 1 module Rémi Gaillard 2013-02-13 11:26:18 +01:00
• 981d3e8c97 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Gregory Roussac 2013-02-13 11:04:49 +01:00
• 1fbfa80e43 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development Gregory Roussac 2013-02-13 11:04:49 +01:00
• a0ab0cc444 [-] FO : Fix bug #PSCFV-7467 no email in post data gRoussac 2013-02-13 11:03:59 +01:00
• b82461d6b3 [-] FO : Fix bug #PSCFV-7467 no email in post data gRoussac 2013-02-13 11:03:59 +01:00
• dfb4aedbde Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-02-13 10:47:19 +01:00
• 00b6e9ff20 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development vAugagneur 2013-02-13 10:47:19 +01:00
• 787648f2c7 [*] FO : Fix #PSCFV-7463 No Add to favorite for Chrome gRoussac 2013-02-13 10:44:06 +01:00