gRoussac
c335115f68
// remove console.log
2013-07-04 16:48:56 +02:00
gRoussac
c360e841b3
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-04 16:48:14 +02:00
gRoussac
0bddd17889
// remove console.log
2013-07-04 16:43:17 +02:00
gRoussac
fd14268da3
// remove .gitattributes
2013-07-04 15:23:39 +02:00
Damien Metzger
47d343df90
// Fixed module positions in tabs
2013-07-04 09:33:43 +02:00
Damien Metzger
ae03669541
// Added the possibility to sort the modules in the tabs
2013-07-03 17:50:24 +02:00
Damien Metzger
ec981b7f86
[*] WS : improved performances
2013-07-03 17:03:33 +02:00
Damien Metzger
d2440df8ca
[*] FO : added smarty cache on productscategory
2013-07-03 15:49:32 +02:00
Damien Metzger
f78f3dc3a8
[*] FO : added smarty cache on crossselling module
2013-07-03 15:30:31 +02:00
gRoussac
36e3956267
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-03 15:06:05 +02:00
Damien Metzger
afda9cdd94
// Small fix
2013-07-03 15:05:22 +02:00
gRoussac
ae0299a6eb
[-] FO :Fix bug #PSCFV-9650 could not see delete href in block cart
2013-07-03 15:04:11 +02:00
Sébastien and Francois Gaillard
16e90488c4
[-] MO : Bug fix - PS Cleaner, check if module favoriteproducts is installed.
...
Fix Bug when favoriteproducts is not install.
2013-07-03 14:55:32 +02:00
indesign47
1208e45958
[-] BO : products comments impossible if quantity > 0
...
The pull request https://github.com/PrestaShop/PrestaShop/pull/219 makes the module not working properly in v1.5.4.1.
Indeed, after this change, the OosHook works as expected but now, as the product comments module is attached to the OosHook, comments information is only shown when the product is out of stock!
2013-07-03 14:09:44 +02:00
Francois Gaillard
8d3f330b2d
[-] IN : Fixed bug with database creation
2013-07-03 12:19:34 +02:00
Damien Metzger
5789e6eb51
[*] IN : only display the button to create the database if you can actually create the database
2013-07-03 11:28:55 +02:00
Axome
fe660c097c
[*] BO : Correct the getList() request for quantity and id_product
...
Quantity and Id_product should be fixe as Int, else the Mysql request do something like : quantity LIKE "%0%"
When an admin key-in quantity as 0, he want product with quantity as 0, not as 0 / 10 /20 / 30... ect (The same for id_product)
2013-07-03 11:18:04 +02:00
Damien Metzger
bfa2f33c65
[*] IN : the installer can now attempt to create the database for you
2013-07-03 11:04:34 +02:00
Damien Metzger
92959311d9
[*] Core : Smarty updated from 3.1.13 to 3.1.14 (cache issues fixed)
2013-07-02 18:45:07 +02:00
Damien Metzger
c60c3da6a1
[*] WS : improved web service performances
2013-07-02 17:46:11 +02:00
PrestaEdit
86bdcd99e9
[-] FO: OrderHistory - Unclosed tag
2013-07-02 17:08:49 +02:00
Rémi Gaillard
6b71ec8b09
[-] BO: product supplier price should not be converted on product page #PSCFV-9420
2013-07-02 15:45:12 +02:00
Damien Metzger
854c16997c
[*] FO : improved entity links retrieval (no need to instanciate an object when there is no need... to instanciate un object)
2013-07-02 15:08:56 +02:00
gRoussac
84c88dab65
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-02 14:55:28 +02:00
Francois Gaillard
b8bfdcd3f5
// .gitattributes files added
2013-07-02 14:53:58 +02:00
gRoussac
75942074d2
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-02 14:53:18 +02:00
gRoussac
9dfe65cb17
[-] BO : Fix bug #PSCFV-8666 COD module association no more deleted when restrition on other currency
2013-07-02 14:51:25 +02:00
Damien Metzger
25dc4e25ac
// Code cleaning
2013-07-02 11:48:48 +02:00
Damien Metzger
f204f80c99
// Improved profiling tool
2013-07-02 11:08:24 +02:00
Damien Metzger
d05968823e
// Try to fix warning
2013-07-02 10:46:46 +02:00
Vincent Augagneur
cab425e819
//remove useless css
2013-07-02 08:41:51 +02:00
Vincent Augagneur
0ff23eee9f
//miss to delete some files
2013-07-02 08:02:05 +02:00
gRoussac
312dabbc60
//parse error
2013-07-02 00:30:50 +02:00
gRoussac
6e3a2449e8
[-] INSTALLER : Fix SQL warnings when upgrading
2013-07-01 23:39:00 +02:00
gRoussac
f17b865214
(-] INSTALLER Remove errors during upgrade
2013-07-01 19:23:42 +02:00
gRoussac
508cc0bd1a
[-) CORE : Remove undefined constant in class declaration
2013-07-01 19:17:54 +02:00
gRoussac
41219ad258
[-] INSTALLLER : Remove seesion name based on base_uri
2013-07-01 19:01:49 +02:00
François Gaillard
1da44dbb7a
[-] Mobile : Bug fix - Order address template fixed
2013-07-01 16:52:16 +02:00
Vincent Augagneur
0c2aa996a2
//oups 😋
2013-07-01 16:48:25 +02:00
Vincent Augagneur
24db6b13c5
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-01 16:40:39 +02:00
Vincent Augagneur
a519f4a7cb
//small fix
2013-07-01 16:40:08 +02:00
Rémi Gaillard
c5fc26ed0b
// same for unregister hook
2013-07-01 16:30:53 +02:00
Rémi Gaillard
09359d011f
[-] MO: exec hook on hook registration #PSCFV-8977
2013-07-01 16:12:33 +02:00
gRoussac
0e0d8c58d0
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-07-01 15:42:10 +02:00
gRoussac
725c2221df
[-] INSTALLER : fix bug when updating add_new_tab not defined
2013-07-01 15:41:15 +02:00
Damien Metzger
d656297884
// Removed call to a deprecated file
2013-07-01 14:00:01 +02:00
Damien Metzger
006e8718f2
// Improved label of IETF language tag
2013-07-01 12:35:32 +02:00
Damien Metzger
56aab3c676
// Fixed references to a "conversion rate" that was in fact the "exchange rate"
2013-07-01 12:14:50 +02:00
gRoussac
f824b537cf
[-] BO : Fix bug #PSCFV-8619 update order weight when modifying products
2013-07-01 11:32:09 +02:00
gRoussac
c90e574cb8
// Remove additionnal files from gitignore
2013-07-01 11:28:00 +02:00