 Rémi Gaillard
|
313f2a5392
|
Merge pull request #316 from ldecoker/patch-4
[*][FO]Missing php_self variable
|
2013-03-14 14:28:38 +01:00 |
|
|
Rémi Gaillard
|
37e6846aab
|
Merge pull request #317 from Shagshag/patch-2
[-] SQL error in Combination::setAttributes
|
2013-03-14 14:26:51 +01:00 |
|
|
Rémi Gaillard
|
f620645169
|
[-] Core: Fix search indexation when nb languages * nb shops > 50
|
2013-03-14 14:16:31 +01:00 |
|
|
gRoussac
|
3ed335e80f
|
[-] FO : Do no try to add empty css or js file name
|
2013-03-14 11:15:49 +01:00 |
|
|
Damien Metzger
|
44a0afa34b
|
// Added lock to class_index generation
|
2013-03-14 11:00:23 +01:00 |
|
|
Damien Metzger
|
7f21c3e62a
|
// Update profiling tools
|
2013-03-14 10:47:18 +01:00 |
|
|
François Gaillard
|
890eefce92
|
// Profiler, redirect method declaration fixed
|
2013-03-14 10:20:12 +01:00 |
|
|
vAugagneur
|
ac764f0d81
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2013-03-14 09:36:22 +01:00 |
|
|
vAugagneur
|
9efa51e704
|
//fixed multi-shipping bug
|
2013-03-14 09:36:17 +01:00 |
|
|
gRoussac
|
be6ad7855a
|
[-] FO : Check for cart rules before diplaying shopping cart in OPC
|
2013-03-13 18:42:40 +01:00 |
|
|
vAugagneur
|
930e10f87c
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2013-03-13 18:21:40 +01:00 |
|
|
vAugagneur
|
37f64664d3
|
//small js fix
|
2013-03-13 18:21:21 +01:00 |
|
|
Rémi Gaillard
|
b76b263ab0
|
[-] FO: Fix separated packages
|
2013-03-13 18:02:54 +01:00 |
|
|
vAugagneur
|
eae5f2d965
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2013-03-13 16:29:23 +01:00 |
|
|
vAugagneur
|
149407f72d
|
//added russian installer and changed english strings
|
2013-03-13 16:28:19 +01:00 |
|
|
vAugagneur
|
67e357e447
|
Merge translations/fr/errors.php
|
2013-03-13 16:16:01 +01:00 |
|
|
Rémi Gaillard
|
f0c10588d7
|
// Fix category export without multishop 2
|
2013-03-13 15:52:25 +01:00 |
|
|
Rémi Gaillard
|
e67cf21b4b
|
// Fix category export without multishop
|
2013-03-13 15:49:52 +01:00 |
|
|
gRoussac
|
2b0612c0eb
|
[-] INSTALLER : Update gender for default customer
|
2013-03-13 15:43:48 +01:00 |
|
|
François Gaillard
|
cd048c6832
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2013-03-13 15:29:21 +01:00 |
|
|
François Gaillard
|
81fbca919e
|
[-] FO : Mobile theme updated, templates added/improved
|
2013-03-13 15:28:42 +01:00 |
|
|
gRoussac
|
a6dbe24d28
|
[-] BO : Avoid warning if img src not defined in controller
|
2013-03-13 15:27:18 +01:00 |
|
|
gRoussac
|
b994136939
|
[-] CORE : Preserve carrier reference integrity in cart rules when updating a carrier
|
2013-03-13 14:31:26 +01:00 |
|
|
fram
|
ed947bc123
|
// changed English strings, especially focusing on colons harmonization
|
2013-03-12 19:39:30 +01:00 |
|
|
gRoussac
|
ee570bbca7
|
[-] FO : Avoid flashing of availability_statut
|
2013-03-12 18:34:24 +01:00 |
|
|
Rémi Gaillard
|
5998face6b
|
// Fix iPod nano fixture specific price
|
2013-03-12 18:11:20 +01:00 |
|
|
gRoussac
|
bb4ec94718
|
[*] TR: Update translations for errors
|
2013-03-12 16:18:09 +01:00 |
|
|
fram
|
f7c76f60fb
|
// added russian installer
|
2013-03-12 16:05:54 +01:00 |
|
|
François Gaillard
|
18bce2ba39
|
[-] FO : Bug fix #PSCFV-7915 : Mobile theme issue, default attribute
|
2013-03-12 16:04:03 +01:00 |
|
|
Damien Metzger
|
b9c87df4e5
|
// Installer translations (de/it)
|
2013-03-12 15:41:54 +01:00 |
|
|
gRoussac
|
c6784fa509
|
// wrong commit for ed09cee7b1
|
2013-03-12 14:48:28 +01:00 |
|
|
gRoussac
|
ed09cee7b1
|
[*] BO : Set warning when trying to activate Xcache misconfigured
|
2013-03-12 14:41:07 +01:00 |
|
|
François Gaillard
|
abb225143b
|
[-] FO : Fixed mobile theme authentication CSS
|
2013-03-12 14:16:52 +01:00 |
|
|
Rémi Gaillard
|
ad6f8775da
|
// check fields before change products statuse
|
2013-03-12 12:28:40 +01:00 |
|
|
Damien Metzger
|
828563d228
|
// Added hook call in adminperformance
|
2013-03-12 12:19:22 +01:00 |
|
|
gRoussac
|
b2cdf51cc8
|
[*] BO : file_put_contents returns length when success not true
|
2013-03-12 12:09:47 +01:00 |
|
|
Rémi Gaillard
|
55d6b1ac08
|
// typo fix
|
2013-03-12 11:03:30 +01:00 |
|
|
Rémi Gaillard
|
fc6c4067a7
|
Merge pull request #318 from djfm/release
// fixed Bulgarian PDF generation
|
2013-03-12 02:34:28 -07:00 |
|
|
Rémi Gaillard
|
024fbfe068
|
// small installer fix
|
2013-03-12 10:30:44 +01:00 |
|
|
fram
|
c1cd8c777f
|
// fixed Bulgarian PDF generation
|
2013-03-12 10:28:35 +01:00 |
|
|
Damien Metzger
|
63ef3f3e8c
|
// Moved layered rules from top to bottom in order to avoid conflicts
|
2013-03-12 10:17:10 +01:00 |
|
|
gRoussac
|
13b796923a
|
[-] FO : Fix bug #PSCFV-5168, required phone in all templates
|
2013-03-11 19:01:58 +01:00 |
|
|
Rémi Gaillard
|
e95afe67b4
|
[*] Installer: check if sessions path if writable
|
2013-03-11 18:51:48 +01:00 |
|
|
gRoussac
|
dfa3e0fcb0
|
[-] BO : Fix bug #PSCFV-7468 required phone in address creation
|
2013-03-11 17:39:13 +01:00 |
|
|
Rémi Gaillard
|
4dba588add
|
// small typo fix
|
2013-03-11 17:03:17 +01:00 |
|
|
vAugagneur
|
eb4e0946bb
|
[-] 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
|
68b9b796d7
|
Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release
|
2013-03-11 15:10:27 +01:00 |
|
|
vAugagneur
|
5f47b81211
|
//replace dirname(__FILE__) by _PS_ADMIN_DIR_ to prevent cache bug with __FILE__
|
2013-03-11 15:10:22 +01:00 |
|
|
Rémi Gaillard
|
6c037a7b11
|
// oops
|
2013-03-11 15:06:57 +01:00 |
|
|
Rémi Gaillard
|
11bc38b1f9
|
[-] Installer: download the language pack even if this is a native language on installation
|
2013-03-11 15:03:38 +01:00 |
|