 vAugagneur
|
fd6540b896
|
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 |
|
|
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
|
6c037a7b11
|
// oops
|
2013-03-11 15:06:57 +01:00 |
|
|
Rémi Gaillard
|
8625f39c07
|
// 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 |
|
|
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
|
6c79baedc3
|
[-] FO : minimum purchase total with wurrency
|
2013-03-11 15:00:42 +01:00 |
|
|
gRoussac
|
418995b96d
|
[-] FO : minimum purchase total with wurrency
|
2013-03-11 15:00:42 +01:00 |
|
|
gRoussac
|
aa1f260b38
|
[-] FO : remove "Invalid address warning" when not "same" an no invoice address
|
2013-03-11 14:43:37 +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
|
427f12f4a1
|
// uncomment trigger_error on Tools::throwDeprecated
|
2013-03-11 14:15:22 +01:00 |
|
|
Rémi Gaillard
|
9be5d8ac64
|
// uncomment trigger_error on Tools::throwDeprecated
|
2013-03-11 14:15:22 +01:00 |
|
|
Damien Metzger
|
a33c6ff54b
|
// This reverts commit 9ebe9e1894. "Changed modules list button"
|
2013-03-11 14:05:38 +01:00 |
|
|
Damien Metzger
|
7bd2bb9cb6
|
// This reverts commit 9ebe9e1894. "Changed modules list button"
|
2013-03-11 14:05:38 +01:00 |
|
|
Shagshag
|
2497e3b28c
|
Update Combination.php
|
2013-03-11 12:41:59 +01:00 |
|
|
Shagshag
|
bf36ea88d8
|
Update Combination.php
|
2013-03-11 12:41:59 +01:00 |
|
|
Shagshag
|
d293ae61cc
|
[-] SQL error in Combination::setAttributes
If $ids_attribute is empty, it cause SQL error.
|
2013-03-11 12:39:22 +01:00 |
|
|
Shagshag
|
a4e173a93a
|
[-] SQL error in Combination::setAttributes
If $ids_attribute is empty, it cause SQL error.
|
2013-03-11 12:39:22 +01:00 |
|
|
gRoussac
|
3c6ac17a72
|
[-] FO : Fix bug #PSCFV-7946 delete customized product with several custos
|
2013-03-11 12:35:23 +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
|
e9370f1892
|
// Improved pscleaner
|
2013-03-11 12:31:42 +01:00 |
|
|
Damien Metzger
|
e9e74a171d
|
// Improved pscleaner
|
2013-03-11 12:31:42 +01:00 |
|
|
Damien Metzger
|
bc30531063
|
// Small fix (module installation and pscleaner)
|
2013-03-11 12:31:42 +01:00 |
|
|
Damien Metzger
|
fdeba0497d
|
// Small fix (module installation and pscleaner)
|
2013-03-11 12:31:42 +01:00 |
|
|
Rémi Gaillard
|
d424a99d7e
|
// remove useless content on 404.php deprecated file
|
2013-03-11 11:51:32 +01:00 |
|
|
Rémi Gaillard
|
dfba5630d2
|
// remove useless content on 404.php deprecated file
|
2013-03-11 11:51:32 +01:00 |
|
|
Damien Metzger
|
79e13721ea
|
Merge pull request #314 from PrestaEdit/pscleaner
[-] MO: pscleaner - fixed bugs
|
2013-03-11 03:09:09 -07:00 |
|
|
Damien Metzger
|
bc8848e37c
|
Merge pull request #314 from PrestaEdit/pscleaner
[-] MO: pscleaner - fixed bugs
|
2013-03-11 03:09:09 -07:00 |
|
|
Rémi Gaillard
|
f60daa5ee5
|
// PR-313
|
2013-03-11 10:55:56 +01:00 |
|
|
Rémi Gaillard
|
fe8070cde2
|
// PR-313
|
2013-03-11 10:55:56 +01:00 |
|
|
ldecoker
|
d9e2dc288d
|
Missing php_self variable
Most of the controller have the php_self variable but not the ProductController.
|
2013-03-10 19:27:21 +01:00 |
|
|
ldecoker
|
671cc7a6a2
|
Missing php_self variable
Most of the controller have the php_self variable but not the ProductController.
|
2013-03-10 19:27:21 +01:00 |
|
|
PrestaEdit
|
1d7d6e9830
|
[-] MO: followup - fix bug in template vars
|
2013-03-08 22:12:44 +01:00 |
|
|
PrestaEdit
|
f69e80f2a1
|
[-] MO: followup - fix bug in template vars
|
2013-03-08 22:12:44 +01:00 |
|
|
PrestaEdit
|
025badd0ce
|
[-] MO: pscleaner - fixed bugs
We need to know that 'editorial' is a module and not always install (so, table can not be there).
ps2 need to be _DB_PREFIX_ !
|
2013-03-08 20:07:08 +01:00 |
|
|
PrestaEdit
|
87ab3be15a
|
[-] MO: pscleaner - fixed bugs
We need to know that 'editorial' is a module and not always install (so, table can not be there).
ps2 need to be _DB_PREFIX_ !
|
2013-03-08 20:07:08 +01:00 |
|
|
Damien Metzger
|
a273b34038
|
[+] MO : new module PrestaShop Cleaner: Check and fix functional integrity constraints and remove default data
|
2013-03-08 18:11:00 +01:00 |
|
|
Damien Metzger
|
9d0b6de69f
|
[+] MO : new module PrestaShop Cleaner: Check and fix functional integrity constraints and remove default data
|
2013-03-08 18:11:00 +01:00 |
|
|
vAugagneur
|
0dc5417779
|
//small fix on Category::cleanPositions()
|
2013-03-08 17:35:41 +01:00 |
|
|
vAugagneur
|
1635178391
|
//small fix on Category::cleanPositions()
|
2013-03-08 17:35:41 +01:00 |
|
|
vAugagneur
|
fd0e0618ab
|
Merge branch 'release' into development
|
2013-03-08 14:54:31 +01:00 |
|
|
vAugagneur
|
bbad9b7f61
|
Merge branch 'release' into development
|
2013-03-08 14:54:31 +01:00 |
|
|
vAugagneur
|
a92ac11901
|
//small js bug #PSCFV-8162
|
2013-03-08 14:53:19 +01:00 |
|
|
vAugagneur
|
c3893b94bf
|
//small js bug #PSCFV-8162
|
2013-03-08 14:53:19 +01:00 |
|
|
Damien Metzger
|
7ec0f0e391
|
// Fixed modules list icons retrieval
|
2013-03-08 11:53:25 +01:00 |
|
|
Damien Metzger
|
6d98b9a6ac
|
// Fixed modules list icons retrieval
|
2013-03-08 11:53:25 +01:00 |
|
|
gRoussac
|
c7da54fe0e
|
[-] BO : get default language when context language is empty for translation
|
2013-03-08 10:02:27 +01:00 |
|
|
gRoussac
|
4caae0a8f4
|
[-] BO : get default language when context language is empty for translation
|
2013-03-08 10:02:27 +01:00 |
|
|
gRoussac
|
70e61c2c47
|
[*] BO : Add default Unknown.jpg to genders
|
2013-03-07 19:26:52 +01:00 |
|