Commit Graph

7663 Commits

Author SHA1 Message Date
sLorenzini 59e793fa99 //[-] FO: fixed bug #product_list li span.new: IE 6,7,8 bug: New product badge still not correct position - #PSCFV-5921 2012-12-05 10:42:26 +01:00
sLorenzini 9322f3338e // fixed FO bugs 2012-12-04 15:27:43 +01:00
Sarah Lorenzini 936817999c [-] FO: fix CSS / formatting needed on blocks - #PSCFV-3013 2012-12-03 10:25:35 +01:00
vAugagneur 12cb5316ee //remove debug 2012-12-02 20:05:39 +01:00
vAugagneur 2d30a966c3 [*] FO : improve SEO and http error code 2012-12-02 19:46:09 +01:00
Sarah Lorenzini c8ce3749ec [-] FO: fix Add to cart button needs some changes in its css code - #PSCFV-5933 2012-11-30 16:30:34 +01:00
Vincent Augagneur 84763df3de Merge pull request #45 from PrestaEdit/PSCFV-5442
[-] FO : Fixed bug #PSCFV-5442: rss and &amp problem
2012-11-30 02:57:06 -08:00
Vincent Augagneur 539011c057 Merge pull request #55 from PrestaEdit/mobile_logo
[+] FO: Mobile logo
2012-11-30 02:06:19 -08:00
Vincent Augagneur 4276af150e Merge pull request #40 from Milow/development
[-] FO : Fix css errors, clean up javascript
2012-11-30 02:02:42 -08:00
vAugagneur 2668323c6b //updated CONTRIBUTORS.md thanks @all 2012-11-30 10:54:08 +01:00
vAugagneur b8e93d8c44 //small cookie expire fix 2012-11-30 09:35:42 +01:00
PrestaEdit 1286cd3a89 Merge pull request #1 from PrestaEdit/mobile
[-] FO : show mobile theme if you have click "Broswe the mobile site" on...
2012-11-29 13:01:22 -08:00
PrestaEdit 99b97d9bb7 [*] FO: use initLogoAndFavicon() function 2012-11-29 21:57:04 +01:00
PrestaEdit f7b40b24b9 [*] FO: add initLogoAndFavicon() 2012-11-29 21:56:03 +01:00
vAugagneur 7edd3555eb [-] MO : fixed bug #PSCFV-5396 - Notices when ordering categories with layered navigation module 2012-11-29 18:51:22 +01:00
vAugagneur dbda08099a //wrong define unsing _MAIL_DIR_ instead of _PS_MAIL_DIR_ 2012-11-29 18:44:51 +01:00
vAugagneur 639590c535 //remove comment 2012-11-29 18:36:18 +01:00
vAugagneur 24d2e87e8e [-] 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 c8d63a7819 [-] BO : fixed bug #PSCFV-5501 - Can't edit Guest AccountAddress in Custumer -> Addresses 2012-11-29 18:16:56 +01:00
vAugagneur 317938d883 [-] 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 4188bb5f58 [-] 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 b13f3b0344 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 2bddec6089 //small fix in Context::getMobileDevice() 2012-11-29 17:20:18 +01:00
Rémi Gaillard 671b11b84c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-11-29 16:29:03 +01:00
Rémi Gaillard 0e4bf800c6 [-] 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 ee941d2c58 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 ce58891b02 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 edfe048a58 Additional instance and removed inline style since CSS present in global.css 2012-11-29 14:43:38 +00:00
Vincent Augagneur 3b63713cdd 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 12971aa769 Merge pull request #57 from oleacorner/patch-1
[*] PDF : Update /PDFGenerator::render()
2012-11-29 05:46:38 -08:00
Vincent Augagneur 86f720398a 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 25ff95741b Update classes/pdf/PDFGenerator.php 2012-11-29 13:05:05 +01:00
Vincent Augagneur 5f8b5c1527 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 30b8f81e36 //small fix in controllers/front/OrderController.php thanks to @Butterback 2012-11-29 09:07:02 +01:00
vAugagneur 853515ebf0 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-11-28 18:52:17 +01:00
vAugagneur 72464dc9b7 [-] 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 d7ecc8bb99 [-] FO: Bug CSS on SAFARI with iphone or ipad - #PSCFV-5704 2012-11-28 17:01:56 +01:00
vAugagneur b35e0fd519 //remove useless comment 2012-11-28 16:27:21 +01:00
Sarah Lorenzini 813d28bda9 [-] 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 f3cde47048 [-] FO: added border-right on product-comparison table 2012-11-28 15:13:14 +01:00
vAugagneur ce427a91d4 //bad link in CONTRIBUTING.md :p 2012-11-28 14:45:52 +01:00
vAugagneur f07d918867 //bad link in CONTRIBUTING.md 2012-11-28 14:38:19 +01:00
oleacorner 7834f1e274 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 da8fcf7d0e Another instance of cart_quantity_button set as ID 2012-11-28 10:33:25 +00:00
vAugagneur 8d6433f48f [-] 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 56b49e9681 Removed ID from repeating product rows in shopping cart table. 2012-11-28 09:35:23 +00:00
PrestaEdit 36851aaa58 [+] FO: modifiy width and height smarty vars for the mobile logo 2012-11-28 01:31:43 +01:00
PrestaEdit a6389cb7ef [+] BO: modifiy width and height configuration for the mobile logo 2012-11-28 01:26:53 +01:00
PrestaEdit 59035bd99a [+] BO: modifiy smarty var $logo_url to have the mobile logo image if mobile version 2012-11-28 01:23:24 +01:00
PrestaEdit bbdef58492 [+] BO: add updateOptionPsLogoMobile() 2012-11-28 01:19:45 +01:00