dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,570 Commits 9 Branches 19 Tags
94de4d3d2f35403b5de1c10a4a02503f11ca1c2b
Commit Graph

17570 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Gaillard 070ea4b556 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-20 20:12:52 +01:00
Rémi Gaillard 503ea951a5 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-20 20:12:52 +01:00
Rémi Gaillard 17c9814f63 [-] Core: Fix the listings in multishop context when you have at least a combination on one shop and not on the others and the same for the images 2013-03-20 20:12:28 +01:00
Rémi Gaillard 5f181c8e4c [-] Core: Fix the listings in multishop context when you have at least a combination on one shop and not on the others and the same for the images 2013-03-20 20:12:28 +01:00
gRoussac 9275de936a [-] FO : Fix bug #PSCFV-8031 and maybe others, do not loop when calling displayNewProducts in blockcart 2013-03-20 20:10:52 +01:00
gRoussac 58de916f79 [-] FO : Fix bug #PSCFV-8031 and maybe others, do not loop when calling displayNewProducts in blockcart 2013-03-20 20:10:52 +01:00
Damien Metzger 3820a011cb // Reduced localization form size 2013-03-20 18:10:53 +01:00
Damien Metzger 68be65e60f // Reduced localization form size 2013-03-20 18:10:53 +01:00
vAugagneur b901447827 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-20 17:28:58 +01:00
vAugagneur f8fd67e2c4 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-20 17:28:58 +01:00
vAugagneur 697f3fb71a [+] CORE : added new hook actionModuleInstallBefore and actionModuleInstallAfter 2013-03-20 17:28:51 +01:00
vAugagneur ecfb24dad4 [+] CORE : added new hook actionModuleInstallBefore and actionModuleInstallAfter 2013-03-20 17:28:51 +01:00
Rémi Gaillard b1c47c4fde [-] Core: don't compute again price_wt in Product::addCustomizationPrice if already computed 2013-03-20 17:17:26 +01:00
Rémi Gaillard 02d58956c8 [-] Core: don't compute again price_wt in Product::addCustomizationPrice if already computed 2013-03-20 17:17:26 +01:00
Rémi Gaillard db9a73d41a [-] BO: AdminProductControllers::bulkDelete should return error message if stock left with adv stock management like standard delete #PSCFV-8250 2013-03-20 16:38:20 +01:00
Rémi Gaillard a58e9948e7 [-] BO: AdminProductControllers::bulkDelete should return error message if stock left with adv stock management like standard delete #PSCFV-8250 2013-03-20 16:38:20 +01:00
Rémi Gaillard 98fe8b6dd5 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-20 16:37:02 +01:00
Rémi Gaillard 5d054704a9 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-20 16:37:02 +01:00
Rémi Gaillard d1ee26895e // Bug fix, no language is set when a employee is not logged yet 2013-03-20 16:06:48 +01:00
Francois Gaillard 0fb8bb1127 // Bug fix, no language is set when a employee is not logged yet 2013-03-20 16:06:48 +01:00
Rémi Gaillard d951460cff // sometimes shit happen and no language is set when a employee is not logged yet 2013-03-20 15:26:51 +01:00
Rémi Gaillard cc996afc13 // sometimes shit happen and no language is set when a employee is not logged yet 2013-03-20 15:26:51 +01:00
Rémi Gaillard 3b97989d2e Merge pull request #335 from djfm/pdf 
// fixed PDF invoice for ar, az, bg, ca, hr, cs, gl, ka, he, ko, lo, lv,...
 2013-03-20 06:21:15 -07:00
Rémi Gaillard 0924228fcd Merge pull request #335 from djfm/pdf 
// fixed PDF invoice for ar, az, bg, ca, hr, cs, gl, ka, he, ko, lo, lv,...
 2013-03-20 06:21:15 -07:00
