Commit Graph
8799 Commits
Author SHA1 Message Date
vAugagneur 91a31bf556 [-] MO : fixed bug #PSCFV-5396 - Notices when ordering categories with layered navigation module 2012-11-29 18:51:22 +01:00
vAugagneur ab66251968 //wrong define unsing _MAIL_DIR_ instead of _PS_MAIL_DIR_ 2012-11-29 18:44:51 +01:00
vAugagneur 6f33a9dd54 //remove comment 2012-11-29 18:36:18 +01:00
vAugagneur 035d7b7421 [-] FO : fixed bug #PSCFV-5563 - address can't be changed when making an order as a guest 2012-11-29 18:35:05 +01:00
vAugagneur f563e12912 [-] BO : fixed bug #PSCFV-5501 - Can't edit Guest AccountAddress in Custumer -> Addresses 2012-11-29 18:16:56 +01:00
vAugagneur 65e6264a0a [-] FO : fixed bug #PSCFV-5776 - Converting a guest account via GuestTrackingController allows empty passwords, warns of an invalid password but DOES convert the account 2012-11-29 18:06:34 +01:00
Rémi Gaillard deb5adb6f4 [-] FO: Don't display categories in breadcrumb if there are not associated to the shop 2012-11-29 18:01:39 +01:00
Vincent Augagneur a9bc9481dd Merge pull request #42 from PrestaEdit/PSCFV-5766
[-] FO : fixed bug #PSCFV-5766 - Truncate smarty_modifier_truncate $etc param is not taken
2012-11-29 08:30:57 -08:00
vAugagneur f6c8af26cc //small fix in Context::getMobileDevice() 2012-11-29 17:20:18 +01:00
Rémi Gaillard 0155b69592 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-11-29 16:29:03 +01:00
Rémi Gaillard a1ad0d29e8 [-] Module: Mailalert should not send email to employee if stock management is disabled #PSCFV-5841 2012-11-29 16:28:18 +01:00
Vincent Augagneur 7bcc7dcddc Merge pull request #56 from damonsk/patch2
[-] FO : Removed ID from repeating product rows in shopping cart table.
2012-11-29 07:14:43 -08:00
Vincent Augagneur 5199b81b50 Merge pull request #54 from PrestaEdit/mobile
[-] FO : show mobile theme if you have click "Broswe the mobile site"
2012-11-29 07:13:29 -08:00
Damon Skelhorn 37edf2c9b6 Additional instance and removed inline style since CSS present in global.css 2012-11-29 14:43:38 +00:00
Vincent Augagneur 8dc4dafbd7 Merge pull request #3 from damonsk/development
[-] FO : fixed bug #PSCFV-5637 - Order reference (string) if passed in from a 1.4 theme...
2012-11-29 06:15:56 -08:00
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
Damon Skelhorn 3420085113 Another instance of cart_quantity_button set as ID 2012-11-28 10:33:25 +00: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
Damon Skelhorn d8bd1f7ca6 Removed ID from repeating product rows in shopping cart table. 2012-11-28 09:35:23 +00:00
PrestaEdit 06ca6d2576 [+] FO: modifiy width and height smarty vars for the mobile logo 2012-11-28 01:31:43 +01:00
PrestaEdit 9c51161cfa [+] BO: modifiy width and height configuration for the mobile logo 2012-11-28 01:26:53 +01:00
PrestaEdit d6cf7278cf [+] BO: modifiy smarty var $logo_url to have the mobile logo image if mobile version 2012-11-28 01:23:24 +01:00
PrestaEdit 238475c097 [+] BO: add updateOptionPsLogoMobile() 2012-11-28 01:19:45 +01:00
PrestaEdit 905e6ce611 [+] BO: add posibility to set a Mobile Header logo 2012-11-28 01:10:42 +01:00
PrestaEdit d16cd5a3bf [-] FO : show mobile theme if you have click "Broswe the mobile site" on a PC 2012-11-27 22:55:57 +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