 Rémi Gaillard
|
be71bed3d8
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2012-12-11 18:05:02 +01:00 |
|
|
Rémi Gaillard
|
98d9575c4c
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2012-12-11 18:05:02 +01:00 |
|
|
Rémi Gaillard
|
a825982242
|
[-] MO: Mailalert should send alert for new order independently of the stock management
|
2012-12-11 18:04:33 +01:00 |
|
|
Rémi Gaillard
|
4061c67c5b
|
[-] MO: Mailalert should send alert for new order independently of the stock management
|
2012-12-11 18:04:33 +01:00 |
|
|
vAugagneur
|
58fe982f34
|
[-] FO : fixed bug #PSCFV-6057 - In step 4 by pressing terms and conditions, do not load css in Internet Explorer 8
|
2012-12-11 17:53:58 +01:00 |
|
|
vAugagneur
|
a2f7ef0136
|
[-] FO : fixed bug #PSCFV-6057 - In step 4 by pressing terms and conditions, do not load css in Internet Explorer 8
|
2012-12-11 17:53:58 +01:00 |
|
|
Rémi Gaillard
|
82a230aa70
|
[-] Core: Fix #PSCFV-5997 - Product::priceCalculation not return the price of default combination
|
2012-12-11 17:45:06 +01:00 |
|
|
Rémi Gaillard
|
b3b5f7a1e9
|
[-] Core: Fix #PSCFV-5997 - Product::priceCalculation not return the price of default combination
|
2012-12-11 17:45:06 +01:00 |
|
|
sLorenzini
|
0727da6aeb
|
[-] FO: CLONE - order_conf still not fixed propertly #2 - #PSCFV-5817
|
2012-12-11 17:43:30 +01:00 |
|
|
sLorenzini
|
05a6f856da
|
[-] FO: CLONE - order_conf still not fixed propertly #2 - #PSCFV-5817
|
2012-12-11 17:43:30 +01:00 |
|
|
Rémi Gaillard
|
c9cb49d5a1
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2012-12-11 16:59:56 +01:00 |
|
|
Rémi Gaillard
|
bf1b491e94
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2012-12-11 16:59:56 +01:00 |
|
|
vAugagneur
|
fab1c02443
|
[-] CORE : fixed bug #PSCFV-6084
|
2012-12-11 16:59:35 +01:00 |
|
|
vAugagneur
|
ec05f5e384
|
[-] CORE : fixed bug #PSCFV-6084
|
2012-12-11 16:59:35 +01:00 |
|
|
Rémi Gaillard
|
4c026fe0fc
|
[-] BO: don't display stock available if stock management is disabled #PSCFV-6029
|
2012-12-11 16:59:26 +01:00 |
|
|
Rémi Gaillard
|
8d2f5d6e42
|
[-] BO: don't display stock available if stock management is disabled #PSCFV-6029
|
2012-12-11 16:59:26 +01:00 |
|
|
Rémi Gaillard
|
5891143e5b
|
[-] BO: Improve memory usage in admin product in global context with a lot of shops and attributes
|
2012-12-11 16:05:29 +01:00 |
|
|
Rémi Gaillard
|
ef4b3576fc
|
[-] BO: Improve memory usage in admin product in global context with a lot of shops and attributes
|
2012-12-11 16:05:29 +01:00 |
|
|
vAugagneur
|
a4e48ccc7d
|
[-] CORE : fixed bug #PSCFV-6098 Double @ in customer email address crashes BO
|
2012-12-11 15:44:32 +01:00 |
|
|
vAugagneur
|
5698e05f63
|
[-] CORE : fixed bug #PSCFV-6098 Double @ in customer email address crashes BO
|
2012-12-11 15:44:32 +01:00 |
|
|
Damien Metzger
|
2c06839185
|
// Fixed stripos !== false in module search
|
2012-12-11 15:36:51 +01:00 |
|
|
Damien Metzger
|
575983a52e
|
// Fixed stripos !== false in module search
|
2012-12-11 15:36:51 +01:00 |
|
|
Damien Metzger
|
8e8c1bee81
|
[-] FO : jquery mobile was not compatible with js minifier, I updated both
|
2012-12-11 14:01:40 +01:00 |
|
|
Damien Metzger
|
e6ad7ec815
|
[-] FO : jquery mobile was not compatible with js minifier, I updated both
|
2012-12-11 14:01:40 +01:00 |
|
|
Rémi Gaillard
|
a5e3bc711b
|
// replace bad attribute name
|
2012-12-11 12:11:47 +01:00 |
|
|
Rémi Gaillard
|
a0041364a1
|
// replace bad attribute name
|
2012-12-11 12:11:47 +01:00 |
|
|
Rémi Gaillard
|
7cd629b15b
|
[-] BO: Fix root category should anyway be imported in shop creation #PSCFV-5885
|
2012-12-11 12:01:04 +01:00 |
|
|
Rémi Gaillard
|
e8718ec42f
|
[-] BO: Fix root category should anyway be imported in shop creation #PSCFV-5885
|
2012-12-11 12:01:04 +01:00 |
|
|
Rémi Gaillard
|
b2f01058a8
|
[-] BO: Fix various bugs in categories ntree generation
|
2012-12-11 11:19:21 +01:00 |
|
|
Damien Metzger
|
ecac947c2e
|
// config.xml in english
|
2012-12-11 11:19:40 +01:00 |
|
|
Rémi Gaillard
|
a8096c2800
|
[-] BO: Fix various bugs in categories ntree generation
|
2012-12-11 11:19:21 +01:00 |
|
|
Damien Metzger
|
7eb764e596
|
// config.xml in english
|
2012-12-11 11:19:40 +01:00 |
|
|
Damien Metzger
|
27eaed42bd
|
[-] MO : fixed backslashes in homeslider #PSCFV-5664
|
2012-12-11 11:16:56 +01:00 |
|
|
Damien Metzger
|
b7d4321e5a
|
[-] MO : fixed backslashes in homeslider #PSCFV-5664
|
2012-12-11 11:16:56 +01:00 |
|
|
Rémi Gaillard
|
68236c6a6d
|
// Only js strings need to add slashes
|
2012-12-10 16:05:38 +01:00 |
|
|
Rémi Gaillard
|
4c31212fa5
|
// Only js strings need to add slashes
|
2012-12-10 16:05:38 +01:00 |
|
|
Rémi Gaillard
|
50761112a1
|
[-] Core: send email when payment is remotly accepted #PSCFV-6064
|
2012-12-10 15:57:59 +01:00 |
|
|
Rémi Gaillard
|
131f99eb69
|
[-] Core: send email when payment is remotly accepted #PSCFV-6064
|
2012-12-10 15:57:59 +01:00 |
|
|
sLorenzini
|
e5143b1ee4
|
[-] FO: fix The French order_return_state HTML mail template has the wrong colours - #PSCFV-6005
|
2012-12-10 15:17:23 +01:00 |
|
|
sLorenzini
|
ae2c41286f
|
[-] FO: fix The French order_return_state HTML mail template has the wrong colours - #PSCFV-6005
|
2012-12-10 15:17:23 +01:00 |
|
|
Rémi Gaillard
|
27ae42b086
|
[-] Core: Fix Swift and TCPDF for hosting which disallow getmypid() php function
|
2012-12-10 15:06:03 +01:00 |
|
|
Rémi Gaillard
|
a68e5c1cfb
|
[-] Core: Fix Swift and TCPDF for hosting which disallow getmypid() php function
|
2012-12-10 15:06:03 +01:00 |
|
|
vAugagneur
|
83318055ce
|
//added more check on module upload part 2
|
2012-12-10 14:45:14 +01:00 |
|
|
vAugagneur
|
1db4c7875e
|
//added more check on module upload part 2
|
2012-12-10 14:45:14 +01:00 |
|
|
vAugagneur
|
337437be74
|
//added more check on module upload
|
2012-12-10 14:44:11 +01:00 |
|
|
vAugagneur
|
401b3dd41d
|
//added more check on module upload
|
2012-12-10 14:44:11 +01:00 |
|
|
Rémi Gaillard
|
29b4adb032
|
[-] Core: Fix search indexation when id_product is forced #PSCFV-6039
|
2012-12-10 13:52:09 +01:00 |
|
|
Rémi Gaillard
|
8b817a4a8c
|
[-] Core: Fix search indexation when id_product is forced #PSCFV-6039
|
2012-12-10 13:52:09 +01:00 |
|
|
sLorenzini
|
05d5ab2df3
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2012-12-10 11:43:51 +01:00 |
|
|
sLorenzini
|
fb93b5376b
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2012-12-10 11:43:51 +01:00 |
|