Rémi Gaillard
5cecff7251
// fix php warning
2013-01-14 14:12:14 +01:00
Rémi Gaillard
ef904c9083
[-] BO: Fix #PSCFV-5930 #PSCFV-5939 the filters are handled as the same between tabs which can cause sql errors
2013-01-14 12:08:12 +01:00
Rémi Gaillard
556955a7f0
// small fix for smarty pre-compile
2013-01-14 11:05:42 +01:00
vAugagneur
4dad9522e5
[-] CORE : fixed bug #PSCFV-6555 - Custom theme not working properly with image size
2013-01-14 10:38:41 +01:00
Rémi Gaillard
90b3c7c467
[-] FO: Fix add to cart for product packs with no quantity and out of stock allowed #PSCFV-4788
2013-01-10 11:30:41 +01:00
Rémi Gaillard
1956accc32
// small typo fix
2013-01-09 18:27:42 +01:00
gRoussac
b672b3281e
[-] FO : Do not suggest states that are not active
2013-01-09 17:05:33 +01:00
vAugagneur
f768081aa0
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-01-09 17:00:48 +01:00
vAugagneur
6629542a22
[-] CORE : fixed bug #PSCFV-5433 - Order confirmation email doesn't report customization
2013-01-09 17:00:41 +01:00
gRoussac
425a108aab
[-] FO : Fix #PSCFV-5905 Fatal error: "no default carrier"
2013-01-09 15:55:48 +01:00
Rémi Gaillard
c46521883c
// small perf optimization
2013-01-09 14:35:06 +01:00
Rémi Gaillard
c855621e17
// performances improvement
2013-01-09 14:16:22 +01:00
vAugagneur
108dfb292c
[-] BO : fixed bug #PSCFV-4961 - Strange behavior when reordering categories
2013-01-09 13:44:19 +01:00
Rémi Gaillard
d52c1c4516
// small fix
2013-01-09 10:28:28 +01:00
vAugagneur
9154984c78
[-] CORE : fixed bug #PSCFV-4523 - Static _PS_DEFAULT_CUSTOMER_GROUP_ is still use in code even if deprecated 1.5.0.1
2013-01-09 10:26:16 +01:00
gRoussac
6ecd23a743
[-] FO : fix PSCFV-5934 bad redirection from https to http for CMS
2013-01-08 11:45:41 +01:00
Shagshag
868effab13
[-] Fix: OrderHistory::changeIdOrderState
...
&$id_order break compatibility with existing codes :
1/ it's unnecessary : Objects are passed by references by default
2/ it causes fatal errors:
```PHP
$foo->changeIdOrderState((int)$id_order_state, (int)$id_order);
```
Fatal error: Only variables can be passed by reference
2013-01-08 10:51:42 +01:00
Rémi Gaillard
e1664bbdfb
[*] MO: Add smarty cache on some modules
2013-01-07 17:09:36 +01:00
Rémi Gaillard
fc67af932f
// perf optimization
2013-01-07 14:44:14 +01:00
vAugagneur
b83ab4dc4b
[-] CORE : fixed bug #PSCFV-4754 field name in image_type was too short
2013-01-07 14:08:08 +01:00
Rémi Gaillard
755349ef95
[-] FO: Fix cookie domain detection for com.co tld #PSCFV-5256
2013-01-07 12:01:11 +01:00
Rémi Gaillard
265bff345b
[-] Core: Fix supplier_reference on cart/orders #PSCFV-6082
2013-01-07 11:25:33 +01:00
Vincent Augagneur
b59669a7ae
Merge pull request #137 from PrestaEdit/patch-4
...
[+] Class: Product::getIdByEan13
2013-01-07 01:38:41 -08:00
Vincent Augagneur
4cc890a05b
Merge pull request #147 from raphaelMalie/development
...
[-] CORE : Fix Collection->sqlGroupBy()
2013-01-07 01:18:50 -08:00
Vincent Augagneur
86d00e6103
Merge pull request #152 from Shagshag/patch-4
...
[-] _USER_ID_LANG_ doesn't exist anymore
2013-01-07 01:03:33 -08:00
vAugagneur
7f93fefeae
Merge Pull request 154 - thanks to @prestashop-iran
2013-01-07 09:35:36 +01:00
Shagshag
6516c768d9
_USER_ID_LANG_ doesn't exist anymore
2013-01-04 21:34:02 +01:00
Shagshag
6824518b74
Update classes/cache/CacheMemcache.php
2013-01-04 17:07:36 +01:00
Vincent Augagneur
4192e58888
Merge pull request #150 from djfm/development
...
//Changed English strings using the translationsenglish module.
2013-01-04 08:06:15 -08:00
djfm
714a5e08cc
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
Rémi Gaillard
3b466c54e3
[-] FO: Fix #PSCFV-6493 root and home category id should be different of 1 and 2
2013-01-04 16:04:15 +01:00
Rémi Gaillard
091459bde6
[-] BO: Fix #PSCFV-6120 display of shipping price on BO order summary detail with freeshipping
2013-01-04 14:51:01 +01:00
Raphaël Malié
bdceac5bb2
Fix Collection->sqlGroupBy()
2013-01-04 14:28:49 +01:00
vAugagneur
638bd51980
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-01-04 11:45:25 +01:00
vAugagneur
b725fd2d4a
//small refacto
2013-01-04 11:45:17 +01:00
Francois Gaillard
8baf87eef5
// Welcome 2013
2013-01-04 11:19:03 +01:00
Rémi Gaillard
ed97ed5698
[-] Core: Fix #PSCFV-5912 price computation on cart with multiple product without combinations
2013-01-03 16:44:10 +01:00
Rémi Gaillard
5bb2856692
[-] FO: Fix #PSCFV-6159 order way of best sales
2013-01-03 12:08:29 +01:00
PrestaEdit
2a2190e4c9
[+] Class: Product::getIdByEan13
...
Sometimes, it's can be good to get the Product ID by EAN13.
2013-01-02 17:21:04 +01:00
vAugagneur
f0f50db926
[-] FO : fixed bug #PSCFV-6411 Friendly URL on prices-drop for page 2 doesn't work
2013-01-02 14:40:35 +01:00
PrestaEdit
1c24fe85c1
[-] FO: need id_product_attribute to know quantity
2013-01-02 11:04:57 +01:00
vAugagneur
a4eb2cc7a9
//Merge branch release
2013-01-02 09:56:20 +01:00
Damien Metzger
68dbfcbfb0
Merge pull request #127 from PrestaEdit/Patch-#002
...
[-] Project: Fix bug when you want to upload (and resize) an image
2012-12-31 00:51:37 -08:00
PrestaEdit
80f3012345
[-] Project: Fix bug when you want to upload (and resize) an image
2012-12-30 20:14:51 +01:00
Rémi Gaillard
5e367744b6
[*] Core: Log the exceptions in a file #PSCFV-6334
2012-12-28 16:12:28 +01:00
vAugagneur
a5568e8196
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
2012-12-28 10:23:52 +01:00
vAugagneur
e8920c859d
//added methode to write default content in index.php file && added check in translation pack import
2012-12-28 10:18:14 +01:00
Damien Metzger
7bebdb5eb5
// Fixed deleteDirectory function (is_dir is cached and must not be used, because use the result of scandir)
2012-12-28 09:47:09 +01:00
Damien Metzger
7a8adaec25
[+] BO : you can now choose if a voucher is displayed under the cart in the frontend
2012-12-27 18:04:16 +01:00
Gregory Roussac
dbb8a9f2e0
[-] FO : Fix html entities in order messages and threads
2012-12-27 12:23:10 +01:00
Rémi Gaillard