Commit Graph

8619 Commits

Author SHA1 Message Date
PrestaEdit
47d3085a4a [*]WS: POST and XML ressource 2013-03-18 01:03:43 +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
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
vAugagneur
f4537c022f //added _PS_CREATION_DATE_ in rewriteSettingsFile function 2013-03-15 12:04:31 +01:00
vAugagneur
16badbd45d //removed moneybookers during install 2013-03-15 12:02:16 +01:00
Rémi Gaillard
d4d0661ff8 // Clean order_detail_tax table after deleting an order detail #PSCFV-8278 2013-03-15 11:51:19 +01:00
Rémi Gaillard
564aafd10d // Clean Language::checkAndAddLanguage() 2013-03-15 11:14:29 +01:00
gRoussac
f9feec981a // remove warning in multishop 2013-03-14 17:49:07 +01:00
François Gaillard
138c225845 Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release 2013-03-14 17:01:55 +01:00
François Gaillard
ad7c73348d Revert "[-] FO : Bug fix : JS Minifier replaced with Google Closure Compiler"
This reverts commit da77ce1029.
2013-03-14 17:01:16 +01:00
gRoussac
d3324ef6e8 // again remove additional \t 2013-03-14 16:58:28 +01:00
gRoussac
66239416ec // remove additionnal \t 2013-03-14 16:55:06 +01:00
gRoussac
df90cab2db [-] FO : Fix bug #PSCFV-6595, fancybox images for IE and AlphaImageLoader 2013-03-14 16:53:26 +01:00
François Gaillard
da77ce1029 [-] FO : Bug fix : JS Minifier replaced with Google Closure Compiler 2013-03-14 16:37:22 +01:00
Rémi Gaillard
83729b3cef Merge pull request #315 from PrestaEdit/followup
[-] MO: followup - fix bug in template vars
2013-03-14 07:52:15 -07:00
Rémi Gaillard
987977ecbb [-] BO: Fix update of delivery address on backoffice orders 2013-03-14 15:25:38 +01:00
Rémi Gaillard
d9bf697625 [-] BO: Fix auto-selection of default category when you have choosen one on the listing 2013-03-14 15:04:54 +01:00
Rémi Gaillard
441c334f09 // Fix 404 img path on pagenotfoundcontroller 2013-03-14 14:58:44 +01:00
Rémi Gaillard
3d8f3f9ca9 Merge pull request #299 from samy-r/dev-import-time
Import time improvment
2013-03-14 14:29:20 +01:00
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