Commit Graph
7595 Commits
Author SHA1 Message Date
Damon Skelhorn da8fcf7d0e Another instance of cart_quantity_button set as ID 2012-11-28 10:33:25 +00:00
Damon Skelhorn 56b49e9681 Removed ID from repeating product rows in shopping cart table. 2012-11-28 09:35:23 +00:00
vAugagneur 09ce9b2870 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-11-27 18:39:36 +01:00
vAugagneur 3b28e532fe //added modules/statssales/config.xml 2012-11-27 18:39:32 +01:00
Vincent Augagneur 1d45d66370 Merge pull request #50 from PrestaEdit/PSCFV-5880
[-] CORE : fixed bug #PSCFV-5880: add Cart ID into $cache_id
2012-11-27 09:21:44 -08:00
vAugagneur 4a05ddd0a2 [-] FO : fixed bug #PSCFV-5871 - URL rewrite with layered disabled 2012-11-27 17:07:59 +01:00
Sarah Lorenzini fda993d05d [-] FO: fix Referral Program Email link fix generates duplicate address in the url - #PSCFV-5853
Fixed in all languages
2012-11-27 16:41:52 +01:00
vAugagneur 0993d57862 [-] FO : fixed bug #PSCFV-5865 - Payment modules are not visible in the hookPayment for a foreigner country 2012-11-27 16:33:32 +01:00
Rémi Gaillard 4b87a10bf0 // small fix for merge pull #49 2012-11-27 15:57:01 +01:00
Rémi Gaillard 5e86f1114b Merge pull request #49 from PrestaEdit/PSCFV-5879
[-] FO: Fix PSCFV-5879: If default group of customer don't display tax, do not use them
2012-11-27 06:48:10 -08:00
vAugagneur 6b5452b053 [-] INSTALLER : fixed bug #PSCFV-5721 Duplicate column name 'cover' part 2 2012-11-27 15:31:21 +01:00
vAugagneur 65acf285e3 [-] INSTALLER : fixed bug #PSCFV-5721 Duplicate column name 'cover' 2012-11-27 15:30:37 +01:00
Sarah Lorenzini fc23dae9de [-] FO: fix The "Compare buttons" on the Manufacturers List page is coded incorrectly... - #PSCFV-5636
I also fixed this bug on the supplier list
2012-11-27 15:27:11 +01:00
Sarah Lorenzini d4cff1c94b [-] FO: fix Can't create consumer account if blockcart module is disabled - baseUri not defined - #PSCFV-5667 2012-11-27 15:13:53 +01:00
Sarah Lorenzini dc8d8a23ca [-] FO: bug fixed on infos fields authentification 2012-11-27 15:06:11 +01:00
Vincent Augagneur a25b960fc1 Merge pull request #24 from Caleydon/patch-3
[-] FO : SEO and accessibility improvement in  modules/blockuserinfo/blockuserinfo.tpl
2012-11-27 06:04:09 -08:00
Vincent Augagneur e09c412a65 Merge pull request #25 from Caleydon/patch-4
[*] FO : Added ordered list formating on CMS pages : themes/default/css/cms.css
2012-11-27 06:03:02 -08:00
Rémi Gaillard 37ddd943ed [-] FO: Fix cookie problem when accessing not accessing to the shop with the main url 2012-11-27 14:52:15 +01:00
Vincent Augagneur a7dfa64f3e Merge pull request #22 from Caleydon/patch-1
[-] MO : SEO and accessibility improvement in modules/blockmyaccountfooter/blockmyaccountfooter.tpl
2012-11-27 05:46:22 -08:00
Vincent Augagneur fdb5ba9649 Merge pull request #19 from Caleydon/patch-5
[-] FO : Update themes/default/sitemap.tpl
2012-11-27 05:40:12 -08:00
DamienMetzger ded3b0cd5e [-] BO : improved error display on admincarriers #PSCFV-5660 2012-11-27 12:01:27 +01:00
Francois Gaillard 545e37a57f [-] Classes : Bug fix : Modules, check module instance 2012-11-27 11:58:25 +01:00
Rémi Gaillard 1812937933 [-] BO: Fix product image link for admin orders #PSCFV-5163 2012-11-27 11:55:58 +01:00
Vincent Augagneur 91d53843d9 Merge pull request #51 from PrestaEdit/PSCFV-5872
[-] CORE : fixed bug #PSCFV-5872: Modify is_a() with instanceof
2012-11-27 01:32:07 -08:00
Jonathan Danse 41f7a8678f // add $usetax in block BestSellers 2012-11-27 10:24:46 +01:00
vAugagneur 9e0ad934f8 [-] BO : added Module::getInstanceByName brefore ->loadUpgradeVersionList 2012-11-27 10:10:00 +01:00
Jonathan Danse 53b1475631 // remove test in Product 2012-11-27 10:09:22 +01:00
Jonathan Danse 8e4d5057ae // $module_name is a string, test not good 2012-11-27 09:30:04 +01:00
PrestaEdit 7827d02eaf // Modify is_a() with instanceof 2012-11-26 23:12:17 +01:00
PrestaEdit 76e7fc15ee //add Cart ID into $cache_id 2012-11-26 22:51:37 +01:00
PrestaEdit 74f4942254 // If default group of customer don't display tax, do not use them 2012-11-26 22:42:57 +01:00
Rémi Gaillard a9ccf0a3e3 // small fix 2012-11-26 19:14:06 +01:00
Rémi Gaillard cd4c7b28c3 // small fix some $ was missing :] 2012-11-26 19:12:53 +01:00
Rémi Gaillard 3f90d9edbc // small fix 2012-11-26 17:44:41 +01:00
Gabriel Schwardy 3b265a7922 Update themes/default/sitemap.tpl 2012-11-26 17:14:14 +01:00
Vincent Augagneur 04d982fd48 //clean Tools::clearCache() thanks to @alexsegura 2012-11-26 15:58:03 +01:00
Vincent Augagneur 1e0984d547 Merge pull request #47 from doekia/PSCFV-4181
[-] FO: PSCFV-4181: pruneoff unavailable products
2012-11-26 06:43:40 -08:00
Vincent Augagneur 7dd8950dd3 Merge pull request #48 from doekia/loadUpgradeVersionList
[+] BO: Allow override loadUpgradeVersionList()
2012-11-26 06:38:26 -08:00
Vincent Augagneur 69781ae79b small fix 2012-11-26 15:33:34 +01:00
(d)oekia 2735ff47bc unset should go after usage of by reference value 2012-11-26 15:08:32 +01:00
(d)oekia a11fa5fd14 Merge/simplify statements 2012-11-26 15:03:42 +01:00
(d)oekia 5a54e5b4d6 [+] BO: Allow override loadUpgradeVersionList() 2012-11-26 14:24:52 +01:00
(d)oekia 489fd28012 [-] FO: PSCFV-4181: pruneoff unavailable products 2012-11-26 14:11:35 +01:00
Vincent Augagneur 7b307c737a [-] FO : fixed bug #PSCFV-5293 - product link rewrite bug with category keyword 2012-11-26 12:06:03 +01:00
Francois Gaillard d5fc20435d // .DS_Store files added to .gitignore 2012-11-26 11:20:46 +01:00
Vincent Augagneur c76af96415 [-] BO : fixed bug #PSCFV-5838 Advanced Parameters - E-mail - Custom SMTP does not work if the password contains symbols '<' or '>' 2012-11-26 10:45:32 +01:00
Sarah Lorenzini 7e76e4b2e1 [-] FO: add target="_blank" on the "powered by" link in the footer 2012-11-26 10:12:20 +01:00
vAugagneur 885e44c58d //fixed code error in a pull request 2012-11-26 10:09:27 +01:00
Vincent Augagneur 7b2b33625a Merge pull request #43 from PrestaEdit/PSCFV-5580
[-] CORE : Class OrderHistory: changeIdOrderState() & Order current_state
2012-11-26 00:01:34 -08:00
Vincent Augagneur 634f98a5e5 Merge pull request #44 from PrestaEdit/PSCFV-5569
[-] FO : fixed bug #PSCFV-5569: remove warning if module "blocksuppliers" and "blockmanufacturer" is deleted
2012-11-25 23:57:13 -08:00