dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,650 Commits 9 Branches 19 Tags
b63e5c235ca0684077c5cbc11e2c594fb67aed21
Commit Graph

3303 Commits

Author SHA1 Message Date
Rémi Gaillard b63e5c235c [-] Core: don't compute again price_wt in Product::addCustomizationPrice if already computed 2013-03-21 12:18:43 +01:00
gRoussac 14627d4d75 [-] FO : Fix bug #PSCFV-8028 refactoring customization 2013-03-21 12:02:13 +01:00
Damien Metzger 6fdb4890cd // Made order message checks more flexible #PSCFV-8123 2013-03-19 16:39:02 +01:00
François Gaillard 138c225845 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-14 17:01:55 +01:00
François Gaillard ad7c73348d Revert "[-] FO : Bug fix : JS Minifier replaced with Google Closure Compiler" 
This reverts commit da77ce1029.
 2013-03-14 17:01:16 +01:00
gRoussac d3324ef6e8 // again remove additional \t 2013-03-14 16:58:28 +01:00
gRoussac 66239416ec // remove additionnal \t 2013-03-14 16:55:06 +01:00
gRoussac df90cab2db [-] FO : Fix bug #PSCFV-6595, fancybox images for IE and AlphaImageLoader 2013-03-14 16:53:26 +01:00
François Gaillard da77ce1029 [-] FO : Bug fix : JS Minifier replaced with Google Closure Compiler 2013-03-14 16:37:22 +01:00
Rémi Gaillard 3d8f3f9ca9 Merge pull request #299 from samy-r/dev-import-time 
Import time improvment
 2013-03-14 14:29:20 +01:00
Rémi Gaillard 37e6846aab Merge pull request #317 from Shagshag/patch-2 
[-] SQL error in Combination::setAttributes
 2013-03-14 14:26:51 +01:00
Rémi Gaillard f620645169 [-] Core: Fix search indexation when nb languages * nb shops > 50 2013-03-14 14:16:31 +01:00
gRoussac 3ed335e80f [-] FO : Do no try to add empty css or js file name 2013-03-14 11:15:49 +01:00
Damien Metzger 44a0afa34b // Added lock to class_index generation 2013-03-14 11:00:23 +01:00
gRoussac be6ad7855a [-] FO : Check for cart rules before diplaying shopping cart in OPC 2013-03-13 18:42:40 +01:00
Rémi Gaillard b76b263ab0 [-] FO: Fix separated packages 2013-03-13 18:02:54 +01:00
vAugagneur 149407f72d //added russian installer and changed english strings 2013-03-13 16:28:19 +01:00
François Gaillard 81fbca919e [-] FO : Mobile theme updated, templates added/improved 2013-03-13 15:28:42 +01:00
gRoussac b994136939 [-] CORE : Preserve carrier reference integrity in cart rules when updating a carrier 2013-03-13 14:31:26 +01:00
fram ed947bc123 // changed English strings, especially focusing on colons harmonization 2013-03-12 19:39:30 +01:00
Rémi Gaillard fc6c4067a7 Merge pull request #318 from djfm/release 
// fixed Bulgarian PDF generation
 2013-03-12 02:34:28 -07:00
Rémi Gaillard 024fbfe068 // small installer fix 2013-03-12 10:30:44 +01:00
fram c1cd8c777f // fixed Bulgarian PDF generation 2013-03-12 10:28:35 +01:00
Damien Metzger 63ef3f3e8c // Moved layered rules from top to bottom in order to avoid conflicts 2013-03-12 10:17:10 +01:00
Rémi Gaillard e95afe67b4 [*] Installer: check if sessions path if writable 2013-03-11 18:51:48 +01:00
Rémi Gaillard 6c037a7b11 // oops 2013-03-11 15:06:57 +01:00
Rémi Gaillard 11bc38b1f9 [-] Installer: download the language pack even if this is a native language on installation 2013-03-11 15:03:38 +01:00
Rémi Gaillard 427f12f4a1 // uncomment trigger_error on Tools::throwDeprecated 2013-03-11 14:15:22 +01:00
Damien Metzger a33c6ff54b // This reverts commit 9ebe9e1894. "Changed modules list button" 2013-03-11 14:05:38 +01:00
Rémi Gaillard f60daa5ee5 // PR-313 2013-03-11 10:55:56 +01:00
vAugagneur 0dc5417779 //small fix on Category::cleanPositions() 2013-03-08 17:35:41 +01:00
Damien Metzger 7ec0f0e391 // Fixed modules list icons retrieval 2013-03-08 11:53:25 +01:00
gRoussac c7da54fe0e [-] BO : get default language when context language is empty for translation 2013-03-08 10:02:27 +01:00
gRoussac 4f7864aee9 [-] FO : Fix case for some excluded searched chars 2013-03-07 14:18:28 +01:00
Damien Metzger 8cab8685cd // PrestaShopException is not available in Autoload 2013-03-07 11:35:40 +01:00
Rémi Gaillard c88e95c869 [-] BO: Auto-select the tax rules group most used on product creation 2013-03-06 15:06:11 +01:00
Rémi Gaillard 73b512359d [-] BO: Fix SQL error on click on notification if no new notifications 2013-03-06 12:05:34 +01:00
gRoussac cbab0d38b7 [-] BO : Fix warning on $db_tab_module_list 2013-03-06 10:18:36 +01:00
Damien Metzger e064ea2fd8 [-] FO : the option that disable the tax display in the cart wasn't used anymore, I used it again #PSCFV-8033 2013-03-05 17:55:07 +01:00
Rémi Gaillard a7365de9a8 [-] Core: Fix #PSCFV-8130 getTaxesAverageUsed() for delivery address used 2013-03-05 13:27:09 +01:00
Rémi Gaillard c6b65caff7 [-] FO: Fix links to products_attribute when custom url is defined with the blocklayered 2013-03-05 12:04:06 +01:00
Rémi Gaillard 2dd463d806 [-] Core: Fix #PSCFV-8119 logos/shop_name for orders emails was not depend of the shop 2013-03-05 10:59:04 +01:00
Rémi Gaillard 477ba3438b // delete duplicates conf/error messages on admin 2013-03-04 17:36:25 +01:00
Rémi Gaillard 084474d670 [-] Core: Fix #PSCFV-7813 override of modules email templates not working because of directory separator 2013-03-04 16:43:51 +01:00
Rémi Gaillard 01b977e954 // fix pdf encoding also for vn/pl/ru/el languages 2013-03-04 15:17:23 +01:00
Rémi Gaillard ac8e96dd4f [-] Core: Fix TCPDF encoding for some languages like japan #PSCFV-8096 2013-03-04 14:38:51 +01:00
Rémi Gaillard dc93425e57 [-] Core: Fix Shop::addSqlRestrictionOnLang() for module installation 2013-03-04 14:12:23 +01:00
Rémi Gaillard 389f99308c // small fix 2013-03-04 10:40:36 +01:00
Rémi Gaillard 50aaa0d816 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-04 10:39:28 +01:00
Rémi Gaillard cc4f46095b [-] Core: id_customer was missing in the SpecificPrice::getSpecificPrice() cache key #PSCFV-8086 2013-03-04 10:39:15 +01:00