dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,984 Commits 9 Branches 19 Tags
17536ff682b822449d49e15b671c8e28e1d4b5de
Commit Graph
8984 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Gaillard 8b8451831e [-] Core: Fix #PSCFV-7484 cache in Product::priceCalculation 2013-01-24 18:45:55 +01:00
vAugagneur dfad6d21a3 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-24 18:26:33 +01:00
vAugagneur 210cc1ed01 [-] BO - fixed bug #PSCFV-6195 - Currency format not re-writing in product tab shipping 2013-01-24 18:26:29 +01:00
Rémi Gaillard 955e2c378d [-] FO: Fix #PSCFV-7322 Product::getProductProperties quantity cache 2013-01-24 18:25:42 +01:00
Rémi Gaillard 9fd52c56e2 [-] MO: Fix #PSCFV-7416 product name in blocklayered listing with multishop 2013-01-24 17:29:53 +01:00
vAugagneur 4a9c3df77c [-] FO - fixed bug #PSCFV-6620 - reply to customer thread not working properly 2013-01-24 16:24:04 +01:00
vAugagneur ab3226d9d2 [+] BO : you can choose where you want to display modules in BO tabs 2013-01-24 16:05:30 +01:00
Rémi Gaillard 9f2b4acf2f [-] BO: Fix #PSCFV-7377 second part 2013-01-24 15:14:47 +01:00
sLorenzini 808657f443 [-] FO: updated css product_list 2013-01-24 13:47:53 +01:00
Gregory Roussac 496999fb1c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-24 10:23:39 +01:00
gRoussac 33f27c2c0b [-] FO : No error on first consultation of shopping cart with minimum purchase 2013-01-24 10:22:29 +01:00
sLorenzini f11faead01 [-] FO: added a new line for better display on IE9 for the "new" on homefeatured and product list 2013-01-24 10:11:41 +01:00
gRoussac 4b73d72a65 // parse error in last commit sorry 2013-01-24 09:41:35 +01:00
gRoussac 7b48cdd068 [-] FO : Fix bug #PSCFV-7388 Guest checkout & state validation thankx to Sergio 2013-01-24 09:28:06 +01:00
gRoussac 39d7863eac [-] BO : fix css for iframe of custom products when creating order in BO 2013-01-23 18:38:00 +01:00
gRoussac 300259661a [-] FO : adding values to empty parameters in ajax of cart-summary.js 2013-01-23 18:36:20 +01:00
Rémi Gaillard 04e436551b [-] Installer: clear the database when an error occured during the install 2013-01-23 17:05:51 +01:00
Rémi Gaillard 43290dd47a [-] BO: Fix #PSCFV-7377 customizable fields on product duplication 2013-01-23 16:07:53 +01:00
gRoussac 72c76e3b59 [-] FO : Apply changes from commit 1.4.X 1d0d59845b5f9cb9333a89e60523ab41df076d89 no cache for POST queries 2013-01-23 15:48:15 +01:00
sLorenzini d886bf3103 [-] FO: fixed bug css in IE 2013-01-23 15:31:01 +01:00
Rémi Gaillard 79860bfa12 [-] WS: Fix #PSCFV-6559 deletion of category images 2013-01-23 15:25:33 +01:00
Rémi Gaillard 150f8ae528 [-] BO: Fix translations for overridden templates #PSCFV-7391 2013-01-23 14:58:37 +01:00
Vincent Augagneur 6b2fab87d2 Merge pull request #223 from djfm/877e85cb315be5bae73bada00fd10f756a29b07a 
Synchronize the localization files in the solution with those on the PrestaShop server
 2013-01-23 05:10:20 -08:00
djfm 5c1f5b0f23 // Synchronized localization files between server and solution 2013-01-23 10:33:32 +01:00
sLorenzini 60c4d09948 [-] FO: fixed Solutions for authentication.tpl and address.tpl about dni field - #PSCFV-6619 2013-01-23 09:44:54 +01:00
Vincent Augagneur 9cf577ff0d //fixed bug with images when theme don't have associate image type 2013-01-23 09:30:49 +01:00
PrestaEdit 3b2b718f84 [-] 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 caf95de092 [-] FO : Try to fix "phone required" bug once again when only signing in 2013-01-22 18:33:14 +01:00
Gregory Roussac 7a8fade4b1 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-22 16:33:56 +01:00
gRoussac c0e7444889 [-] 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 c89ad555df [*] 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 9e45ad974a [-] BO: Allow override for emails translations on the default theme without MODE_DEV 2013-01-22 15:07:25 +01:00
Vincent Augagneur 377cc5d794 Merge pull request #183 from PrestaEdit/patch-8 
[-] Small Fix: change documentation URL
 2013-01-22 05:49:56 -08:00
Vincent Augagneur 9c821b3932 Merge pull request #184 from PrestaEdit/patch-9 
// Welcome 2013
 2013-01-22 05:49:18 -08:00
Samy Rabih db3be40c06 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 f4c361636e Merge branch 'development' of git://github.com/PrestaShop/PrestaShop into development 2013-01-22 12:06:25 +01:00
Vincent Augagneur b4864f83f6 Merge pull request #190 from PrestaEdit/patch-13 
[-] BO: Standard Norm
 2013-01-22 03:02:05 -08:00
Marco Cervellin 1fb06bc07d [-] FO : fixed smarty curly bracket 
Signed-off-by: Marco Cervellin <marco@macodev.com>
 2013-01-22 11:53:29 +01:00
Rémi Gaillard f47031eaaf Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-22 11:28:05 +01:00
Rémi Gaillard f40ae37a24 [-] Core: check the existence of the overriden emails templates before try to sending them 2013-01-22 11:27:51 +01:00
vAugagneur 459ce4fab8 [-] CORE : email with virtual products info was not send to the customer 2013-01-22 11:23:05 +01:00
Vincent Augagneur 268b581953 Merge pull request #209 from Patanock/patch-3 
[-] FO : Fix for automatic modules upgrades
 2013-01-22 00:19:49 -08:00
PrestaEdit 7f56058619 [*] BO: we don't need to clik on a line 2013-01-21 22:23:51 +01:00
Patanock 1514263b35 Update classes/module/Module.php 2013-01-21 20:28:59 +01:00
Rémi Gaillard 378320854c // typo fix 2013-01-21 18:42:56 +01:00
Patanock d96d6a46d1 Update classes/module/Module.php 
[-] FO : Fix for automatic modules upgrades
 2013-01-21 17:53:29 +01:00
vAugagneur 517e90da43 [+] BO : new display of module list in all BO tabs 2013-01-21 17:46:40 +01:00
Rémi Gaillard a70e92dced [-] Core: Store partial value in OrderCartRules #PSCFV-6566 2013-01-21 17:33:35 +01:00
Rémi Gaillard 1915ea63a7 [-] BO: Fix #PSCFV-6383 allow numerics chars on SQL Manager 2013-01-21 16:32:31 +01:00
Gregory Roussac ad9543fc53 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-21 15:41:42 +01:00