0a0f313de7
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-05-15 17:12:55 +02:00
68cdfd0dae
// no controllerUri for front office please
2013-05-15 17:11:32 +02:00
963dfe8ca2
// also set query_string and server_name
2013-05-15 16:46:48 +02:00
da8c21d644
// small fix
2013-05-15 16:26:02 +02:00
932d949392
// small fix for id_shop and php-cli
2013-05-15 16:23:29 +02:00
7ca9356f65
[-] BO: Fix listing exports with image or other empty fields
2013-05-15 15:49:42 +02:00
e27ef3e7f2
[-] BO : catch prestashop exception and display smart error messages #PSCFV-9147
2013-05-15 15:39:58 +02:00
57a13efa18
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-05-15 14:51:16 +02:00
a9684804d5
[*] Core: you can now pass a query string with php-cli which will merged with for cronjobs and other things
2013-05-15 14:46:40 +02:00
e793d8e25f
[-] CORE : Fix bug #PSCFI-7072 redundant configuration get
2013-05-15 14:44:33 +02:00
d3a87e845e
// Fixed product rules issue in the cart rules with mod_mysql
2013-05-15 14:14:46 +02:00
5fedb03b30
// refacto for last commit c7aa92f3b3
2013-05-15 11:47:46 +02:00
c7aa92f3b3
[-] BO : Fix "The controller adminnotound is missing or invalid." error when no controller get variable
2013-05-15 11:31:55 +02:00
e54609e3a5
[-] Core: Fix StockManager::getProductRealQuantities() for refunded quantities on non delivered orders
2013-05-14 09:53:33 +02:00
0fc1b7b7a2
$id_shop_list filtering in addAttribute
...
When addAttribute is used with a not-empty $id_shop_list array argument,
the shop IDs are not filtered to be unique, so $combination->add()
fails.
2013-05-13 14:50:24 +02:00
f878e3c721
[-] BO : fixed turkish characters replacement #PSCFV-8968
2013-05-07 14:09:28 +02:00
dc294d24cb
[-] BO : tab cache wasn't emptied on delete #PSCFV-9053
2013-05-06 09:23:07 +02:00
32a11677e7
// small fix
2013-05-02 18:58:05 +02:00
4d4eb9df19
[-] BO: Fix #PSCFV-8179 shop domain used in emails sometimes was for the wrong shop
2013-05-02 18:42:01 +02:00
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
gRoussac