dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,638 Commits 9 Branches 19 Tags
2a28e476500cd854d9e80d4bb0ded5da170e0615
Commit Graph

18638 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damien Metzger
71c0a483e1 // Small fix 2013-07-24 16:16:40 +02:00
Damien Metzger
056ced75b5 // Fixed double module call 2013-07-24 15:55:40 +02:00
Captain FLAM
daec59d13d Update blocklayered.js 2013-07-24 11:55:05 +01:00
Gregory Roussac
063fd9941c Merge pull request #189 from PrestaEdit/patch-12 
[*] BO: use lang for input file
 2013-07-24 03:10:00 -07:00
Gregory Roussac
cfa6e61acb Merge pull request #351 from PrestaEdit/patch-23 
[*] WS: POST for php://input and XML ressource
 2013-07-24 03:08:23 -07:00
Gregory Roussac
6ac3f1133a Merge pull request #591 from djfm/locpacks 
[*] LO: Improved Argentina Localization Pack
 2013-07-24 02:08:42 -07:00
djfm
2af3afcc13 [*] LO: Improved Argentina Localization Pack 2013-07-24 08:06:52 +00:00
Gregory Roussac
26247a18c3 Merge pull request #564 from sylwit/patch-1 
[*] CORE : Translations shouldn't be cached if they contain dynamic vars (sprintf) in Translate.php
 2013-07-23 10:22:54 -07:00
Gregory Roussac
1c71dc54dc Merge pull request #556 from piotrmocko/patch-2 
[-] Bo : Payment currency restriction incorret type of input for radio
 2013-07-23 10:21:20 -07:00
Gregory Roussac
c025b8cb2b Merge pull request #568 from urecheatu007/development 
[-] CORE : setMedia() proper order for typewatch and cart-summary.js
 2013-07-23 10:15:43 -07:00
Gregory Roussac
166a133080 Merge pull request #577 from PhpMadman/patch-2 
[-] MO : If no homefeatured nb, get default 8 not 10
 2013-07-23 10:14:24 -07:00
Gregory Roussac
f8bff15894 Merge pull request #581 from Captain-FLAM/patch-1 
[-] Installer : Missing default value for id_employee in log table
 2013-07-23 10:12:50 -07:00
Gregory Roussac
9b9e5a122a Merge pull request #586 from Captain-FLAM/patch-7 
[-] BO : Hook.php : Missing _DB_PREFIX_, thanks @Captain-FLAM
 2013-07-23 09:52:15 -07:00
Francois Gaillard
2e3f13db95 [-] Controller : AdminTranslationsController - Fixed bug with simple & double quotes 2013-07-23 18:47:35 +02:00
Jérôme Nadaud
71271ded7f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-23 18:38:33 +02:00
Jérôme Nadaud
d241013692 [-] BO : FixBug #PSCFV-9894 undefined quantity_all_version variable in product.tpl 2013-07-23 18:36:51 +02:00
gRoussac
4aab4f88cd [-] BO : Fix SQL query when $join_category == false, pull request d5f75c63b6 thanks @Captain-FLAM 2013-07-23 18:25:32 +02:00
Gregory Roussac
abf6f0d626 Merge pull request #587 from ChristopheBoucaut/patch-2 
[-] CORE : Search terms can now have dashes in Search.php
 2013-07-23 09:18:16 -07:00
Gregory Roussac
a5e7f7fdac Merge pull request #588 from joseantgv/patch-1 
[-] BO : Update AdminCustomerThreadsController.php
 2013-07-23 09:16:39 -07:00
Damien Metzger
2e6e5a2604 // Removed useless check in the installer 2013-07-23 15:29:09 +02:00
Damien Metzger
c829ac5b7d // Fixed fix 2013-07-23 14:19:13 +02:00
Damien Metzger
87a4b75df4 [*] FO : updated Fancybox plug-in 2013-07-23 12:53:20 +02:00
Rémi Gaillard
6ed713e847 [-] Fix #PSCFV-9038 carrier warehouse association after carrier edition 2013-07-23 11:57:44 +02:00
gRoussac
dbe26e0a1d [-] BO : Could not find cover when image table corrupted 2013-07-23 11:47:16 +02:00
Damien Metzger
0ddf5d1025 // Fixed getMainShopDomain 2013-07-23 11:33:07 +02:00
gRoussac
a805941c1f // typo in EN string 2013-07-23 10:34:05 +02:00
Gregory Roussac
3b213a505c Merge pull request #583 from djfm/development 
[*] TR : Small localization fixes & correction in templates so that translation regexes work OK
 2013-07-23 00:59:31 -07:00
