f6c8af26cc
//small fix in Context::getMobileDevice()
2012-11-29 17:20:18 +01:00
2bddec6089
//small fix in Context::getMobileDevice()
2012-11-29 17:20:18 +01:00
0155b69592
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-11-29 16:29:03 +01:00
671b11b84c
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-11-29 16:29:03 +01:00
a1ad0d29e8
[-] Module: Mailalert should not send email to employee if stock management is disabled #PSCFV-5841
2012-11-29 16:28:18 +01:00
0e4bf800c6
[-] Module: Mailalert should not send email to employee if stock management is disabled #PSCFV-5841
2012-11-29 16:28:18 +01:00
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
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
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
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
37edf2c9b6
Additional instance and removed inline style since CSS present in global.css
2012-11-29 14:43:38 +00:00
edfe048a58
Additional instance and removed inline style since CSS present in global.css
2012-11-29 14:43:38 +00:00
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
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
cb4bf6251f
Merge pull request #57 from oleacorner/patch-1
...
[*] PDF : Update /PDFGenerator::render()
2012-11-29 05:46:38 -08:00
12971aa769
Merge pull request #57 from oleacorner/patch-1
...
[*] PDF : Update /PDFGenerator::render()
2012-11-29 05:46:38 -08:00
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
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
81931f40a0
Update classes/pdf/PDFGenerator.php
2012-11-29 13:05:05 +01:00
25ff95741b
Update classes/pdf/PDFGenerator.php
2012-11-29 13:05:05 +01:00
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
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
562c49163e
//small fix in controllers/front/OrderController.php thanks to @Butterback
2012-11-29 09:07:02 +01:00
30b8f81e36
//small fix in controllers/front/OrderController.php thanks to @Butterback
2012-11-29 09:07:02 +01:00
c180b82627
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-11-28 18:52:17 +01:00
853515ebf0
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2012-11-28 18:52:17 +01:00
cff5661690
[-] BO : fixed bug #PSCFV-5743 - modify status Preparation in progress and remove the delivery flag
2012-11-28 18:52:01 +01:00
72464dc9b7
[-] BO : fixed bug #PSCFV-5743 - modify status Preparation in progress and remove the delivery flag
2012-11-28 18:52:01 +01:00
eb65e76252
[-] FO: Bug CSS on SAFARI with iphone or ipad - #PSCFV-5704
2012-11-28 17:01:56 +01:00
d7ecc8bb99
[-] FO: Bug CSS on SAFARI with iphone or ipad - #PSCFV-5704
2012-11-28 17:01:56 +01:00
0b10428124
//remove useless comment
2012-11-28 16:27:21 +01:00
b35e0fd519
//remove useless comment
2012-11-28 16:27:21 +01:00
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
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
bb3ede3aed
[-] FO: added border-right on product-comparison table
2012-11-28 15:13:14 +01:00
f3cde47048
[-] FO: added border-right on product-comparison table
2012-11-28 15:13:14 +01:00
585841909f
//bad link in CONTRIBUTING.md :p
2012-11-28 14:45:52 +01:00
ce427a91d4
//bad link in CONTRIBUTING.md :p
2012-11-28 14:45:52 +01:00
86bbb06360
//bad link in CONTRIBUTING.md
2012-11-28 14:38:19 +01:00
f07d918867
//bad link in CONTRIBUTING.md
2012-11-28 14:38:19 +01:00
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
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
3420085113
Another instance of cart_quantity_button set as ID
2012-11-28 10:33:25 +00:00
da8fcf7d0e
Another instance of cart_quantity_button set as ID
2012-11-28 10:33:25 +00:00
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
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
d8bd1f7ca6
Removed ID from repeating product rows in shopping cart table.
2012-11-28 09:35:23 +00:00
56b49e9681
Removed ID from repeating product rows in shopping cart table.
2012-11-28 09:35:23 +00:00
06ca6d2576
[+] FO: modifiy width and height smarty vars for the mobile logo
2012-11-28 01:31:43 +01:00
36851aaa58
[+] FO: modifiy width and height smarty vars for the mobile logo
2012-11-28 01:31:43 +01:00
vAugagneur