 Francois Gaillard
|
2d88f43206
|
// Profiler, redirect method declaration fixed
|
2013-03-14 10:20:12 +01:00 |
|
|
vAugagneur
|
a42c34022f
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2013-03-14 09:36:22 +01:00 |
|
|
vAugagneur
|
2c2a8d552e
|
//fixed multi-shipping bug
|
2013-03-14 09:36:17 +01:00 |
|
|
gRoussac
|
76c06ec8c6
|
[-] FO : Check for cart rules before diplaying shopping cart in OPC
|
2013-03-13 18:42:40 +01:00 |
|
|
vAugagneur
|
ec757d90c7
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2013-03-13 18:21:40 +01:00 |
|
|
vAugagneur
|
58d08ce1b0
|
//small js fix
|
2013-03-13 18:21:21 +01:00 |
|
|
Rémi Gaillard
|
09f70a0020
|
[-] FO: Fix separated packages
|
2013-03-13 18:02:54 +01:00 |
|
|
vAugagneur
|
324ca85cb8
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2013-03-13 16:29:23 +01:00 |
|
|
vAugagneur
|
ee53bc4aea
|
//added russian installer and changed english strings
|
2013-03-13 16:28:19 +01:00 |
|
|
vAugagneur
|
b52462bd14
|
Merge translations/fr/errors.php
|
2013-03-13 16:16:01 +01:00 |
|
|
Rémi Gaillard
|
cb811a4e23
|
// Fix category export without multishop 2
|
2013-03-13 15:52:25 +01:00 |
|
|
Rémi Gaillard
|
0428a16d51
|
// Fix category export without multishop
|
2013-03-13 15:49:52 +01:00 |
|
|
gRoussac
|
22413c0f6c
|
[-] INSTALLER : Update gender for default customer
|
2013-03-13 15:43:48 +01:00 |
|
|
Francois Gaillard
|
ebbf4feb61
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2013-03-13 15:29:21 +01:00 |
|
|
Francois Gaillard
|
9f2de77e36
|
[-] FO : Mobile theme updated, templates added/improved
|
2013-03-13 15:28:42 +01:00 |
|
|
gRoussac
|
3b091fad98
|
[-] BO : Avoid warning if img src not defined in controller
|
2013-03-13 15:27:18 +01:00 |
|
|
gRoussac
|
7591efd6d6
|
[-] CORE : Preserve carrier reference integrity in cart rules when updating a carrier
|
2013-03-13 14:31:26 +01:00 |
|
|
fram
|
77efe4c04e
|
// changed English strings, especially focusing on colons harmonization
|
2013-03-12 19:39:30 +01:00 |
|
|
gRoussac
|
df2e121a60
|
[-] FO : Avoid flashing of availability_statut
|
2013-03-12 18:34:24 +01:00 |
|
|
Rémi Gaillard
|
d945d0cf11
|
// Fix iPod nano fixture specific price
|
2013-03-12 18:11:20 +01:00 |
|
|
gRoussac
|
1fed482ca0
|
[*] TR: Update translations for errors
|
2013-03-12 16:18:09 +01:00 |
|
|
fram
|
09afe53452
|
// added russian installer
|
2013-03-12 16:05:54 +01:00 |
|
|
Francois Gaillard
|
1ae3b67288
|
[-] FO : Bug fix #PSCFV-7915 : Mobile theme issue, default attribute
|
2013-03-12 16:04:03 +01:00 |
|
|
Damien Metzger
|
771d68be3d
|
// Installer translations (de/it)
|
2013-03-12 15:41:54 +01:00 |
|
|
gRoussac
|
0749a6f29d
|
// wrong commit for ed09cee7b1
|
2013-03-12 14:48:28 +01:00 |
|
|
gRoussac
|
7d095f92c4
|
[*] BO : Set warning when trying to activate Xcache misconfigured
|
2013-03-12 14:41:07 +01:00 |
|
|
Francois Gaillard
|
a0d25c399c
|
[-] FO : Fixed mobile theme authentication CSS
|
2013-03-12 14:16:52 +01:00 |
|
|
Rémi Gaillard
|
32e9c7ff4f
|
// check fields before change products statuse
|
2013-03-12 12:28:40 +01:00 |
|
|
Damien Metzger
|
5907d4b8d7
|
// Added hook call in adminperformance
|
2013-03-12 12:19:22 +01:00 |
|
|
gRoussac
|
a83d8d0cd8
|
[*] BO : file_put_contents returns length when success not true
|
2013-03-12 12:09:47 +01:00 |
|
|
Rémi Gaillard
|
fd23b5e862
|
// typo fix
|
2013-03-12 11:03:30 +01:00 |
|
|
Rémi Gaillard
|
4aca474377
|
Merge pull request #318 from djfm/release
// fixed Bulgarian PDF generation
|
2013-03-12 02:34:28 -07:00 |
|
|
Rémi Gaillard
|
5441a97c28
|
// small installer fix
|
2013-03-12 10:30:44 +01:00 |
|
|
fram
|
690d761258
|
// fixed Bulgarian PDF generation
|
2013-03-12 10:28:35 +01:00 |
|
|
Damien Metzger
|
213b232278
|
// Moved layered rules from top to bottom in order to avoid conflicts
|
2013-03-12 10:17:10 +01:00 |
|
|
gRoussac
|
a03bf13b8f
|
[-] FO : Fix bug #PSCFV-5168, required phone in all templates
|
2013-03-11 19:01:58 +01:00 |
|
|
Rémi Gaillard
|
f3579dd5eb
|
[*] Installer: check if sessions path if writable
|
2013-03-11 18:51:48 +01:00 |
|
|
gRoussac
|
d73fcdf412
|
[-] BO : Fix bug #PSCFV-7468 required phone in address creation
|
2013-03-11 17:39:13 +01:00 |
|
|
Rémi Gaillard
|
54ee8a21d8
|
// small typo fix
|
2013-03-11 17:03:17 +01:00 |
|
|
vAugagneur
|
78ebf6636c
|
[-] FO : fixed bug #PSCFV-5744 - Using attribute values with decimal points numbers and its ten multiple, have the same url
|
2013-03-11 16:29:33 +01:00 |
|
|
vAugagneur
|
fd6540b896
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2013-03-11 15:10:27 +01:00 |
|
|
vAugagneur
|
0688061b0a
|
//replace dirname(__FILE__) by _PS_ADMIN_DIR_ to prevent cache bug with __FILE__
|
2013-03-11 15:10:22 +01:00 |
|
|
Rémi Gaillard
|
8625f39c07
|
// oops
|
2013-03-11 15:06:57 +01:00 |
|
|
Rémi Gaillard
|
68c9da5f25
|
[-] Installer: download the language pack even if this is a native language on installation
|
2013-03-11 15:03:38 +01:00 |
|
|
gRoussac
|
418995b96d
|
[-] FO : minimum purchase total with wurrency
|
2013-03-11 15:00:42 +01:00 |
|
|
gRoussac
|
eb48c91eac
|
[-] FO : remove "Invalid address warning" when not "same" an no invoice address
|
2013-03-11 14:43:37 +01:00 |
|
|
Rémi Gaillard
|
9be5d8ac64
|
// uncomment trigger_error on Tools::throwDeprecated
|
2013-03-11 14:15:22 +01:00 |
|
|
Damien Metzger
|
7bd2bb9cb6
|
// This reverts commit 9ebe9e1894. "Changed modules list button"
|
2013-03-11 14:05:38 +01:00 |
|
|
gRoussac
|
6bd6f283a5
|
[-] FO : Fix bug #PSCFV-7946 delete customized product with several custos
|
2013-03-11 12:35:23 +01:00 |
|
|
Damien Metzger
|
e9e74a171d
|
// Improved pscleaner
|
2013-03-11 12:31:42 +01:00 |
|