joseantgv
63b2f63058 Update AdminCustomerThreadsController.php 
If language is not defined returns an array instead of a string which makes function Mail::Send to throw a warning.
 2013-07-23 09:58:53 +02:00
Damien Metzger
209615d4f4 // Missing } 2013-07-23 09:52:41 +02:00
Damien Metzger
07e3354d0e // Code cleaning 2013-07-23 09:50:26 +02:00
Damien Metzger
9169995adc // Small fixes and code cleaning 2013-07-23 09:50:26 +02:00
Damien Metzger
91c5d184b6 // Small backend optimization 2013-07-23 09:50:26 +02:00
Damien Metzger
4b6642d76c // Small optimization 2013-07-23 09:50:25 +02:00
ChristopheBoucaut
3503670478 Update Search.php 
$string = preg_replace('/[._-]+/', '', $string);

Ex :
Product's name : Saint-leon
Search : leon => 0 result

------------------------------------------------------

$string = preg_replace('/[._-]+/', ' ', $string);
Ex :
Product's name : Saint-leon
Search : leon => 1 result

-------------------------------------------------------

I think that thus the search is more relevant
 2013-07-23 09:36:08 +02:00
Captain FLAM
928181bd1f Update Hook.php 2013-07-22 21:35:20 +01:00
Captain FLAM
2e860d6750 Update product.js 
if product with declinaison without reduction : reduction price is showed !!

because of this comparison after (line ~400):

if (productPriceWithoutReductionDisplay > productPriceDisplay)

and :

var tmp = productPriceDisplay * group_reduction;

is unused
 2013-07-22 18:58:59 +01:00
djfm
939f7d7770 //most of the translation of the NL installer is done 2013-07-22 17:09:26 +00:00
Jérôme Nadaud
3ecf929ff0 [-] BO : FixBug #PSCFV-9881 Remove updateCarriersList on zip code blur 2013-07-22 18:05:37 +02:00
Jérôme Nadaud
0f7d59ad26 [-] BO : FixBug #PSCFV-9878 Wrong login tab order 2013-07-22 17:07:57 +02:00
Jérôme Nadaud
b88ddf4483 [-] Classes : SwiftMailer - Fix deprecated preg_replace (PHP 5. 5.0) 2013-07-22 15:39:50 +02:00
Jérôme Nadaud
b87e934a66 [-] BO : FixBug #PSCFV-8060 Error getting last quantity and price in stock mouvement 2013-07-22 14:58:55 +02:00
Jérôme Nadaud
794475a9cc [-] BO : FixBug #PSCFV-8237 Javascript Error setting default supplier 2013-07-22 14:33:16 +02:00
Rémi Gaillard
d79365fe4d // small fix 2013-07-22 11:54:35 +02:00
Rémi Gaillard
32c02bba5f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-07-22 11:39:44 +02:00
Rémi Gaillard
b8d272a459 // fix entities 2013-07-22 11:39:15 +02:00
Damien Metzger
f76fe635ff // Added queries table to the profiling mode, you can easily copy/paste it into excel or anything 2013-07-22 11:37:29 +02:00
djfm
3c59c5e779 //replaced all js='1' with js=1 so that the translation regexes don't fail 2013-07-22 09:34:18 +00:00
Jérôme Nadaud
ca9f2c9459 [-] BO : FixBug #PSCFV-9138 Error duplicate product group reduction 2013-07-22 11:25:13 +02:00
Captain FLAM
287cf0c955 Update 1.5.5.0.sql 
Missing DEFAULT
 2013-07-22 09:55:06 +01:00
Damien Metzger
3556e75ce3 // Moved useless code into the block where it is useful 2013-07-22 10:49:41 +02:00