dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,668 Commits 9 Branches 19 Tags
769f5e7a64c7a629524f925267e8b8136bf66a4e
Commit Graph
7668 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Gaillard 769f5e7a64 [-] BO: Fix #PSCFV-5345 quotes in translations of languages packs imported 2012-12-03 15:03:32 +01:00
vAugagneur 51d8ef576b //small fix with js on product page 2012-12-03 14:47:38 +01:00
vAugagneur c2f31109e4 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2012-12-03 14:14:54 +01:00
vAugagneur 2195f9bdcb [+] CORE : now you can choose the redirect option when your product is disable 2012-12-03 14:13:50 +01:00
Rémi Gaillard 4a94d54f6d [-] BO: Fix #PSCFV-5332 wrong rights on folder after uploading image 2012-12-03 12:26:27 +01:00
Rémi Gaillard c73be7904a [-] BO: Fix category association in global context #PSCFV-5551 2012-12-03 11:25:59 +01:00
Rémi Gaillard 5b9f6dffc9 [-] FO: js was missing on order follow #PSCFV-5441 2012-12-03 10:44:32 +01:00
Sarah Lorenzini 585d7ddbab [-] FO: fix CSS / formatting needed on blocks - #PSCFV-3013 2012-12-03 10:25:35 +01:00
vAugagneur 0de7579f58 //remove debug 2012-12-02 20:05:39 +01:00
vAugagneur 49e1a536e3 [*] FO : improve SEO and http error code 2012-12-02 19:46:09 +01:00
Sarah Lorenzini 22d92a6d3a [-] 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 bf08de2c3b 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 7c04885560 Merge pull request #55 from PrestaEdit/mobile_logo 
[+] FO: Mobile logo
 2012-11-30 02:06:19 -08:00
Vincent Augagneur 66108a770b Merge pull request #40 from Milow/development 
[-] FO : Fix css errors, clean up javascript
 2012-11-30 02:02:42 -08:00
vAugagneur c6a1e0e585 //updated CONTRIBUTORS.md thanks @all 2012-11-30 10:54:08 +01:00
vAugagneur f1b36279cf //small cookie expire fix 2012-11-30 09:35:42 +01:00
PrestaEdit 68c3f18f16 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 291431fc49 [*] FO: use initLogoAndFavicon() function 2012-11-29 21:57:04 +01:00
PrestaEdit b433db02b1 [*] FO: add initLogoAndFavicon() 2012-11-29 21:56:03 +01:00
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