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

• 7bcc1ff651 [-] BO : fixed bug #PSCFV-8285 - module tab listing permission vAugagneur 2013-03-18 14:54:04 +01:00
• 734c5a7c8f [-] BO : fixed bug #PSCFV-8285 - module tab listing permission vAugagneur 2013-03-18 14:54:04 +01:00
• d346307c97 // Small fix Damien Metzger 2013-03-18 11:49:45 +01:00
• e549207b8d // Small fix Damien Metzger 2013-03-18 11:49:45 +01:00
• 83b6c3bbab // Clean code Damien Metzger 2013-03-18 11:08:57 +01:00
• a0f97f5425 // Clean code Damien Metzger 2013-03-18 11:08:57 +01:00
• f483feb53d [-] Core: Fix #PSCFV-8293 bad sql vars name on Order::getShipping() #PSCFV-8293 Rémi Gaillard 2013-03-18 11:05:06 +01:00
• f6674417cb [-] Core: Fix #PSCFV-8293 bad sql vars name on Order::getShipping() #PSCFV-8293 Rémi Gaillard 2013-03-18 11:05:06 +01:00
• bd1cc77cf1 // Version number updated Francois Gaillard 2013-03-18 10:47:50 +01:00
• 016ae80514 // Version number updated François Gaillard 2013-03-18 10:47:50 +01:00
• 47d3085a4a [*]WS: POST and XML ressource PrestaEdit 2013-03-18 01:03:43 +01:00
• 97490b5e7b [*] Mobile : Shopping cart displays gifts Francois Gaillard 2013-03-15 17:24:00 +01:00
• e5e6e8c29c [*] Mobile : Shopping cart displays gifts François Gaillard 2013-03-15 17:24:00 +01:00
• 2dfe1826e9 Merge pull request #325 from DrySs/patch-3 Gregory Roussac 2013-03-15 09:08:30 -07:00
• 4c704c97c4 Merge pull request #325 from DrySs/patch-3 Gregory Roussac 2013-03-15 09:08:30 -07:00
• 9c8fca3a41 Merge pull request #325 from DrySs/patch-3 Gregory Roussac 2013-03-15 09:08:30 -07:00
• f032670f33 Merge pull request #325 from DrySs/patch-3 Gregory Roussac 2013-03-15 09:08:30 -07:00
• a87a31125f [-] BO: fixed member "customer_id" to "id_customer" for address import in AdminImport DrÿSs 2013-03-15 16:51:55 +01:00
• 70bb7de9b5 [-] BO: fixed member "customer_id" to "id_customer" for address import in AdminImport DrÿSs' 2013-03-15 16:51:55 +01:00
• 0f2551f5d6 // Remove unnecessary fsockopen Rémi Gaillard 2013-03-15 16:25:19 +01:00
• 85c77105f6 // Remove unnecessary fsockopen Rémi Gaillard 2013-03-15 16:25:19 +01:00
• f17f9c9bee // Fix product multishop association when the product is created before the shop Rémi Gaillard 2013-03-15 15:23:18 +01:00
• 74533ab801 // Fix product multishop association when the product is created before the shop Rémi Gaillard 2013-03-15 15:23:18 +01:00
• 001cf9a5bd [-] Mobile : Bug fix : Combinations, radio buttons without select Francois Gaillard 2013-03-15 15:00:49 +01:00
• e015d9d25e [-] Mobile : Bug fix : Combinations, radio buttons without select François Gaillard 2013-03-15 15:00:49 +01:00
• ea804bb79d Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release gRoussac 2013-03-15 14:38:07 +01:00
• 71819afa0b Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release gRoussac 2013-03-15 14:38:07 +01:00
• 9aada9f24b [-] BO : Fix live edit link gRoussac 2013-03-15 14:36:59 +01:00
• 182f8cdbaa [-] BO : Fix live edit link gRoussac 2013-03-15 14:36:59 +01:00
• e3ea401fe0 [*] WS: Add contact entity Rémi Gaillard 2013-03-15 14:36:26 +01:00
• 27ef057564 [*] WS: Add contact entity Rémi Gaillard 2013-03-15 14:36:26 +01:00
• fe02aceddf [-] FO : remove 404 images in Live Edit gRoussac 2013-03-15 14:23:12 +01:00
• 4f32fe810e [-] FO : remove 404 images in Live Edit gRoussac 2013-03-15 14:23:12 +01:00
• 85b0a24fdb // same on admintabs Rémi Gaillard 2013-03-15 12:11:47 +01:00
• 0e7ded19c1 // same on admintabs Rémi Gaillard 2013-03-15 12:11:47 +01:00
• 4c0a7ca161 // delete multishop toolbar on adminstatuses Rémi Gaillard 2013-03-15 12:07:53 +01:00
• 868926f24a // delete multishop toolbar on adminstatuses Rémi Gaillard 2013-03-15 12:07:53 +01:00
• 905eca2fd0 //added _PS_CREATION_DATE_ in rewriteSettingsFile function vAugagneur 2013-03-15 12:04:31 +01:00
• f4537c022f //added _PS_CREATION_DATE_ in rewriteSettingsFile function vAugagneur 2013-03-15 12:04:31 +01:00
• 24602d3fd1 //removed moneybookers during install vAugagneur 2013-03-15 12:02:16 +01:00
• 16badbd45d //removed moneybookers during install vAugagneur 2013-03-15 12:02:16 +01:00
• e1bb55dbba // Clean order_detail_tax table after deleting an order detail #PSCFV-8278 Rémi Gaillard 2013-03-15 11:51:19 +01:00
• d4d0661ff8 // Clean order_detail_tax table after deleting an order detail #PSCFV-8278 Rémi Gaillard 2013-03-15 11:51:19 +01:00
• 8244e15408 // Clean Language::checkAndAddLanguage() Rémi Gaillard 2013-03-15 11:14:29 +01:00
• 564aafd10d // Clean Language::checkAndAddLanguage() Rémi Gaillard 2013-03-15 11:14:29 +01:00
• 96afbb53cf // remove warning in multishop gRoussac 2013-03-14 17:49:07 +01:00
• f9feec981a // remove warning in multishop gRoussac 2013-03-14 17:49:07 +01:00
• 82d81ed58c Merge branch 'release' into development Francois Gaillard 2013-03-14 17:02:40 +01:00
• 7dc7de6ba7 Merge branch 'release' into development François Gaillard 2013-03-14 17:02:40 +01:00
• 3599958b5c Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release Francois Gaillard 2013-03-14 17:01:55 +01:00
• 138c225845 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release François Gaillard 2013-03-14 17:01:55 +01:00
• 70d79c5983 Revert "[-] FO : Bug fix : JS Minifier replaced with Google Closure Compiler" Francois Gaillard 2013-03-14 17:01:16 +01:00
• ad7c73348d Revert "[-] FO : Bug fix : JS Minifier replaced with Google Closure Compiler" François Gaillard 2013-03-14 17:01:16 +01:00
• 28285efb31 // again remove additional \t gRoussac 2013-03-14 16:58:28 +01:00
• d3324ef6e8 // again remove additional \t gRoussac 2013-03-14 16:58:28 +01:00
• 99fc6fb857 // remove additionnal \t gRoussac 2013-03-14 16:55:06 +01:00
• 66239416ec // remove additionnal \t gRoussac 2013-03-14 16:55:06 +01:00
• 094c12f991 [-] FO : Fix bug #PSCFV-6595, fancybox images for IE and AlphaImageLoader gRoussac 2013-03-14 16:53:26 +01:00
• df90cab2db [-] FO : Fix bug #PSCFV-6595, fancybox images for IE and AlphaImageLoader gRoussac 2013-03-14 16:53:26 +01:00
• 7f3678a776 Merge branch 'release' into development Francois Gaillard 2013-03-14 16:39:47 +01:00
• e08945de6b Merge branch 'release' into development François Gaillard 2013-03-14 16:39:47 +01:00
• 505d3be5c3 [-] FO : Bug fix : JS Minifier replaced with Google Closure Compiler Francois Gaillard 2013-03-14 16:37:22 +01:00
• da77ce1029 [-] FO : Bug fix : JS Minifier replaced with Google Closure Compiler François Gaillard 2013-03-14 16:37:22 +01:00
• 395192f603 Merge pull request #315 from PrestaEdit/followup Rémi Gaillard 2013-03-14 07:52:15 -07:00
• 83729b3cef Merge pull request #315 from PrestaEdit/followup Rémi Gaillard 2013-03-14 07:52:15 -07:00
• 0da58b215c [-] BO: Fix update of delivery address on backoffice orders Rémi Gaillard 2013-03-14 15:25:38 +01:00
• 987977ecbb [-] BO: Fix update of delivery address on backoffice orders Rémi Gaillard 2013-03-14 15:25:38 +01:00
• 8b4bd8e471 [-] BO: Fix auto-selection of default category when you have choosen one on the listing Rémi Gaillard 2013-03-14 15:04:54 +01:00
• d9bf697625 [-] BO: Fix auto-selection of default category when you have choosen one on the listing Rémi Gaillard 2013-03-14 15:04:54 +01:00
• c7a4c4d84d // Fix 404 img path on pagenotfoundcontroller Rémi Gaillard 2013-03-14 14:58:44 +01:00
• 441c334f09 // Fix 404 img path on pagenotfoundcontroller Rémi Gaillard 2013-03-14 14:58:44 +01:00
• 26f0608071 Merge pull request #299 from samy-r/dev-import-time Rémi GaillardandgRoussac 2013-03-14 05:58:37 -07:00
• 3d8f3f9ca9 Merge pull request #299 from samy-r/dev-import-time Rémi GaillardandgRoussac 2013-03-14 05:58:37 -07:00
• 1c114ad4b9 Merge pull request #316 from ldecoker/patch-4 Rémi GaillardandgRoussac 2013-03-14 05:56:02 -07:00
• 313f2a5392 Merge pull request #316 from ldecoker/patch-4 Rémi GaillardandgRoussac 2013-03-14 05:56:02 -07:00
• d8b31d6a4f Merge pull request #317 from Shagshag/patch-2 Rémi GaillardandgRoussac 2013-03-14 05:55:11 -07:00
• 37e6846aab Merge pull request #317 from Shagshag/patch-2 Rémi GaillardandgRoussac 2013-03-14 05:55:11 -07:00
• 3e8e0fe7a4 [-] Core: Fix search indexation when nb languages * nb shops > 50 Rémi Gaillard 2013-03-14 14:16:31 +01:00
• f620645169 [-] Core: Fix search indexation when nb languages * nb shops > 50 Rémi Gaillard 2013-03-14 14:16:31 +01:00
• 84b5b1ee26 Merge pull request #299 from samy-r/dev-import-time Rémi Gaillard 2013-03-14 05:58:37 -07:00
• 13e9de16e1 Merge pull request #299 from samy-r/dev-import-time Rémi Gaillard 2013-03-14 05:58:37 -07:00
• a774550067 Merge pull request #316 from ldecoker/patch-4 Rémi Gaillard 2013-03-14 05:56:02 -07:00
• b3e699f9a6 Merge pull request #316 from ldecoker/patch-4 Rémi Gaillard 2013-03-14 05:56:02 -07:00
• b7b1b6c3e4 Merge pull request #317 from Shagshag/patch-2 Rémi Gaillard 2013-03-14 05:55:11 -07:00
• 974a7987d0 Merge pull request #317 from Shagshag/patch-2 Rémi Gaillard 2013-03-14 05:55:11 -07:00
• 2bb4c6c08a [-] FO : Do no try to add empty css or js file name gRoussac 2013-03-14 11:15:49 +01:00
• 3ed335e80f [-] FO : Do no try to add empty css or js file name gRoussac 2013-03-14 11:15:49 +01:00
• 1f540553b2 // Added lock to class_index generation Damien Metzger 2013-03-14 11:00:23 +01:00
• 44a0afa34b // Added lock to class_index generation Damien Metzger 2013-03-14 11:00:23 +01:00
• 2523de9a99 // Update profiling tools Damien Metzger 2013-03-14 10:45:37 +01:00
• 7f21c3e62a // Update profiling tools Damien Metzger 2013-03-14 10:45:37 +01:00
• 2d88f43206 // Profiler, redirect method declaration fixed Francois Gaillard 2013-03-14 10:20:12 +01:00
• 890eefce92 // Profiler, redirect method declaration fixed François Gaillard 2013-03-14 10:20:12 +01:00
• a42c34022f Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release vAugagneur 2013-03-14 09:36:22 +01:00
• ac764f0d81 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release vAugagneur 2013-03-14 09:36:22 +01:00
• 2c2a8d552e //fixed multi-shipping bug vAugagneur 2013-03-14 09:36:17 +01:00
• 9efa51e704 //fixed multi-shipping bug vAugagneur 2013-03-14 09:36:17 +01:00
• 76c06ec8c6 [-] FO : Check for cart rules before diplaying shopping cart in OPC gRoussac 2013-03-13 18:42:40 +01:00
• be6ad7855a [-] FO : Check for cart rules before diplaying shopping cart in OPC gRoussac 2013-03-13 18:42:40 +01:00
• ec757d90c7 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release vAugagneur 2013-03-13 18:21:40 +01:00