dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,949 Commits 9 Branches 19 Tags
4a013cf5377654536a4e4875fa27fa236a89c3ce
Commit Graph
20949 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
gRoussac 472dc8c27d [-] MO : Blocklayered follow up https://github.com/PrestaShop/PrestaShop/commit/a6e67b078e067445eef358e907649e843a1dc26a#commitcomment-4538556 2013-11-07 17:59:04 +01:00
Jerome Nadaud 4d1a4393a9 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-07 17:58:32 +01:00
Jerome Nadaud 8a4c036655 // Fix cache problem 2013-11-07 17:58:17 +01:00
Javsmile 99ad6481e6 Update productcomments.php 
This little addition fix the problem for enlight the stars in the hookproductTab whe you disable or make an exception of the hookproductOutOfStock with the product file.
 2013-11-07 17:53:47 +01:00
Rémi Gaillard f5c133f6e0 // small fix 2013-11-07 17:50:28 +01:00
Rémi Gaillard 2d609ec93c // merge fixes 2013-11-07 17:43:26 +01:00
Kevin Granger 51e962195c // This Controller needs a toolbar and a title 2013-11-07 17:15:40 +01:00
Rémi Gaillard e3cfacb90e // link to employee default tab and not index 2013-11-07 17:00:55 +01:00
Jerome Nadaud 01d8376ee7 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-07 16:48:56 +01:00
Fabio Chelly 92cf31e5c3 [-] MO : Fixed #PNM-1600 by modifying getPageLink() 2013-11-07 16:46:30 +01:00
Jerome Nadaud b51b388eaa // Blockcategories thumnail uploader fix 2013-11-07 16:44:55 +01:00
Jerome Nadaud 18718792be // Uploader helper part 3 2013-11-07 16:42:00 +01:00
Fabio Chelly fa7d44d67f Merge remote-tracking branch 'origin/development' into development 2013-11-07 16:39:26 +01:00
Fabio Chelly b9c4b5d2a7 [-] FO : Prevents warning in safePostVars when $_POST has been unset 2013-11-07 16:38:53 +01:00
Gregory Roussac fbd28f3e49 Merge pull request #942 from Jacky75/20131107_payment_and_groups 
[-] FO : in multistore payment module restrictions by customer group was...
 2013-11-07 06:39:57 -08:00
Daniele Giachino 8c8340db4e [-] FO : in multistore payment module restrictions by customer group was not applied to specific shop 2013-11-07 15:18:59 +01:00
gRoussac 7cc351e83d [-] BO : Fix bug #PSCFV-10932, ranges input disabled on load 2013-11-07 15:11:30 +01:00
Jérôme Nadaud 75171c77dd Merge pull request #940 from PhpMadman/bootstrap 
// Fixes "Notice: Undefined index: nb_results in" when searching
 2013-11-07 05:59:36 -08:00
PhpMadman c6676197e5 // better syntax 2013-11-07 14:57:13 +01:00
PhpMadman 0a31ab8202 added check for empty value 2013-11-07 14:51:05 +01:00
Kevin Granger 3eb9a7e772 // update bootstrap + add enquire.js 2013-11-07 14:19:23 +01:00
Kevin Granger 63e31a4585 Merge pull request #939 from djfm/bootstrap 
Translations (EN) / Mails / Fix Column
 2013-11-07 05:08:16 -08:00
djfm 1bb550cf63 // allow hook exceptions on product comparison page 2013-11-07 13:01:54 +00:00
djfm 30624fabd2 Merge branch 'bootstrap' of https://github.com/djfm/PrestaShop into bootstrap 2013-11-07 12:27:58 +00:00
djfm 598034efb4 // English 2013-11-07 12:27:48 +00:00
djfm 8cb761078b // English 2013-11-07 12:26:55 +00:00
gRoussac 91cde1ab3a [-] BO : getCMSPages to associated shop in cmscontroller 2013-11-07 12:09:58 +01:00
djfm f83c50b264 // one is one 2013-11-07 11:08:15 +00:00
Vincent Augagneur 9e76f82fb5 //merge 2013-11-07 12:06:58 +01:00
Vincent Augagneur 3c31f1a07f //dashconfig errors return 2013-11-07 12:05:03 +01:00
gRoussac e6f9f806bf [-] FO : Fix bug #PSCFV-10892, getCMSPages by id_shop thnaks @jd440 2013-11-07 12:03:35 +01:00
djfm 3af230118b // English 2013-11-07 10:27:50 +00:00
gRoussac fc4a660f76 [-] BO : Fix bug #PSCFV-10666 product_supllier currency set to 0 2013-11-07 11:24:32 +01:00
Jerome Nadaud c7249bcc84 // Done in 1.5.6.1 2013-11-07 11:05:39 +01:00
djfm 8ef9064355 Merge branch 'bootstrap' of https://github.com/djfm/PrestaShop into bootstrap 2013-11-07 10:02:24 +00:00
djfm 3d22303b90 // sprintf 2013-11-07 10:01:10 +00:00
Jerome Nadaud f3147b4e57 Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development 2013-11-07 09:47:47 +01:00
PhpMadman 2f1a82628c // Fixes "Notice: Undefined index: nb_results in" 2013-11-07 09:00:00 +01:00
Kevin Granger 866e7f831b // fixs highlight search 2013-11-06 19:26:22 +01:00
gRoussac 514c087962 [*] BO : New import csv files 2013-11-06 18:38:32 +01:00
gRoussac 00887942d3 // preg_last_error not available on every stacks 2013-11-06 18:32:39 +01:00
gRoussac afe6c9bc6f // missing dir sep on is_dir (open_basedir) 2013-11-06 18:23:01 +01:00
Kevin Granger 93717e910b // Repairs sake of performance on tables with many lines. 2013-11-06 18:15:17 +01:00
gRoussac fc6041fa33 [-] IN : bad path in create multistore 2013-11-06 18:06:19 +01:00
gRoussac 76b03856e2 // missing trailing dir sep 2013-11-06 17:33:18 +01:00
djfm 1aadb10fb2 // English emails 2013-11-06 16:20:19 +00:00
Rémi Gaillard ef5779f63f // d321b9a5bc 2013-11-06 17:11:31 +01:00
Jérôme Nadaud d0522417eb Merge pull request #937 from PhpMadman/DiscountPrice 
[*] FO : Added possibility to display new price instead of quantity discount
 2013-11-06 08:06:16 -08:00
Rémi Gaillard 50c95f568c Merge pull request #935 from jeckyl/patch-4 
Update cart-summary.js
 2013-11-06 07:01:02 -08:00
Kevin Granger df865eb827 Merge pull request #936 from TMMeilleur/bootstrap 
// improved  scss variables
 2013-11-06 07:00:31 -08:00