dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,284 Commits 9 Branches 19 Tags
cdde16496e731eaf8564f185769879eca4536c3e
Commit Graph

8284 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Gaillard cdde16496e [-] FO: Fix #PSCFV-7627 customer group reduction was applied on combinations for unidentified users on the product page 2013-02-07 16:06:32 +01:00
Rémi Gaillard 7ad5729b06 // AdminRequestSql::returnBytes is useless 2013-02-07 14:19:08 +01:00
vAugagneur e46aa10991 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-07 10:46:37 +01:00
vAugagneur 6d18f2e7f4 //small fix 2013-02-07 10:46:31 +01:00
Rémi Gaillard 655ab84d07 [-] BO: Forbid to add a pack into a pack 2013-02-06 20:10:59 +01:00
gRoussac c6c27548f4 [-] CORE : file_put_contents() returns the number of bytes that were written to the file, or FALSE on failure. 2013-02-06 19:21:23 +01:00
gRoussac c1d8f7ee00 [+] CORE : Add .txt extention to CHANGELOG 2013-02-06 16:46:01 +01:00
Rémi Gaillard 435519dee7 // use curl against file_get_contents if allow_url_fopen is disabled for contextual help 2013-02-06 16:36:07 +01:00
Rémi Gaillard d2954b17f6 // something missing in the last commit 2013-02-06 15:48:16 +01:00
Rémi Gaillard 022464c578 [*] BO: Improvements on customer services - you are now able to create new threads for synced emails 2013-02-06 15:28:57 +01:00
Damien Metzger 4eef24de19 // Changed default phone number 2013-02-06 14:13:50 +01:00
Rémi Gaillard 588276cfb1 [-] FO: Fix fatal error when a customer is deleted and still logged 2013-02-06 11:56:23 +01:00
Damien Metzger 7b7b964f6a Merge pull request #253 from Prestaworks/patch-7 
[-] BO : no error message when deleting a manufacturer without address
 2013-02-06 01:14:43 -08:00
Daniel 09f5879851 Update classes/Manufacturer.php 
Fixed issue with not being able to remove manufacturers if they where missing an address. (Possible after an upgrade)
 2013-02-06 11:35:15 +08:00
Rémi Gaillard 9a231ac737 [-] MO: Display real price instead of Free for product which are not gifts on blockcart #PSCFV-6423 2013-02-05 18:25:40 +01:00
Rémi Gaillard 11d4b76c8e Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-05 18:22:58 +01:00
Damien Metzger d30677ef8b [-] FO : you need to execute CartRule::autoAddToCart() after CartRule::autoRemoveFromCart(), everytime #PSCFV-7674 2013-02-05 18:19:22 +01:00
Damien Metzger 15badf72e0 // Fixed conversion commar/dot for floating value in CSV import 2013-02-05 18:09:32 +01:00
Damien Metzger 2704d5e836 // Cannot import in a shop that does not exists 2013-02-05 18:09:32 +01:00
Rémi Gaillard 9c816410c0 [-] BO: Forbid to delete the defaults return statuses 2013-02-05 17:04:17 +01:00
Rémi Gaillard 801b73055e [-] BO: Fix error message for new language creation and iso code not exists 2013-02-05 16:33:29 +01:00
Gregory Roussac 4518c8132d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-05 16:13:59 +01:00
sLorenzini 7013babeda [-] FO: fixed bug rendering Problems in IE6 with default theme - #PSCFV-7628 2013-02-05 15:53:54 +01:00
vAugagneur ec7ca41c3e //fix small css bug 2013-02-05 15:44:02 +01:00
Rémi Gaillard 66f82b119c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-05 15:28:28 +01:00
Rémi Gaillard c80e0f48be [-] BO: Don't display delete icon for order carts 2013-02-05 15:28:09 +01:00
Damien Metzger 49d310fe49 [*] Core : added automatic conversion of ',' into '.' for floating values 2013-02-05 15:02:41 +01:00
gRoussac 5156081b0d [-] TR : Fix #PSCFI-6818 increase input vars in french 2013-02-05 14:18:34 +01:00
vAugagneur df860f1f47 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-05 14:16:58 +01:00
vAugagneur b73ca29b58 //added getWidthSize and getHeightSize method in tpl thanks to @PrestaEdit 2013-02-05 14:16:47 +01:00
Rémi Gaillard 64d7655c6e [-] BO: Not allow to give an existing email when editing an employee 2013-02-05 12:20:46 +01:00
gRoussac d336c05164 [-] CORE : Set default customer group to old default group when upgrading from 1.4.X 2013-02-05 11:53:44 +01:00
Rémi Gaillard a28d23211a [-] BO: Fix #PSCFV-6497 display of list when deleting customers 2013-02-05 11:27:17 +01:00
Rémi Gaillard b9fec8eb0c // Fix merge bug 2013-02-05 11:02:05 +01:00
vAugagneur 4c87ee0fb0 [-] TR : now you can use " or ' in tpl files 2013-02-05 10:59:29 +01:00
Vincent Augagneur 57eaeb5efd Merge pull request #103 from damonsk/patch4 
[*] MO : crossselling - moved javascript include into header hook.
 2013-02-05 01:42:46 -08:00
vAugagneur 973c8d8d4f [-] CORE : order state preparation now generate delivery slip 2013-02-05 10:15:53 +01:00
vAugagneur 0d9eb664d4 //failed to delete buffer. No buffer to delete in PDF 2013-02-05 10:12:00 +01:00
Vincent Augagneur 2aa0f3e93c Merge pull request #129 from PrestaEdit/Forum-#213412 
[-] BO: don't have the delivery PDF - User can define which statuses sho...
 2013-02-05 00:59:48 -08:00
Vincent Augagneur 288c3e1323 Merge pull request #134 from PrestaEdit/patch-2 
[-] FO: need id_product_attribute to know quantity
 2013-02-05 00:52:50 -08:00
vAugagneur e1213badf8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 
Conflicts:
	controllers/admin/AdminLogsController.php
 2013-02-05 09:44:13 +01:00
vAugagneur 606b3eedd5 [-] BO : error message on install module 2013-02-05 09:41:34 +01:00
Vincent Augagneur 63da844138 Merge pull request #210 from PrestaEdit/patch-15 
[*] BO: we don't need to clik on a line
 2013-02-05 00:36:54 -08:00
Rémi Gaillard 35e5912def [-] Core: Fix #PSCFV-6067 stock was not reserved sometimes because of time 2013-02-04 19:54:14 +01:00
vAugagneur d0d3180509 Merge branch 'dispatch_modules' into development 2013-02-04 18:20:24 +01:00
vAugagneur 947397c69b [+] BO : new display of payment modules in payment tab 2013-02-04 18:18:50 +01:00
Damien Metzger 168ccb2687 Merge pull request #243 from burhanbvk/patch-3 
[-] FO : Fixed a typo for ui.droppable dependencies
 2013-02-04 09:14:20 -08:00
Damien Metzger 3e5cb72f0f // small fix (installer) 2013-02-04 16:20:22 +01:00
Rémi Gaillard 0caea77c36 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-04 16:05:17 +01:00
Rémi Gaillard 44d26d5804 [-] BO: Fix id_shop for configuration variables in global context for orders 2013-02-04 16:05:01 +01:00