djfm adf6786d40 // fixed PDF invoice for ar, az, bg, ca, hr, cs, gl, ka, he, ko, lo, lv, mk, fa, sk, sr, si, th, ur, tr, uk 2013-03-20 14:13:37 +01:00
djfm 6ab2ffaf12 // fixed PDF invoice for ar, az, bg, ca, hr, cs, gl, ka, he, ko, lo, lv, mk, fa, sk, sr, si, th, ur, tr, uk 2013-03-20 14:13:37 +01:00
vAugagneur 04c3b54c38 // remove themeinstallator from install modules list, now install from addons 2013-03-20 11:25:45 +01:00
vAugagneur a2362d1d6f // remove themeinstallator from install modules list, now install from addons 2013-03-20 11:25:45 +01:00
Damien Metzger 2fb9b140f0 // Code cleaning thanks to maofree #PSCFV-7953 2013-03-20 11:21:56 +01:00
Damien Metzger 40bddde9cc // Code cleaning thanks to maofree #PSCFV-7953 2013-03-20 11:21:56 +01:00
Rémi Gaillard 09d5c695bb [-] FO: Fix #PSCFV-7600 display accessory in the product page even if there are no stock for the default combination (on the default theme) 2013-03-20 11:14:33 +01:00
Rémi Gaillard a6da2c12a0 [-] FO: Fix #PSCFV-7600 display accessory in the product page even if there are no stock for the default combination (on the default theme) 2013-03-20 11:14:33 +01:00
vAugagneur b70497189d [+] INSTALLER : added modules install from addons 2013-03-20 11:04:48 +01:00
vAugagneur b95b5861ef [+] INSTALLER : added modules install from addons 2013-03-20 11:04:48 +01:00
Damien Metzger 155150ea00 [-] BO : fixed product indexation markup in import #PSCFV-7695 2013-03-20 10:43:18 +01:00
Damien Metzger 77002bb3f5 [-] BO : fixed product indexation markup in import #PSCFV-7695 2013-03-20 10:43:18 +01:00
Damien Metzger 967a01f2ae [-] FO : fixed attributes order #PSCFV-8032 2013-03-20 10:31:51 +01:00
Damien Metzger d683478818 [-] FO : fixed attributes order #PSCFV-8032 2013-03-20 10:31:51 +01:00
Damien Metzger 6fdb4890cd // Made order message checks more flexible #PSCFV-8123 2013-03-19 16:39:02 +01:00
Damien Metzger 51bac2107f // Made order message checks more flexible #PSCFV-8123 2013-03-19 16:39:02 +01:00
Damien Metzger 9ae5e0e12a // Code cleaning 2013-03-19 16:39:02 +01:00
Damien Metzger bbd5cc3313 // Code cleaning 2013-03-19 16:39:02 +01:00
Rémi Gaillard e4890b629d // small fix for value of default refund displayed 2013-03-19 13:50:21 +01:00
Rémi Gaillard 0a54da23d8 // small fix for value of default refund displayed 2013-03-19 13:50:21 +01:00
gRoussac b9649c754e [-] BO : Fix bug #PSCFV-8027 bad sql query on messages when private bool = true 2013-03-19 11:34:54 +01:00
gRoussac 319d6ddec8 [-] BO : Fix bug #PSCFV-8027 bad sql query on messages when private bool = true 2013-03-19 11:34:54 +01:00
François Gaillard 5b96943e7f // Bug fix : Mobile, js errors fixed 2013-03-19 11:16:40 +01:00
Francois Gaillard 2bdb188634 // Bug fix : Mobile, js errors fixed 2013-03-19 11:16:40 +01:00
gRoussac 1b7a914008 [*] BO : remove tiny_mce hard coded setup to tinymce.inc.js 2013-03-19 11:10:57 +01:00
gRoussac 39b120bbb4 [*] BO : remove tiny_mce hard coded setup to tinymce.inc.js 2013-03-19 11:10:57 +01:00