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

8262 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Damien Metzger 2bf3df1c7d [-] Core : Fixed a lot of issue with free shipping vouchers #PSCFV-7325 2013-02-04 16:00:46 +01:00
Damien Metzger a6a0dee0ca // Voucher cleaning 2013-02-04 16:00:45 +01:00
Damien Metzger 49ecd42395 // Voucher cleaning 2013-02-04 16:00:45 +01:00
Damien Metzger e9a7474bbe [-] FO : fixed voucher display in the customer view #PSCFV-7332 2013-02-04 16:00:45 +01:00
Damien Metzger 50794f89db [-] MO : statsforecast fixed #PSCFV-7399 2013-02-04 16:00:45 +01:00
Rémi Gaillard d72ce0d892 [-] BO: get the invoice prefix from the right shop 2013-02-04 15:11:29 +01:00
Rémi Gaillard a07d1b06fe // Fix PHP Notice 2013-02-04 14:46:55 +01:00
Rémi Gaillard 8fd63e0f6e // PHP_SELF is only index.php 2013-02-04 14:22:59 +01:00
Damien Metzger 9c3f58b6a2 [-] FO : Fixed voucher value when it exceeds the product total #PSCFV-7421 2013-02-04 11:53:07 +01:00
Damien Metzger 197778c91a [-] FO : fixed customer discounts #PSCFV-7479 2013-02-04 11:53:06 +01:00
Damien Metzger 01454bc3b7 [-] FO : fixed retro compatibility issue with discounts #PSCFV-7553 2013-02-04 11:53:06 +01:00
Burhan c9a2f61dae [-] Fixed a typo for ui.droppable dependencies 2013-02-03 23:49:19 +02:00
Damien Metzger aed9c5dac2 Merge pull request #188 from PrestaEdit/patch-11 
[*] BO : use the employee lang
 2013-02-01 10:43:57 -08:00
Damien Metzger b6bb0637d6 Merge pull request #151 from Shagshag/patch-2 
[-] Core : Wrong parameters for Memcache::addServer
 2013-02-01 10:04:33 -08:00
Damien Metzger 067e055858 Merge pull request #164 from Shagshag/patch-7 
[-] BO : OrderHistory::changeIdOrderState
 2013-02-01 10:00:10 -08:00
Damien Metzger 46cd704209 // Fixed label in install 2013-02-01 18:47:25 +01:00
Rémi Gaillard 8507cab98d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-02-01 18:36:48 +01:00
Rémi Gaillard 418a3ba10d [-] Installer: check create table privileges 2013-02-01 18:36:35 +01:00
Damien Metzger 717f42f878 Merge pull request #218 from samy-r/development 
Disable search indexation
 2013-02-01 09:32:57 -08:00
Damien Metzger e0d51c6392 Merge pull request #234 from bloodywing/development 
[-] BO : Fixes Syntax Error in Line 126 in AdminSearchConfController.php
 2013-02-01 09:32:06 -08:00
Damien Metzger fd74aa2798 [-] Core : cart rule cache cleared on update 2013-02-01 18:30:32 +01:00
Damien Metzger bbe9909772 // Changed number of languages 2013-02-01 17:48:24 +01:00