dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,908 Commits 9 Branches 19 Tags
8609f077495c2d082eeb80948c8bbb2fffa7fce2
Commit Graph
8908 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Augagneur 88b6502488 //fixed bug with images when theme don't have associate image type 2013-01-23 09:30:49 +01:00
PrestaEdit 94c84b41cf [-] MO: fix a problem with the wishlist_link 
With @ArtDesign, we see that if you put the module "Block MyAccount" before the "Wishlist", the wishlist_link var is not declare yet, so the link is empty. If you put the var in the header, it can be accessed by the other tpl.

Or, we can put this in a {$link->getModuleLink(...)} in TPL
 2013-01-22 23:50:52 +01:00
gRoussac f5c2d8e826 [-] FO : Try to fix "phone required" bug once again when only signing in 2013-01-22 18:33:14 +01:00
Gregory Roussac 4b7936bf46 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-22 16:33:56 +01:00
gRoussac 1ed094abfb [-] FO : Fix bug #PSCFI-6751 for 1.5.X carriers and payments update in OPC 2013-01-22 16:32:55 +01:00
Benjamin PONGY 0461ae3cd6 [*] FO oosHook must be a div, not a paragraph 
for code validation, oosHook must be a div, not a paragraph.
 2013-01-22 15:19:52 +01:00
Rémi Gaillard 8f80654965 [-] BO: Allow override for emails translations on the default theme without MODE_DEV 2013-01-22 15:07:25 +01:00
Vincent Augagneur d4247f04b8 Merge pull request #183 from PrestaEdit/patch-8 
[-] Small Fix: change documentation URL
 2013-01-22 05:49:56 -08:00
Vincent Augagneur f64cedc1a0 Merge pull request #184 from PrestaEdit/patch-9 
// Welcome 2013
 2013-01-22 05:49:18 -08:00
Samy Rabih 8e80cdb6b7 Disable search indexation 
Search indexation is very CPU-intensive, it should not be used here
 2013-01-22 14:34:17 +01:00
Marco Cervellin 94ebf82fd5 Merge branch 'development' of git://github.com/PrestaShop/PrestaShop into development 2013-01-22 12:06:25 +01:00
Vincent Augagneur 7cb6f55193 Merge pull request #190 from PrestaEdit/patch-13 
[-] BO: Standard Norm
 2013-01-22 03:02:05 -08:00
Marco Cervellin 373e7a8c39 [-] FO : fixed smarty curly bracket 
Signed-off-by: Marco Cervellin <marco@macodev.com>
 2013-01-22 11:53:29 +01:00
Rémi Gaillard fc547a4ab9 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-22 11:28:05 +01:00
Rémi Gaillard f1f8ce993f [-] Core: check the existence of the overriden emails templates before try to sending them 2013-01-22 11:27:51 +01:00
vAugagneur 262431e0e0 [-] CORE : email with virtual products info was not send to the customer 2013-01-22 11:23:05 +01:00
Vincent Augagneur 691b2039d3 Merge pull request #209 from Patanock/patch-3 
[-] FO : Fix for automatic modules upgrades
 2013-01-22 00:19:49 -08:00
PrestaEdit 6903d9ea62 [*] BO: we don't need to clik on a line 2013-01-21 22:23:51 +01:00
Patanock 7432db7fad Update classes/module/Module.php 2013-01-21 20:28:59 +01:00
Rémi Gaillard 2652130ca4 // typo fix 2013-01-21 18:42:56 +01:00
Patanock 7d1bed8407 Update classes/module/Module.php 
[-] FO : Fix for automatic modules upgrades
 2013-01-21 17:53:29 +01:00
vAugagneur 4523f4c849 [+] BO : new display of module list in all BO tabs 2013-01-21 17:46:40 +01:00
Rémi Gaillard dffd143e0f [-] Core: Store partial value in OrderCartRules #PSCFV-6566 2013-01-21 17:33:35 +01:00
Rémi Gaillard 935b5b5d02 [-] BO: Fix #PSCFV-6383 allow numerics chars on SQL Manager 2013-01-21 16:32:31 +01:00
Gregory Roussac ebc3d2562f Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-21 15:41:42 +01:00
Rémi Gaillard 3dbf875923 [-] BO: description_short product field validation when the limit is changed #PSCFV-7383 2013-01-21 15:42:58 +01:00
gRoussac 1de477a77b [*] BO : Fix #PSCFI-6225 for 1.5.X 2013-01-21 15:41:13 +01:00
Gregory Roussac b3868c74d6 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-21 15:31:44 +01:00
gRoussac 5eb4258bac [-] FO : small fix on shopping cart adresses 2013-01-21 15:30:31 +01:00
sLorenzini 0f5638f0fb [-] FO: fixed Installer - Message d'erreur mal affiché - #PSCFV-6585 2013-01-21 14:46:54 +01:00
sLorenzini d2077289f0 [-] FO: fixed IE8 Adding Address Problem + improve line-height input on IE - #PSCFV-6401 2013-01-21 11:53:51 +01:00
sLorenzini c90c29abaf [-] FO: improve display voucher code 2013-01-21 11:11:58 +01:00
Rémi Gaillard 6e3f28bdb9 Merge pull request #203 from involic/development 
[-] Class: When no warehouse configurated set 0 instead of setting ''
 2013-01-21 01:04:28 -08:00
Alexander Otchenashev 95490676e4 When no warehouse configurated set 0 instead of seting '' 2013-01-19 22:56:47 +02:00
Rémi Gaillard 67d4f21dfa [-] BO: Fix #PSCFV-6367 don't display the payment modules on BackOffice orders if they are disabled 2013-01-18 17:01:47 +01:00
Rémi Gaillard e97d593c2d // DbQuery could now use multiple tables for FROM 2013-01-18 16:01:31 +01:00
Rémi Gaillard 80797e8c43 // lower memory usage for SpecificPrice::getProductIdByDate 2013-01-18 14:18:59 +01:00
PrestaEdit dcfcda4ae2 [-] BO: Standard Norm 2013-01-18 00:08:38 +01:00
PrestaEdit db8b027896 [*] BO : use the employee lang 2013-01-17 22:00:44 +01:00
Rémi Gaillard 30c516619d // Something was missing in commit ee62ed8d27 2013-01-17 17:27:59 +01:00
vAugagneur 3edef3b387 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-17 13:58:55 +01:00
vAugagneur 043bb745dd [-] FO : fixed bug #PSCFV-5635 - Mobile Theme tax displayed 2013-01-17 13:58:48 +01:00
François Gaillard 8d795f46ad // Module upload error message 2013-01-17 10:26:45 +01:00
vAugagneur 1c0d0969fa Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-17 09:28:13 +01:00
vAugagneur 874beec806 //update localization for canada 2013-01-17 09:28:06 +01:00
François Gaillard b9dde1d50e Merge branch 'development' of http://github.com/PrestaShop/PrestaShop into development 2013-01-16 18:47:39 +01:00
François Gaillard 338ba1ce85 // AdminHomeController, syntax changed 2013-01-16 18:47:29 +01:00
vAugagneur 94a45b0572 [-] BO : fixed bug #PSCFV-5601 - AddressFormat wrongly forbid the 'other' field from the Address to be part of the address format 2013-01-16 18:24:11 +01:00
Damien Metzger 46cf4e514f [-] FO : fixed reduction display on product page #PSCFV-6308 2013-01-16 15:51:58 +01:00
Damien Metzger f66da4a6f8 [-] BO : fixed quick access for upgrade from 1.4 #PSCFV-6370 2013-01-16 15:51:58 +01:00