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
gRoussac
349a10e2a9 // fix warnings 2013-06-28 17:58:04 +02:00
Damien Metzger
09bbff8737 [*] FO : added smarty cache on blockbestsellers 2013-06-28 17:42:43 +02:00
Damien Metzger
583346bbb7 [*] FO : added smarty cache on homefeatured module 2013-06-28 17:19:06 +02:00
ldecoker
a617bec39b Update shopping-cart.tpl 
To access template "shopping-cart-product-line.tpl", it should use the $tpl_dir variable.
 2013-06-28 16:46:12 +02:00
Damien Metzger
a8d96ed0c0 // Removed useless feature 2013-06-28 16:38:08 +02:00
Damien Metzger
a387ff5e2f [-] FO : added smarty cache to blockcms 2013-06-28 16:20:04 +02:00
Damien Metzger
8acf308639 [*] FO : added smarty cache on blocknewproducts 2013-06-28 15:17:53 +02:00
Damien Metzger
42f8a0a67a [*] BO : improved unicode characters replacement in URLs 2013-06-28 12:19:20 +02:00
Vincent Augagneur
97370946d2 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-28 11:06:13 +02:00
Vincent Augagneur
dfc7456980 //replace some escape:'html' by addslashes in .tpl with javascript 2013-06-28 11:06:08 +02:00
Rémi Gaillard
cf9c73a854 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-28 10:19:03 +02:00
Rémi Gaillard
ec3095ac32 [-] BO: Fix manufacturer addresses duplication #PSCFV-9601 2013-06-28 10:18:49 +02:00
Vincent Augagneur
32d3dd3e0f [-] MO : fixed bug #PSCFV-8654 - 1.5.4.0 My Favorites doesn't add product 2013-06-28 10:13:09 +02:00
Rémi Gaillard
c025024b40 // fix php warning if no image is associated to the producr 2013-06-27 18:14:07 +02:00
Damien Metzger
ce7fe6c128 // Removed @ in front of a function (We need the errors!) #PSCFV-9078 2013-06-27 18:11:57 +02:00
Damien Metzger
8f01b35f46 [-] BO : fixed translation and languages issues 2013-06-27 17:51:25 +02:00
Damien Metzger
75cddbae99 // Protected smarty variable in JS 2013-06-27 16:41:57 +02:00
Vincent Augagneur
374de1b6c8 Merge pull request #515 from axometeam/patch-3 
[-] BO : remove robots.txt rules preventing Google shopping indexing
 2013-06-27 06:52:11 -07:00
ChristopheBoucaut
0de8c2dbc6 Update OrderDetailController.php 
Fixed link between thread and an order's product
 2013-06-27 15:49:40 +02:00
Rémi Gaillard
9bafc25878 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-27 15:41:57 +02:00
Rémi Gaillard
17579de481 [-] FO: Fix #PSCFV-9325 all was included on 301 for root deprecated controllers 2013-06-27 15:41:37 +02:00
Damien Metzger
6368409ec6 [-] BO : fixed addslashes on tpl translations (compatibility between "slashes" and "js" parameters) #PSCFV-9427 2013-06-27 15:30:30 +02:00
Vincent Augagneur
1f5c1927c6 Merge pull request #521 from misthero/patch-1 
Update AdminCustomerThreadsController.php
 2013-06-27 06:01:40 -07:00
gRoussac
a7885fef1c Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-27 10:57:25 +02:00
gRoussac
13b7bc959e [*] BO : Fix #PSCFV-8504 carrier on invoice and delivery slip 2013-06-27 10:56:50 +02:00
Vincent Augagneur
453bb826ef [-] BO : fixed bug #PSCFV-9586 - Unable to sort CMS page in back office 2013-06-27 10:19:22 +02:00
gRoussac
7f1b44f451 [-] INSTALLER : Remove warnings 2013-06-26 18:27:02 +02:00
Rémi Gaillard
3524ccc99b Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-26 18:13:38 +02:00
Rémi Gaillard
e33e5229b4 [-] Installer: Fix some sql queries 2013-06-26 18:13:09 +02:00
gRoussac
2b94a338b8 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-06-26 18:12:09 +02:00
gRoussac
9e9a1761f5 [-] INTSALLER : Fix bug #PSCFV-8776 Mysql has gone away during upgrade 2013-06-26 18:08:05 +02:00
Vincent Augagneur
56e75d0e9a [-] CORE : fixed bug #PSCFV-8745 Contact form e-mail template with incomplete information 2013-06-26 18:01:26 +02:00
Francois Gaillard
b8df8e6fb1 [-] Classes : Db : Fixed $link 2013-06-26 17:39:53 +02:00
Vincent Augagneur
8c5c7e1bb4 [-] MO : fixed bug #PSCFV-9040 - Block CMS Multishop bug 2013-06-26 17:31:04 +02:00
Damien Metzger
4c28d49487 [-] FO : fixed remove button for free product in the cart block #PSCFV-8465 2013-06-26 16:51:45 +02:00
Damien Metzger
57dd992c28 [-] FO : fixed entities issue in javascript alerts #PSCFV-9001 2013-06-26 16:22:57 +02:00
Damien Metzger
7427efdb6f // Added addlashes for some js messages 2013-06-26 15:52:40 +02:00
Damien Metzger
19ee2c953f [*] IN : removed the possibility to choose his own storage engine, automatically select the best one 2013-06-26 14:26:37 +02:00
Rémi Gaillard
9257dc80c2 [-] BO: Fix #PSCFV-9455 stock was resetted if adv stock management is enable and product preference is submited on shop context 2013-06-26 14:17:45 +02:00
Rémi Gaillard
c01619dfe3 // Change administrator access fixture 2013-06-26 12:05:36 +02:00
Vincent Augagneur
3d2e46b14f [-] FO : fixed bug #PSCFV-9388 - newsletter is required error, showing two times 2013-06-26 11:46:02 +02:00
Vincent Augagneur
c5e65e1360 [-] BO - fixed bug #PSCFV-9435 - AdminController - processUpdateOptions does not manage required field correctly in a non-mutltishop context 2013-06-26 11:38:08 +02:00
misthero
00ee8ad4ef Update AdminCustomerThreadsController.php 
$contact->name can be an array throwing a warning Warning: preg_match() expects parameter 2 to be string when answering to a customer
 2013-06-26 10:32:54 +02:00
gRoussac
64f615a061 [-] BO : Fix warnings when product not available in Shop 2013-06-25 18:16:06 +02:00
gRoussac
699053da27 [-] FO : Fix bug #PSCFV-8412 no zipcode for countries when default country has no zip code in adress format 2013-06-25 16:17:58 +02:00
Vincent Augagneur
4627768092 [-] BO : fixed bug #PSCFV-7921 - Language selector (with flags) cant be translated 2013-06-25 15:51:24 +02:00
Rémi Gaillard
f73eb070ab // small fix 2013-06-25 15:50:36 +02:00
Vincent Augagneur
502472dfba [-] FO : fixed bug #PSCFV-7454 2013-06-25 15:47:46 +02:00
Vincent Augagneur
cc4c8bfbe7 [-] CORE : fixed bug #PSCFV-9460 2013-06-25 15:25:08 +02:00
Vincent Augagneur
b7c5201ad8 Merge pull request #512 from antoniofr/development 
[-] FO : #PSCFV-9532 remove hardcoded unidentified group number
 2013-06-25 06:06:05 -07:00