5733 Commits

Author	SHA1	Message	Date
Damien Metzger	2890e439b5	[*] BO : the option for accented URLs is now available in the backend	2013-02-14 09:15:01 +01:00
gRoussac	c7e87eb195	[-] CORE : Fix warning when result from query is not a ressource	2013-02-13 19:53:48 +01:00
Rémi Gaillard	ec7b47ba50	[-] Core: Fix rounding price computation with and without taxes #PSCFV-7796	2013-02-13 17:48:40 +01:00
Rémi Gaillard	e3e38b19e1	[*] BO: you can now export listing of some tabs in CSV	2013-02-13 16:15:37 +01:00
Damien Metzger	7fc33eb01c	[-] Catch JSMin exception and return uncompressed js #PSCFV-7686 #PSCFV-5785	2013-02-13 15:16:17 +01:00
Damien Metzger	ce9da19b49	// mod_filter is required with mod_deflate from apache 2.4	2013-02-13 14:46:34 +01:00
gRoussac	3e9d0dda55	[-] FO : Fix Bug #PSCFV-7339 available date on product page	2013-02-12 16:40:26 +01:00
Rémi Gaillard	ba3f3b88b5	// php notice	2013-02-12 12:06:09 +01:00
Damien Metzger	d007136149	[-] MO : applied unachieved patch on blockbestsellers	2013-02-12 12:03:17 +01:00
Rémi Gaillard	f5cf54ef3b	[*] BO: Add an option to htaccess generator to disable mod_security (some rules reject ajax file upload)	2013-02-12 11:35:10 +01:00
Rémi Gaillard	d6f21bd9f9	// small fix for change position	2013-02-12 10:46:48 +01:00
Rémi Gaillard	61dbe6a2e2	Merge pull request #266 from anat/development ... [+] WS : Add product bundle retrieval from Web services	2013-02-11 08:53:31 -08:00
anat	4990028dc2	[+] WS : Add product bundle retrieval from Web services	2013-02-11 17:51:18 +01:00
Rémi Gaillard	0ec4f02502	[-] FO: don't load medias if error on product page to avoid JS bugs	2013-02-11 17:33:19 +01:00
Rémi Gaillard	cc15bf0243	[-] FO: Fix Cart::getDeliveryOption() cache	2013-02-11 16:59:16 +01:00
Rémi Gaillard	5154585bb2	[-] BO: Fix #PSCFV-7462 bad sql request for ordering by price in adminproducts	2013-02-11 15:54:53 +01:00
gRoussac	ea2a1eb122	[-] CORe : Fix #PSCFV-7314 unregisterHook and unregisterExceptions in module::uninstall	2013-02-11 12:00:54 +01:00
Rémi Gaillard	57d782956d	[-] FO: Fix infinite loop on overriding Module::getPaymentModules and executing hook on it #PSCFV-7760	2013-02-11 11:45:42 +01:00
Michel Courtade	3c00b28107	[-] PDF : Fixed unecessary slash in overriden template path	2013-02-11 10:53:46 +01:00
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
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
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
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
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
Damien Metzger	d30677ef8b	[-] FO : you need to execute CartRule::autoAddToCart() after CartRule::autoRemoveFromCart(), everytime #PSCFV-7674	2013-02-05 18:19:22 +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
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	b9fec8eb0c	// Fix merge bug	2013-02-05 11:02:05 +01:00
vAugagneur	0d9eb664d4	//failed to delete buffer. No buffer to delete in PDF	2013-02-05 10:12:00 +01: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	606b3eedd5	[-] BO : error message on install module	2013-02-05 09:41:34 +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
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	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
Rémi Gaillard	d72ce0d892	[-] BO: get the invoice prefix from the right shop	2013-02-04 15:11:29 +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
Burhan	c9a2f61dae	[-] Fixed a typo for ui.droppable dependencies	2013-02-03 23:49:19 +02: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