Commit Graph

8814 Commits

Author SHA1 Message Date
François Gaillard
e3d9613abf // Development branch merged 1.5.4.0 2013-03-27 10:43:43 +01:00
François Gaillard
22fe9f9d01 Merge branch 'release' into development 2013-03-27 10:29:58 +01:00
vAugagneur
6f0968b324 //CHANGELOG version 1.5.4.0 2013-03-27 10:28:13 +01:00
François Gaillard
8bc725f4b6 // Release branch merged 2013-03-27 10:25:16 +01:00
gRoussac
98306be83f // admin folder name 2013-03-26 19:15:37 +01:00
gRoussac
135bd2cd42 [-] BO : Remove warning at login template 2013-03-26 18:58:03 +01:00
Rémi Gaillard
b8ecaa8528 // Fix installer in russian 2013-03-26 18:50:37 +01:00
Rémi Gaillard
6b1293b569 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-26 18:23:33 +01:00
Rémi Gaillard
fcdc9db624 // Also clear language cache in AdminTranslationsController 2013-03-26 18:23:17 +01:00
gRoussac
07789c8815 // remove warning 2013-03-26 18:10:32 +01:00
gRoussac
ddb2bf1602 //bad commit for Auth controller sorry about this 2013-03-26 18:05:54 +01:00
gRoussac
af61d866a7 [-] FO : Fix bug #PSCFV-8415 zipcode is required without zip code format too 2013-03-26 18:05:39 +01:00
gRoussac
fdbceb7db0 //bad commit for Auth controller sorry about this 2013-03-26 16:36:51 +01:00
Rémi Gaillard
eda7758ab6 [-] Core: clean Language:: after adding a new lang 2013-03-26 16:06:50 +01:00
gRoussac
c9c9454ca5 [-] FO : Fix bug #PSCFV-8415 zipcode is required without zip code format too 2013-03-26 15:53:51 +01:00
Rémi Gaillard
d5b41ba686 // Update default translations packs 2013-03-26 15:32:15 +01:00
gRoussac
0e51b31acf // ooops, parse error sorry 2013-03-26 12:02:59 +01:00
gRoussac
53b0e11292 [-] MO : Fix bug #PSCFV-7800, lang fields definition in Retrocompatibility definition, thankx to Olea 2013-03-26 11:51:50 +01:00
Rémi Gaillard
1fd9fd1bfc [-] BO: it is now possible to change the default customer/guest/visitor group per shop 2013-03-26 11:45:23 +01:00
vAugagneur
70bc9b7f6e //fixed bug when install module from specific tab 2013-03-26 11:21:50 +01:00
Rémi Gaillard
6b4738c7ef // fix for price computation with combination in product page FO 2013-03-26 11:04:07 +01:00
vAugagneur
016cdc1685 //fix install bug when no internet connection 2013-03-26 10:46:44 +01:00
gRoussac
65ef8c7053 [-] INSTALLER : Last fix of bug #PSCFV-8168 loyalty ADD id_shop to layered_product_attribute 2013-03-26 10:36:23 +01:00
Vincent Augagneur
e1f3f163bc Merge pull request #348 from djfm/installer
[-] Installer : do not fail on warning when addons modules list empty
2013-03-26 02:00:35 -07:00
gRoussac
0211e83413 [-] INSTALLER : Second fix of bug #PSCFV-8168 loyalty CHANGE id_discount to id_cart_rule 2013-03-26 09:57:05 +01:00
djfm
a209789020 [-] Installer : do not fail on warning when addons modules list empty 2013-03-26 09:42:48 +01:00
vAugagneur
06c1b3537b [-] CORE : fixed bug #PSCFV-8035 - 'auth' hook exception is not working 2013-03-26 09:28:15 +01:00
Rémi Gaillard
ba62406508 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-25 19:37:21 +01:00
Rémi Gaillard
6ebe135132 // small fix 2013-03-25 19:37:08 +01:00
gRoussac
266180c321 [-] INSTALLER : First fix of bug #PSCFV-8168 reinsurance CHANGE filename to file_name` 2013-03-25 19:14:36 +01:00
Rémi Gaillard
9c4008d7b5 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-25 18:09:33 +01:00
Rémi Gaillard
70b0469d4a // delete also module emails 2013-03-25 18:08:34 +01:00
François Gaillard
66c9c1f66e Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-25 18:04:43 +01:00
François Gaillard
362108efd3 [-] Mobile : Bug fix : Address block (data-ajax) 2013-03-25 17:58:45 +01:00
gRoussac
fec2866be6 [-] INSTALLER : Fix bug #PSCFV-8167 bad drop of non-existent index and correct genders image copy 2013-03-25 17:54:28 +01:00
vAugagneur
8e9826743f [-] BO : fixed Alphabetical sorting of categories 2013-03-25 17:15:57 +01:00
Rémi Gaillard
fe0a8ae1a7 [-] BO: Fix #PSCFV-8422 it is now possible to manage minimal quantity even if stock management is disabled 2013-03-25 16:48:57 +01:00
Rémi Gaillard
3d312b2dcd // remove error on adding language if no htaccess 2013-03-25 16:24:00 +01:00
Rémi Gaillard
6ee8a0d0d6 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-25 15:54:25 +01:00
Rémi Gaillard
67b3978397 // Fix the display of errors on adding localization pack 2013-03-25 15:54:19 +01:00
gRoussac
f9aa5cd2dd Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-25 15:47:50 +01:00
gRoussac
f3dd32a6a1 [-] BO : set order payments reference to 9 chars after upgrade from 1.4.X 2013-03-25 15:42:29 +01:00
vAugagneur
d1b044bb83 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-25 15:15:32 +01:00
vAugagneur
289357b6bf //small fix 2013-03-25 15:15:10 +01:00
François Gaillard
dda804bffc // Ingore list updated 2013-03-25 15:07:13 +01:00
François Gaillard
ab061827b9 // Ignore list updated (en.php removed) 2013-03-25 15:01:59 +01:00
François Gaillard
eeb84d8adf // Ignore list updated + fr translations updated 2013-03-25 14:59:01 +01:00
gRoussac
63c8fc41dd // remove is_writable from AdminTranslations 2013-03-25 14:17:05 +01:00
François Gaillard
54103a1a8f Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-25 12:14:09 +01:00
François Gaillard
2866f62e79 // Default carrier groups updated 2013-03-25 12:13:53 +01:00