2051b925a1
//norms
2013-04-29 21:55:30 +02:00
93d5016848
[-] Bo : Admin login loop under Firefox
2013-04-29 21:54:26 +02:00
8996690a65
[-] 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
7f8a33763a
// Fixed image import
2013-04-29 18:07:42 +02:00
3600a31862
[-] BO : fixed image import with allow_url_fopen deactivated #PSCFV-8181
2013-04-29 17:45:45 +02:00
7b1c50b97f
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-29 16:21:51 +02:00
f58c8e7a93
Merged Pull Request #242 - thanks @andskiba
2013-04-29 16:21:33 +02:00
459768d1ac
[-] BO : fixed error message in language form #PSCFV-8890
2013-04-29 10:47:59 +02:00
71b8e7cc33
// small fix
2013-04-26 16:07:32 +02:00
2ac6e52c9f
[-] 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
21aa134774
[-] BO : fixed bug #PSCFV-7411 - Store location problem with some longitude values
2013-04-26 12:19:20 +02:00
a0867d3a92
[-] CORE : fixed PHP Notice: Undefined index: date_expiration on virtual product
2013-04-26 10:15:54 +02:00
23239ef680
[-] 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
8d735b333f
// Release branch merged
2013-04-25 17:00:56 +02:00
a56e4fa62d
// delete char
2013-04-25 14:20:27 +02:00
1d8c2f84c3
[-] FO : do not use dispatcher routes for static files
2013-04-25 11:06:54 +02:00
2b23268bec
[-] BO: Fix htaccess generation for subfolders installation
2013-04-25 11:04:48 +02:00
9a326bd844
// Also update the tax display for unidentified and guest group on localization import
2013-04-24 19:01:10 +02:00
7081e6d0d0
[-] BO : Fix bug for csv export
2013-04-24 17:29:36 +02:00
50d52baa7b
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-24 16:38:31 +02:00
3607c2264f
[-] 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
c7bbf74913
//small fix on Link::getProductLink()
2013-04-23 17:33:15 +02:00
6f96f0ac9a
[-] FO : invoice: do not display taxes table if there is not tax to display
2013-04-23 16:46:11 +02:00
e61bd7c185
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-23 11:39:14 +02:00
c5ed733cfc
[-] CORE : Fix bug #PSCFV-8705 stocks update for when no current state
2013-04-22 12:09:35 +02:00
aead567def
Merged Pull request #355 - thanks to @bibendi
2013-04-22 12:06:19 +02:00
6b8c3d8612
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-22 11:34:02 +02:00
1acd07e063
[-] CORE :Fix #PSCFV-8631 when order directly in payment state does not update stocks
2013-04-22 11:33:13 +02:00
20f8709940
[-] BO: Fix #PSCFV-8872 HelperList::displayWarning() don't exists
2013-04-22 10:50:41 +02:00
c96b4ca248
[-] Core: fix redirection loop for bugged versions of mysql using column name aliases on order by
2013-04-19 15:48:18 +02:00
ce44e9a95c
[-] CORE : fixed bug #PSCFV-8787 - URL Rewriting remove accent
2013-04-19 11:07:59 +02:00
6e1f99f4b2
[-] BO : Fix bug #PSCFV-8843, no closing span in category-filter helper
2013-04-19 10:34:20 +02:00
8251e98323
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-18 18:23:18 +02:00
103513bf28
// performance improve for ObjectModel::displayFieldName #PSCFV-8713
2013-04-18 17:12:05 +02:00
ea0203f43f
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-18 17:02:51 +02:00
75d395c84a
[-] FO - fixed bug #PSCFV-8826 sort now work fine on bestsale controller
2013-04-18 17:02:45 +02:00
2a3789d48b
[-] CORE : Fix bug #PSCFV-8636 again, cart rule with a reduction and free shipping
2013-04-18 16:44:55 +02:00
0a8eddf7d6
[-] BO : Bad gender image when no gender
2013-04-18 14:54:12 +02:00
f7a1fdb9e0
[-] BO: Fix #PSCFV-8827 fixed price of specific price rules should be a float
2013-04-18 14:21:44 +02:00
e7b344adab
// don't try to clear smarty cache if smarty is not defined
2013-04-18 14:06:49 +02:00
c9a53bf491
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-18 12:09:47 +02:00
be250c9ecc
// Revert a93cfbec07
2013-04-18 11:36:55 +02:00
39e3b079dd
[-] FO: Add the protocol content to the cache id of modules #PSCFV-8810
2013-04-17 18:14:58 +02:00
a172632600
// Fix smarty cache after modules translation update
2013-04-17 14:44:20 +02:00
95500d708d
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
6bf1d0c036
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-04-17 10:02:37 +02:00
9f9562f92b
Merge Pull request #98 - Thanks to @phproberto
2013-04-17 10:02:32 +02:00
27212bd126
[-] CORE : Fix bug last part #PSCFV-8636, cart rule with a reduction and free shipping
2013-04-16 18:56:00 +02:00
dc529264e0
Merge pull request #366 from kluevandrew/patch-2
...
[FIX] Bug in Controller class
2013-04-16 06:13:48 -07:00
0f98ff12e1
[-] FO : empty cache getContextualValue_ when updating cart quantity
2013-04-16 15:00:24 +02:00
Gregory Roussac