 François Gaillard
|
b9dde1d50e
|
Merge branch 'development' of http://github.com/PrestaShop/PrestaShop into development
|
2013-01-16 18:47:39 +01:00 |
|
|
François Gaillard
|
338ba1ce85
|
// AdminHomeController, syntax changed
|
2013-01-16 18:47:29 +01:00 |
|
|
vAugagneur
|
94a45b0572
|
[-] BO : fixed bug #PSCFV-5601 - AddressFormat wrongly forbid the 'other' field from the Address to be part of the address format
|
2013-01-16 18:24:11 +01:00 |
|
|
Damien Metzger
|
46cf4e514f
|
[-] FO : fixed reduction display on product page #PSCFV-6308
|
2013-01-16 15:51:58 +01:00 |
|
|
Damien Metzger
|
f66da4a6f8
|
[-] BO : fixed quick access for upgrade from 1.4 #PSCFV-6370
|
2013-01-16 15:51:58 +01:00 |
|
|
vAugagneur
|
aee1eb457e
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-16 15:51:08 +01:00 |
|
|
vAugagneur
|
04c336fa63
|
[-] BO - fixed bug #PSCFV-5549 -
|
2013-01-16 15:50:52 +01:00 |
|
|
Rémi Gaillard
|
d0074ed724
|
[-] Core: Hook actionUpdateQuantity was not called for product without attributes which depends on the physical stock
|
2013-01-16 14:08:33 +01:00 |
|
|
vAugagneur
|
72bf8d0c88
|
[-] BO : fixed bug #PSCFV-6381 - Customer Service mixing groups of shops (Multistore)
|
2013-01-16 12:20:02 +01:00 |
|
|
vAugagneur
|
177cf36fa6
|
//reduced informations block and added click to see more link
|
2013-01-16 11:07:29 +01:00 |
|
|
vAugagneur
|
51a067c34c
|
[-] FO : fixed bug #PSCFV-6533 - CMS categories: This page does not exist.
|
2013-01-16 10:47:00 +01:00 |
|
|
vAugagneur
|
f7124f6cee
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-16 10:36:29 +01:00 |
|
|
vAugagneur
|
46aa9eeca7
|
[-] BO : fixed bug #PSCFV-6623 - fixed Parse error
|
2013-01-16 10:36:24 +01:00 |
|
|
Damien Metzger
|
c30f7b48e0
|
[-] FO : fixed voucher highlighting in the cart #PSCFV-6422
|
2013-01-15 20:08:38 +01:00 |
|
|
Damien Metzger
|
9f9565ebb2
|
[-] FO : fixed +/- Tx on the customer voucher page #PSCFV-6642
|
2013-01-15 20:08:37 +01:00 |
|
|
Damien Metzger
|
83930c1b2e
|
[-] MO : fixed phone number in mailalert #PSCFV-6667
|
2013-01-15 20:08:37 +01:00 |
|
|
Rémi Gaillard
|
e5e62ba00b
|
[-] BO: Fix #PSCFV-6616 id_shop should be loaded from cart when no order is created on Admin Carts
|
2013-01-15 19:31:21 +01:00 |
|
|
Rémi Gaillard
|
a4997405dc
|
// opti
|
2013-01-15 18:56:42 +01:00 |
|
|
Rémi Gaillard
|
02bbfb25d6
|
[-] FO: Fix Pack::getItemTable with some PHP versions
|
2013-01-15 18:53:01 +01:00 |
|
|
Damien Metzger
|
d450a259c4
|
// Fixed typo
|
2013-01-15 18:36:49 +01:00 |
|
|
Damien Metzger
|
36aad94b6a
|
// Fixed potential warning
|
2013-01-15 18:09:56 +01:00 |
|
|
PrestaEdit
|
6fefecbcc4
|
// Welcome 2013
|
2013-01-15 17:52:04 +01:00 |
|
|
PrestaEdit
|
e8d9516a8a
|
[-] Small Fix: change documentation URL
|
2013-01-15 17:48:28 +01:00 |
|
|
vAugagneur
|
71bd641b55
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-15 17:15:37 +01:00 |
|
|
vAugagneur
|
61b3135f6b
|
[-] BO : fixed bug #PSCFV-6623 - multistore edit greek encoding
|
2013-01-15 17:15:30 +01:00 |
|
|
Damien Metzger
|
610bd9d8c5
|
[-] FO : recycled package should be disabled by default (because the option can be deactivated) #PSCFV-6639
|
2013-01-15 15:37:02 +01:00 |
|
|
Damien Metzger
|
7aec6663b9
|
// Removed deprecated file
|
2013-01-15 15:08:07 +01:00 |
|
|
vAugagneur
|
2c0bebef47
|
//revert boulette
|
2013-01-15 15:04:20 +01:00 |
|
|
vAugagneur
|
e3e9651f39
|
//small fix
|
2013-01-15 14:52:57 +01:00 |
|
|
Damien Metzger
|
7e3accbb8a
|
// Translations
|
2013-01-15 14:46:55 +01:00 |
|
|
Damien Metzger
|
c97b8927a8
|
// Translation
|
2013-01-15 14:15:33 +01:00 |
|
|
Damien Metzger
|
9f99ec01b5
|
[-] FO : fixed shipping number in e-mail #PSCFV-6584
|
2013-01-15 13:56:39 +01:00 |
|
|
Damien Metzger
|
e48c0cfc67
|
// Fixed typo
|
2013-01-15 13:54:06 +01:00 |
|
|
Rémi Gaillard
|
915244d1b7
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-15 10:20:50 +01:00 |
|
|
Rémi Gaillard
|
433a446a35
|
// clean the output buffer before print PDF in BO
|
2013-01-15 10:20:37 +01:00 |
|
|
nturato
|
de9e75cc0d
|
[WS] images are only shown as jpg or gif
If you enable BO to also use the PNG file you can not use these images in WS because there are no controls on the image type
|
2013-01-15 10:17:02 +01:00 |
|
|
vAugagneur
|
4af9ddd83f
|
//fixed bug #PSCFV-6645 missing translation
|
2013-01-15 10:01:29 +01:00 |
|
|
vAugagneur
|
8e43f1e38f
|
//recovered View my shop button
|
2013-01-14 17:59:18 +01:00 |
|
|
vAugagneur
|
5f490483d1
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-14 17:44:54 +01:00 |
|
|
vAugagneur
|
cbb87e4bbc
|
//clean duplicate css in BO
|
2013-01-14 17:44:34 +01:00 |
|
|
Damien Metzger
|
4efaad145f
|
[+] BO : Added customer language on the customer page
|
2013-01-14 16:45:21 +01:00 |
|
|
Rémi Gaillard
|
bfffc48b82
|
[-] FO: Fix #PSCFV-6456 price of default attribute with specific price on product comparison
|
2013-01-14 15:16:50 +01:00 |
|
|
vAugagneur
|
451383e4c0
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-14 14:24:14 +01:00 |
|
|
vAugagneur
|
61371b5b4c
|
//BO more compliant with 1024x768
|
2013-01-14 14:24:05 +01:00 |
|
|
Rémi Gaillard
|
c2261cc7fc
|
// fix php warning
|
2013-01-14 14:12:14 +01:00 |
|
|
Rémi Gaillard
|
f496b844db
|
Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development
|
2013-01-14 12:08:26 +01:00 |
|
|
Rémi Gaillard
|
76a12eb369
|
[-] 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 |
|
|
sLorenzini
|
6659bdceca
|
[-] FO: improvement shopping cart voucher
|
2013-01-14 11:25:50 +01:00 |
|
|
Rémi Gaillard
|
f516409fc0
|
// small fix for smarty pre-compile
|
2013-01-14 11:05:42 +01:00 |
|
|
vAugagneur
|
60260c4757
|
[-] CORE : fixed bug #PSCFV-6555 - Custom theme not working properly with image size
|
2013-01-14 10:38:41 +01:00 |
|