gRoussac
d7f4a578a8
[-] FO : fix PSCFV-5934 bad redirection from https to http for CMS
2013-01-08 11:45:41 +01:00
Shagshag
abdafca46b
[-] 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
cd89916a20
[*] MO: Add smarty cache on some modules
2013-01-07 17:09:36 +01:00
Rémi Gaillard
963af9ca30
// perf optimization
2013-01-07 14:44:14 +01:00
vAugagneur
a0a5aa929d
[-] CORE : fixed bug #PSCFV-4754 field name in image_type was too short
2013-01-07 14:08:08 +01:00
Rémi Gaillard
ef331654f2
[-] FO: Fix cookie domain detection for com.co tld #PSCFV-5256
2013-01-07 12:01:11 +01:00
Rémi Gaillard
c0b1f0e793
[-] Core: Fix supplier_reference on cart/orders #PSCFV-6082
2013-01-07 11:25:33 +01:00
Vincent Augagneur
eb3fca6abc
Merge pull request #137 from PrestaEdit/patch-4
...
[+] Class: Product::getIdByEan13
2013-01-07 01:38:41 -08:00
Vincent Augagneur
88154e55a4
Merge pull request #147 from raphaelMalie/development
...
[-] CORE : Fix Collection->sqlGroupBy()
2013-01-07 01:18:50 -08:00
Vincent Augagneur
6dfd94677a
Merge pull request #152 from Shagshag/patch-4
...
[-] _USER_ID_LANG_ doesn't exist anymore
2013-01-07 01:03:33 -08:00
vAugagneur
a54df8e36a
Merge Pull request 154 - thanks to @prestashop-iran
2013-01-07 09:35:36 +01:00
Shagshag
910c23e5ba
_USER_ID_LANG_ doesn't exist anymore
2013-01-04 21:34:02 +01:00
Shagshag
692b47c8fe
Update classes/cache/CacheMemcache.php
2013-01-04 17:07:36 +01:00
Vincent Augagneur
1f9a3109b9
Merge pull request #150 from djfm/development
...
//Changed English strings using the translationsenglish module.
2013-01-04 08:06:15 -08:00
djfm
385c593129
//Changed English strings using the translationsenglish module.
2013-01-04 16:58:58 +01:00
Rémi Gaillard
9c5f416f5e
[-] 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
3fbd7dc55c
[-] 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é
4696c57390
Fix Collection->sqlGroupBy()
2013-01-04 14:28:49 +01:00
vAugagneur
20fa64b05b
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
2013-01-04 11:45:25 +01:00
vAugagneur
6a07626114
//small refacto
2013-01-04 11:45:17 +01:00
François Gaillard
064ba453e6
// Welcome 2013
2013-01-04 11:19:03 +01:00
Rémi Gaillard
6c1c3402bc
[-] Core: Fix #PSCFV-5912 price computation on cart with multiple product without combinations
2013-01-03 16:44:10 +01:00
Rémi Gaillard
b10b53028f
[-] FO: Fix #PSCFV-6159 order way of best sales
2013-01-03 12:08:29 +01:00
PrestaEdit
62703ee39b
[+] 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
b9e688a4bf
[-] 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
b3479877bc
[-] FO: need id_product_attribute to know quantity
2013-01-02 11:04:57 +01:00
vAugagneur
2e90e12293
//Merge branch release
2013-01-02 09:56:20 +01:00
Damien Metzger
6a67264325
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
353fa14078
[-] Project: Fix bug when you want to upload (and resize) an image
2012-12-30 20:14:51 +01:00
Rémi Gaillard
a788394a4a
[*] Core: Log the exceptions in a file #PSCFV-6334
2012-12-28 16:12:28 +01:00
vAugagneur
d10bf0620a
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
2012-12-28 10:23:52 +01:00
vAugagneur
aae9aa82c4
//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
1dde9b6f2a
// 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
c4d8bff01c
[+] 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
3e9e765a5a
[-] FO : Fix html entities in order messages and threads
2012-12-27 12:23:10 +01:00
Damien Metzger
4836fe224a
[-] BO : fixed error display for bad queries #PSCFI-6913
2012-12-24 10:32:41 +01:00
Rémi Gaillard
41ca79cc77
[-] Core: the gift wrapping taxes is now handled by tax rules group
2012-12-21 18:01:43 +01:00
Damien Metzger
0e961a9ed1
[-] Fo : fixed warning in empty categories
2012-12-21 10:55:56 +01:00
Damien Metzger
9b3965425e
[-] FO : changed behavior of the cart rules when the carrier and the address are not determined yet
2012-12-20 17:13:11 +01:00
Damien Metzger
0312d520e6
[-] FO : fixed wrong variable
2012-12-20 17:07:20 +01:00
Damien Metzger
fb4777d536
[-] BO : fixed warnings on the anti-XSS page
2012-12-20 16:04:01 +01:00
vAugagneur
6ff4fe73d7
//small fix
2012-12-20 15:49:45 +01:00
Rémi Gaillard
2a14176055
[*] Core: conversion_rate of currencies are now multishop
2012-12-20 11:35:20 +01:00
Rémi Gaillard
49c3a3ab29
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
2012-12-18 16:00:12 +01:00
vAugagneur
13425aff53
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
2012-12-18 16:00:20 +01:00
vAugagneur
a91fafe05a
[-] CORE : fixed bug #PSCFV-5116 Horizontal top menu cache
2012-12-18 16:00:10 +01:00
Rémi Gaillard
ee4534a548
// small change
2012-12-18 15:59:57 +01:00
Rémi Gaillard
26d95d1ea4
[-] Core: The emails can now be sent with amazon SES when logo is in png
2012-12-18 15:45:43 +01:00
vAugagneur
17350c6149
[-] CORE : fixed bug #PSCFV-4754 Image sizes are the same for all shops and themes
2012-12-18 14:59:34 +01:00
Damien Metzger
c138e2dc5b
[-] BO : fixed weight and distance units validation
2012-12-18 14:40:58 +01:00
gRoussac