Commit Graph

8611 Commits

Author SHA1 Message Date
Rémi Gaillard e3ea401fe0 [*] WS: Add contact entity 2013-03-15 14:36:26 +01:00
gRoussac fe02aceddf [-] FO : remove 404 images in Live Edit 2013-03-15 14:23:12 +01:00
Rémi Gaillard 85b0a24fdb // same on admintabs 2013-03-15 12:11:47 +01:00
Rémi Gaillard 4c0a7ca161 // delete multishop toolbar on adminstatuses 2013-03-15 12:07:53 +01:00
vAugagneur 905eca2fd0 //added _PS_CREATION_DATE_ in rewriteSettingsFile function 2013-03-15 12:04:31 +01:00
vAugagneur 24602d3fd1 //removed moneybookers during install 2013-03-15 12:02:16 +01:00
Rémi Gaillard e1bb55dbba // Clean order_detail_tax table after deleting an order detail #PSCFV-8278 2013-03-15 11:51:19 +01:00
Rémi Gaillard 8244e15408 // Clean Language::checkAndAddLanguage() 2013-03-15 11:14:29 +01:00
gRoussac 96afbb53cf // remove warning in multishop 2013-03-14 17:49:07 +01:00
Francois Gaillard 3599958b5c Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-14 17:01:55 +01:00
Francois Gaillard 70d79c5983 Revert "[-] FO : Bug fix : JS Minifier replaced with Google Closure Compiler"
This reverts commit da77ce1029.
2013-03-14 17:01:16 +01:00
gRoussac 28285efb31 // again remove additional \t 2013-03-14 16:58:28 +01:00
gRoussac 99fc6fb857 // remove additionnal \t 2013-03-14 16:55:06 +01:00
gRoussac 094c12f991 [-] FO : Fix bug #PSCFV-6595, fancybox images for IE and AlphaImageLoader 2013-03-14 16:53:26 +01:00
Francois Gaillard 505d3be5c3 [-] FO : Bug fix : JS Minifier replaced with Google Closure Compiler 2013-03-14 16:37:22 +01:00
Rémi Gaillard 395192f603 Merge pull request #315 from PrestaEdit/followup
[-] MO: followup - fix bug in template vars
2013-03-14 07:52:15 -07:00
Rémi Gaillard 0da58b215c [-] BO: Fix update of delivery address on backoffice orders 2013-03-14 15:25:38 +01:00
Rémi Gaillard 8b4bd8e471 [-] BO: Fix auto-selection of default category when you have choosen one on the listing 2013-03-14 15:04:54 +01:00
Rémi Gaillard c7a4c4d84d // Fix 404 img path on pagenotfoundcontroller 2013-03-14 14:58:44 +01:00
Rémi Gaillard 26f0608071 Merge pull request #299 from samy-r/dev-import-time
Import time improvment
2013-03-14 14:29:20 +01:00
Rémi Gaillard 1c114ad4b9 Merge pull request #316 from ldecoker/patch-4
[*][FO]Missing php_self variable
2013-03-14 14:28:38 +01:00
Rémi Gaillard d8b31d6a4f Merge pull request #317 from Shagshag/patch-2
[-] SQL error in Combination::setAttributes
2013-03-14 14:26:51 +01:00
Rémi Gaillard 3e8e0fe7a4 [-] Core: Fix search indexation when nb languages * nb shops > 50 2013-03-14 14:16:31 +01:00
gRoussac 2bb4c6c08a [-] FO : Do no try to add empty css or js file name 2013-03-14 11:15:49 +01:00
Damien Metzger 1f540553b2 // Added lock to class_index generation 2013-03-14 11:00:23 +01:00
Damien Metzger 2523de9a99 // Update profiling tools 2013-03-14 10:47:18 +01:00
Francois Gaillard 2d88f43206 // Profiler, redirect method declaration fixed 2013-03-14 10:20:12 +01:00
vAugagneur a42c34022f Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-14 09:36:22 +01:00
vAugagneur 2c2a8d552e //fixed multi-shipping bug 2013-03-14 09:36:17 +01:00
gRoussac 76c06ec8c6 [-] FO : Check for cart rules before diplaying shopping cart in OPC 2013-03-13 18:42:40 +01:00
vAugagneur ec757d90c7 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-13 18:21:40 +01:00
vAugagneur 58d08ce1b0 //small js fix 2013-03-13 18:21:21 +01:00
Rémi Gaillard 09f70a0020 [-] FO: Fix separated packages 2013-03-13 18:02:54 +01:00
vAugagneur 324ca85cb8 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-13 16:29:23 +01:00
vAugagneur ee53bc4aea //added russian installer and changed english strings 2013-03-13 16:28:19 +01:00
vAugagneur b52462bd14 Merge translations/fr/errors.php 2013-03-13 16:16:01 +01:00
Rémi Gaillard cb811a4e23 // Fix category export without multishop 2 2013-03-13 15:52:25 +01:00
Rémi Gaillard 0428a16d51 // Fix category export without multishop 2013-03-13 15:49:52 +01:00
gRoussac 22413c0f6c [-] INSTALLER : Update gender for default customer 2013-03-13 15:43:48 +01:00
Francois Gaillard ebbf4feb61 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-13 15:29:21 +01:00
Francois Gaillard 9f2de77e36 [-] FO : Mobile theme updated, templates added/improved 2013-03-13 15:28:42 +01:00
gRoussac 3b091fad98 [-] BO : Avoid warning if img src not defined in controller 2013-03-13 15:27:18 +01:00
gRoussac 7591efd6d6 [-] CORE : Preserve carrier reference integrity in cart rules when updating a carrier 2013-03-13 14:31:26 +01:00
fram 77efe4c04e // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
gRoussac df2e121a60 [-] FO : Avoid flashing of availability_statut 2013-03-12 18:34:24 +01:00
Rémi Gaillard d945d0cf11 // Fix iPod nano fixture specific price 2013-03-12 18:11:20 +01:00
gRoussac 1fed482ca0 [*] TR: Update translations for errors 2013-03-12 16:18:09 +01:00
fram 09afe53452 // added russian installer 2013-03-12 16:05:54 +01:00
Francois Gaillard 1ae3b67288 [-] FO : Bug fix #PSCFV-7915 : Mobile theme issue, default attribute 2013-03-12 16:04:03 +01:00
Damien Metzger 771d68be3d // Installer translations (de/it) 2013-03-12 15:41:54 +01:00