dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,484 Commits 9 Branches 19 Tags
8bbd3aa615c8255b2ceffc1c260ce95abd4e62ae
Commit Graph
8484 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
vAugagneur 578139a462 [-] BO - fixed bug #PSCFV-6248 don't delete product when delete category and choose option to delete products 2013-01-24 18:51:09 +01:00
Rémi Gaillard 1c22a76a3b [-] Core: Fix #PSCFV-7484 cache in Product::priceCalculation 2013-01-24 18:45:55 +01:00
vAugagneur fa3faf5369 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-24 18:26:33 +01:00
vAugagneur b27b9337b2 [-] 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 24273960cc [-] FO: Fix #PSCFV-7322 Product::getProductProperties quantity cache 2013-01-24 18:25:42 +01:00
Rémi Gaillard 80fb4e7b0e [-] MO: Fix #PSCFV-7416 product name in blocklayered listing with multishop 2013-01-24 17:29:53 +01:00
vAugagneur f97b73a6c5 [-] FO - fixed bug #PSCFV-6620 - reply to customer thread not working properly 2013-01-24 16:24:04 +01:00
vAugagneur bc203bfc3a [+] BO : you can choose where you want to display modules in BO tabs 2013-01-24 16:05:30 +01:00
Rémi Gaillard 56fe86e76c [-] BO: Fix #PSCFV-7377 second part 2013-01-24 15:14:47 +01:00
sLorenzini 7c97700138 [-] FO: updated css product_list 2013-01-24 13:47:53 +01:00
Gregory Roussac 6a6fd9925d Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-01-24 10:23:39 +01:00
gRoussac 31e3d9d388 [-] FO : No error on first consultation of shopping cart with minimum purchase 2013-01-24 10:22:29 +01:00
sLorenzini 5741d450c0 [-] 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 290c9fa75c // parse error in last commit sorry 2013-01-24 09:41:35 +01:00
gRoussac 3c6c352df2 [-] FO : Fix bug #PSCFV-7388 Guest checkout & state validation thankx to Sergio 2013-01-24 09:28:06 +01:00
gRoussac 7d1e6d993d [-] BO : fix css for iframe of custom products when creating order in BO 2013-01-23 18:38:00 +01:00
gRoussac f81e0c51fa [-] FO : adding values to empty parameters in ajax of cart-summary.js 2013-01-23 18:36:20 +01:00
Rémi Gaillard d068582ce9 [-] Installer: clear the database when an error occured during the install 2013-01-23 17:05:51 +01:00
Rémi Gaillard c8ecf3d604 [-] BO: Fix #PSCFV-7377 customizable fields on product duplication 2013-01-23 16:07:53 +01:00
gRoussac a48d2668d3 [-] FO : Apply changes from commit 1.4.X 1d0d59845b5f9cb9333a89e60523ab41df076d89 no cache for POST queries 2013-01-23 15:48:15 +01:00
sLorenzini f8d5b33251 [-] FO: fixed bug css in IE 2013-01-23 15:31:01 +01:00
Rémi Gaillard 9cb3db42ff [-] WS: Fix #PSCFV-6559 deletion of category images 2013-01-23 15:25:33 +01:00
Rémi Gaillard e660265a1c [-] BO: Fix translations for overridden templates #PSCFV-7391 2013-01-23 14:58:37 +01:00
Vincent Augagneur 9f876f9300 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 877e85cb31 // Synchronized localization files between server and solution 2013-01-23 10:33:32 +01:00
sLorenzini bbb1ee896e [-] FO: fixed Solutions for authentication.tpl and address.tpl about dni field - #PSCFV-6619 2013-01-23 09:44:54 +01:00
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