dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,608 Commits 9 Branches 19 Tags
a07733fcec16f471ec447789631804a0a33b94de
Commit Graph
18608 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
PrestaEdit 291431fc49 [*] FO: use initLogoAndFavicon() function 2012-11-29 21:57:04 +01:00
PrestaEdit 99b97d9bb7 [*] 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
PrestaEdit f7b40b24b9 [*] 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 7edd3555eb [-] 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 dbda08099a //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 639590c535 //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 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 f563e12912 [-] BO : fixed bug #PSCFV-5501 - Can't edit Guest AccountAddress in Custumer -> Addresses 2012-11-29 18:16:56 +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 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
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 deb5adb6f4 [-] FO: Don't display categories in breadcrumb if there are not associated to the shop 2012-11-29 18:01:39 +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 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
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 f6c8af26cc //small fix in Context::getMobileDevice() 2012-11-29 17:20:18 +01:00
vAugagneur 2bddec6089 //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 671b11b84c 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
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 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 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 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
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 37edf2c9b6 Additional instance and removed inline style since CSS present in global.css 2012-11-29 14:43:38 +00: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 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 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 cb4bf6251f Merge pull request #57 from oleacorner/patch-1 
[*] PDF : Update /PDFGenerator::render()
 2012-11-29 05:46:38 -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 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
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 81931f40a0 Update classes/pdf/PDFGenerator.php 2012-11-29 13:05:05 +01:00
oleacorner 25ff95741b 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
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 562c49163e //small fix in controllers/front/OrderController.php thanks to @Butterback 2012-11-29 09:07:02 +01:00
vAugagneur 30b8f81e36 //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 853515ebf0 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
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 eb65e76252 [-] FO: Bug CSS on SAFARI with iphone or ipad - #PSCFV-5704 2012-11-28 17:01:56 +01:00
Sarah Lorenzini d7ecc8bb99 [-] FO: Bug CSS on SAFARI with iphone or ipad - #PSCFV-5704 2012-11-28 17:01:56 +01:00