dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,799 Commits 9 Branches 19 Tags
052d17c30d63ccfc2014c971e0b70e6a7f2952bc
Commit Graph
8799 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
fram ece2ad6f21 // added Polish installer 2013-03-21 09:49:02 +01:00
Rémi Gaillard 646a68ef16 // oups 2013-03-20 20:13:38 +01:00
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 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
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
Damien Metzger 3820a011cb // 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 697f3fb71a [+] 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 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 98fe8b6dd5 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-20 16:37:02 +01:00
Rémi GaillardandFrançois Gaillard d1ee26895e // 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 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
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
vAugagneur 04c3b54c38 // 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
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
vAugagneur b70497189d [+] 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 967a01f2ae [-] 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 9ae5e0e12a // 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
gRoussac b9649c754e [-] 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
gRoussac 1b7a914008 [*] BO : remove tiny_mce hard coded setup to tinymce.inc.js 2013-03-19 11:10:57 +01:00
François Gaillard 97c5c0d0c7 [*] Mobile : OPC, display carrier price, gift wrapping price and gift products 2013-03-19 10:01:07 +01:00
François Gaillard fddbfa6032 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-19 09:47:46 +01:00
François Gaillard a7f4f82fc0 // Debug removed from shopping cart 2013-03-19 09:47:39 +01:00
Damien Metzger ce4148b89a [-] BO : added important check of the default language for ObjectModel multilang properties 2013-03-18 17:48:37 +01:00
vAugagneur e9c618e55b //small fix when click on install button on tab module list 2013-03-18 15:27:56 +01:00
vAugagneur 734c5a7c8f [-] BO : fixed bug #PSCFV-8285 - module tab listing permission 2013-03-18 14:54:04 +01:00
Damien Metzger e549207b8d // Small fix 2013-03-18 11:49:45 +01:00
Damien Metzger a0f97f5425 // Clean code 2013-03-18 11:08:57 +01:00
Rémi Gaillard f6674417cb [-] Core: Fix #PSCFV-8293 bad sql vars name on Order::getShipping() #PSCFV-8293 2013-03-18 11:05:06 +01:00
François Gaillard 016ae80514 // Version number updated 2013-03-18 10:47:50 +01:00
François Gaillard e5e6e8c29c [*] Mobile : Shopping cart displays gifts 2013-03-15 17:24:00 +01:00
Gregory Roussac 4c704c97c4 Merge pull request #325 from DrySs/patch-3 
[-] BO: fixed member "customer_id" to "id_customer" for address import in AdminImport
 2013-03-15 17:12:02 +01:00
Gregory Roussac f032670f33 Merge pull request #325 from DrySs/patch-3 
[-] BO: fixed member "customer_id" to "id_customer" for address import in AdminImport
 2013-03-15 09:08:30 -07:00
DrÿSs' 70bb7de9b5 [-] BO: fixed member "customer_id" to "id_customer" for address import in AdminImport 2013-03-15 16:51:55 +01:00
Rémi Gaillard 85c77105f6 // Remove unnecessary fsockopen 2013-03-15 16:25:19 +01:00
Rémi Gaillard 74533ab801 // Fix product multishop association when the product is created before the shop 2013-03-15 15:23:18 +01:00
François Gaillard e015d9d25e [-] Mobile : Bug fix : Combinations, radio buttons without select 2013-03-15 15:00:49 +01:00
gRoussac 71819afa0b Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-15 14:38:07 +01:00
gRoussac 182f8cdbaa [-] BO : Fix live edit link 2013-03-15 14:36:59 +01:00
Rémi Gaillard 27ef057564 [*] WS: Add contact entity 2013-03-15 14:36:26 +01:00
gRoussac 4f32fe810e [-] FO : remove 404 images in Live Edit 2013-03-15 14:23:12 +01:00
Rémi Gaillard 0e7ded19c1 // same on admintabs 2013-03-15 12:11:47 +01:00
Rémi Gaillard 868926f24a // delete multishop toolbar on adminstatuses 2013-03-15 12:07:53 +01:00