dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,610 Commits 9 Branches 19 Tags
cb4bf6251fe85fd3d4862df141b6c774b0c2f25b
Commit Graph
7610 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Augagneur cb4bf6251f Merge pull request #57 from oleacorner/patch-1 
[*] PDF : Update /PDFGenerator::render()
 2012-11-29 05:46:38 -08:00
Vincent Augagneur 1127bbbfcb Merge pull request #15 from axome/shipping_cost_admin 
//6 decimals for shipping cost in admin tab
 2012-11-29 05:40:56 -08:00
oleacorner 81931f40a0 Update classes/pdf/PDFGenerator.php 2012-11-29 13:05:05 +01:00
Vincent Augagneur 0c0e3ab9ce Merge pull request #41 from jessylenne/patch-1 
[-] CORE : lang.php inclusion path correction in classes/Mail.php
 2012-11-29 03:08:24 -08:00
vAugagneur 562c49163e //small fix in controllers/front/OrderController.php thanks to @Butterback 2012-11-29 09:07:02 +01:00
vAugagneur c180b82627 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-11-28 18:52:17 +01:00
vAugagneur cff5661690 [-] BO : fixed bug #PSCFV-5743 - modify status Preparation in progress and remove the delivery flag 2012-11-28 18:52:01 +01:00
Sarah Lorenzini eb65e76252 [-] FO: Bug CSS on SAFARI with iphone or ipad - #PSCFV-5704 2012-11-28 17:01:56 +01:00
vAugagneur 0b10428124 //remove useless comment 2012-11-28 16:27:21 +01:00
Sarah Lorenzini f9fb4b7f8d [-] FO: fix #product_list li span.new: IE 6,7,8 bug: New product badge not correct position - #PSCFV-5898 2012-11-28 16:07:36 +01:00
Sarah Lorenzini bb3ede3aed [-] FO: added border-right on product-comparison table 2012-11-28 15:13:14 +01:00
vAugagneur 585841909f //bad link in CONTRIBUTING.md :p 2012-11-28 14:45:52 +01:00
vAugagneur 86bbb06360 //bad link in CONTRIBUTING.md 2012-11-28 14:38:19 +01:00
oleacorner 6d0d0bab1f Update classes/pdf/PDFGenerator.php 
Proposal to enhance the $display parameter.

The proposal supports the true/false value, but also the 'D', 'I' and 'S' of fpdf.

The behavior of the true value is changed to 'D' instead of 'I'.
So, in fornt or back office, while cliking on a button to retrieve a PDF, the download windows is proposed instead of displaying the PDF inside the navigator.
 2012-11-28 13:55:08 +01:00
vAugagneur 358c0c168f [-] BO : fixed bug #PSCFV-5610 Credit slip reference is too short 
[*] BO : added prefix on credit slip reference
 2012-11-28 10:56:43 +01:00
vAugagneur 01eef37db5 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-11-27 18:39:36 +01:00
vAugagneur e555e679eb //added modules/statssales/config.xml 2012-11-27 18:39:32 +01:00
Vincent Augagneur eb80e9fcf5 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 21fd4d5eaa [-] FO : fixed bug #PSCFV-5871 - URL rewrite with layered disabled 2012-11-27 17:07:59 +01:00
Sarah Lorenzini 8cb08f5d84 [-] 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 23862593f1 [-] 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 a7d67fcd48 // small fix for merge pull #49 2012-11-27 15:57:01 +01:00
Rémi Gaillard d55fb35690 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 b123955b26 [-] INSTALLER : fixed bug #PSCFV-5721 Duplicate column name 'cover' part 2 2012-11-27 15:31:21 +01:00
vAugagneur 6d3d2bec77 [-] INSTALLER : fixed bug #PSCFV-5721 Duplicate column name 'cover' 2012-11-27 15:30:37 +01:00
Sarah Lorenzini 6e640dfe9b [-] 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 13af2c610b [-] 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 9114223d4b [-] FO: bug fixed on infos fields authentification 2012-11-27 15:06:11 +01:00
Vincent Augagneur c88b4c3d3c 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 5f36ec30af 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 93038e45f8 [-] 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 728424bd63 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 0d8cc1ace2 Merge pull request #19 from Caleydon/patch-5 
[-] FO : Update themes/default/sitemap.tpl
 2012-11-27 05:40:12 -08:00
DamienMetzger e40d8616f8 [-] BO : improved error display on admincarriers #PSCFV-5660 2012-11-27 12:01:27 +01:00
François Gaillard 7ae88931f0 [-] Classes : Bug fix : Modules, check module instance 2012-11-27 11:58:25 +01:00
Rémi Gaillard 4e75a1c406 [-] BO: Fix product image link for admin orders #PSCFV-5163 2012-11-27 11:55:58 +01:00
Vincent Augagneur b874e0a990 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 a934567dfc // add $usetax in block BestSellers 2012-11-27 10:24:46 +01:00
vAugagneur 2567034288 [-] BO : added Module::getInstanceByName brefore ->loadUpgradeVersionList 2012-11-27 10:10:00 +01:00
Jonathan Danse 9e3643411e // remove test in Product 2012-11-27 10:09:22 +01:00
Jonathan Danse 45cafd3a23 // $module_name is a string, test not good 2012-11-27 09:30:04 +01:00
PrestaEdit 6d73004b70 // Modify is_a() with instanceof 2012-11-26 23:12:17 +01:00
PrestaEdit 9dd5989103 //add Cart ID into $cache_id 2012-11-26 22:51:37 +01:00
PrestaEdit 2340f3d3b3 // If default group of customer don't display tax, do not use them 2012-11-26 22:42:57 +01:00
Rémi Gaillard 06177fea69 // small fix 2012-11-26 19:14:06 +01:00
Rémi Gaillard 809595becf // small fix some $ was missing :] 2012-11-26 19:12:53 +01:00
Rémi Gaillard 7e0a1b28c4 // small fix 2012-11-26 17:44:41 +01:00
Gabriel Schwardy e9f7743015 Update themes/default/sitemap.tpl 2012-11-26 17:14:14 +01:00
Vincent Augagneur e46622e245 //clean Tools::clearCache() thanks to @alexsegura 2012-11-26 15:58:03 +01:00
Vincent Augagneur 755c2532bd Merge pull request #47 from doekia/PSCFV-4181 
[-] FO: PSCFV-4181: pruneoff unavailable products
 2012-11-26 06:43:40 -08:00