46f7922a8f
// id_product_attribute is not necessary in the cache name of Product::getPriceStatic for cart_quantity
2013-04-30 12:33:52 +02:00
d618c8618a
//norms
2013-04-29 21:55:30 +02:00
a8698d9e59
[-] Bo : Admin login loop under Firefox
2013-04-29 21:54:26 +02:00
9fc4bce500
[-] Core: Fix specific prices if they are configured to count quantity per product and not per combination
2013-04-29 18:49:42 +02:00
d00ccdf306
// Fixed image import
2013-04-29 18:07:42 +02:00
989b19d94a
[-] BO : fixed image import with allow_url_fopen deactivated #PSCFV-8181
2013-04-29 17:45:45 +02:00
716b79b8c6
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-29 16:21:51 +02:00
acccaf5fbc
Merged Pull Request #242 - thanks @andskiba
2013-04-29 16:21:33 +02:00
903b17979c
[-] BO : fixed error message in language form #PSCFV-8890
2013-04-29 10:47:59 +02:00
9ec979cd29
// small fix
2013-04-26 16:07:32 +02:00
fd88ac76be
[-] Fixes a race condition
...
Fixes a race condition leading to file coruption and PHP crashes when
writing the cache index file.
Handles concurrency properly by using a temporary file and an atomic
rename() instead of file_put_contents(), which is not atomic, on a
file which is potentially accessed by many processes at the same time
2013-04-26 14:28:01 +02:00
231614290a
[-] BO : fixed bug #PSCFV-7411 - Store location problem with some longitude values
2013-04-26 12:19:20 +02:00
48ee7b417d
[-] CORE : fixed PHP Notice: Undefined index: date_expiration on virtual product
2013-04-26 10:15:54 +02:00
1dabfcef6a
[-] BO : Fix bug #PSCFI-7141, wrong quantity and sales number in Product Sales, thankx to @Tuan Tran
2013-04-25 18:02:33 +02:00
6106066ef1
// Release branch merged
2013-04-25 17:00:56 +02:00
eb7cf3dbbb
// delete char
2013-04-25 14:20:27 +02:00
35d3d1d6c5
[-] FO : do not use dispatcher routes for static files
2013-04-25 11:06:54 +02:00
e827d3355d
[-] BO: Fix htaccess generation for subfolders installation
2013-04-25 11:04:48 +02:00
5a3c2aa5cf
// Also update the tax display for unidentified and guest group on localization import
2013-04-24 19:01:10 +02:00
1975755d8a
[-] BO : Fix bug for csv export
2013-04-24 17:29:36 +02:00
b5047051cd
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-24 16:38:31 +02:00
05fd9aeaae
[-] BO - fixed bug #PSCFV-8802 - #PNM-960 - #PNM-944 url rewrite bug when generate front url from back
2013-04-23 17:41:29 +02:00
cc18fd1de6
//small fix on Link::getProductLink()
2013-04-23 17:33:15 +02:00
318a136553
[-] FO : invoice: do not display taxes table if there is not tax to display
2013-04-23 16:46:11 +02:00
f1e34c20b8
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-23 11:39:14 +02:00
4bf41c590b
[-] CORE : Fix bug #PSCFV-8705 stocks update for when no current state
2013-04-22 12:09:35 +02:00
31e7c6a08e
Merged Pull request #355 - thanks to @bibendi
2013-04-22 12:06:19 +02:00
fd46c87786
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-22 11:34:02 +02:00
34a2c0191c
[-] CORE :Fix #PSCFV-8631 when order directly in payment state does not update stocks
2013-04-22 11:33:13 +02:00
7c4a188ae8
[-] BO: Fix #PSCFV-8872 HelperList::displayWarning() don't exists
2013-04-22 10:50:41 +02:00
16906d8590
[-] Core: fix redirection loop for bugged versions of mysql using column name aliases on order by
2013-04-19 15:48:18 +02:00
da4c87d9ba
[-] CORE : fixed bug #PSCFV-8787 - URL Rewriting remove accent
2013-04-19 11:07:59 +02:00
f93c7ec8c7
[-] BO : Fix bug #PSCFV-8843, no closing span in category-filter helper
2013-04-19 10:34:20 +02:00
b6d9c89b99
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-18 18:23:18 +02:00
38bdd421f7
// performance improve for ObjectModel::displayFieldName #PSCFV-8713
2013-04-18 17:12:05 +02:00
803447b88d
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-18 17:02:51 +02:00
828ffb74ad
[-] FO - fixed bug #PSCFV-8826 sort now work fine on bestsale controller
2013-04-18 17:02:45 +02:00
e22fe455b3
[-] CORE : Fix bug #PSCFV-8636 again, cart rule with a reduction and free shipping
2013-04-18 16:44:55 +02:00
ccfa343b0d
[-] BO : Bad gender image when no gender
2013-04-18 14:54:12 +02:00
158ab771b6
[-] BO: Fix #PSCFV-8827 fixed price of specific price rules should be a float
2013-04-18 14:21:44 +02:00
5edfd03068
// don't try to clear smarty cache if smarty is not defined
2013-04-18 14:06:49 +02:00
768eb473e4
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-18 12:09:47 +02:00
f0c5407aa6
// Revert a93cfbec07
2013-04-18 11:36:55 +02:00
5ba3fda95f
[-] FO: Add the protocol content to the cache id of modules #PSCFV-8810
2013-04-17 18:14:58 +02:00
f83b91ae51
// Fix smarty cache after modules translation update
2013-04-17 14:44:20 +02:00
34f2ff36a3
Merge pull request #179 from nturato/patch-1
...
[-] WS: images are only shown as jpg or gif
2013-04-17 01:56:57 -07:00
de0ef82f74
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-17 10:02:37 +02:00
de887cc078
Merge Pull request #98 - Thanks to @phproberto
2013-04-17 10:02:32 +02:00
701d9e50af
[-] CORE : Fix bug last part #PSCFV-8636, cart rule with a reduction and free shipping
2013-04-16 18:56:00 +02:00
1a795cfe4a
Merge pull request #366 from kluevandrew/patch-2
...
[FIX] Bug in Controller class
2013-04-16 06:13:48 -07:00
Rémi Gaillard