dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,989 Commits 9 Branches 19 Tags
0af76e01fb303fa6eeb7ee7a78755d2bc8dfd708
Commit Graph

6950 Commits

Author SHA1 Message Date
Rémi Gaillard 2fe12b965b [-] Core: add possibility to choose the position of your css files 2013-11-13 15:31:29 +01:00
Vincent Augagneur 5963871a01 //small fix 2013-11-13 11:40:13 +01:00
gRoussac c69688cc11 [-] BO : Fix bug #PSCFV-10990 bad version comparison for ps_versions_compliancy 2013-11-13 10:14:21 +01:00
Rémi Gaillard 75df12dd94 [-] Core: Group::getCurrent() return the default customer group of the shop if default customer group is not associated to shop 2013-11-12 18:49:52 +01:00
gRoussac 4d327a537f [*] FO : addTextFieldToProduct without Line feed, follow up https://github.com/PrestaShop/PrestaShop/pull/962#issuecomment-28294571 2013-11-12 18:28:42 +01:00
gRoussac 036e2362c9 [+] CORE : Fixed cache_id 2013-11-12 17:09:38 +01:00
Fabio Chelly fc193d5c8b Merge remote-tracking branch 'origin/development' into development 2013-11-12 16:36:19 +01:00
Rémi Gaillard 75e6a03591 // small fix 2013-11-12 16:38:34 +01:00
Fabio Chelly dd05692400 [-] FO : Fixed errors when calculating most selled products from footer link 2013-11-12 16:36:07 +01:00
Rémi Gaillard 175da3ecf6 Merge pull request #965 from djfm/IETF 
[*] LO : Fix PSCFV-10876: use IETF code to set language of shop, not 'is...
 2013-11-12 06:05:10 -08:00
fram 743c4f4607 [*] LO : Fix PSCFV-10876: use IETF code to set language of shop, not 'iso' code, allows to distinguish between chinese variants etc. 2013-11-12 14:59:36 +01:00
Rémi Gaillard 8be339463d // small fix 2013-11-12 12:36:51 +01:00
Jerome Nadaud 0430d09753 // Better php def for Page header title edit and view 2013-11-12 11:36:26 +01:00
Jerome Nadaud ec37efdf8b // Add identifier name 2013-11-12 11:30:01 +01:00
Jerome Nadaud 94817a9371 // ooops 2013-11-12 11:16:31 +01:00
Jerome Nadaud db0e1e41a9 // Small Fix 2013-11-12 11:10:55 +01:00
Jerome Nadaud 41196f3c5f // General modification for view and edit title 2013-11-12 11:06:20 +01:00
gRoussac c1969028f2 [-] FO : Customized meesage with carriage return follow up #962 2013-11-12 10:41:19 +01:00
Jerome Nadaud 3931914203 // Add Modernizr and Modernizr-loads check and loading for unsuported browsers 2013-11-12 09:54:20 +01:00
gRoussac e2d8a33a81 [*] FO : Cache on getDiscountsCustomer, follow up https://github.com/PrestaShop/PrestaShop/pull/960 2013-11-11 14:02:11 +01:00
gRoussac a7869a1f06 [*] CORE : Remove duplicate SQL queries 2013-11-11 13:41:23 +01:00
gRoussac 3f9338e13d [*] CORE : Cache store for isAssociatedToShop::isAssociatedToShop 2013-11-11 01:59:10 +01:00
gRoussac 38da826671 [-] FO : getTaxCalculator bad cache key again // sorry about that 2013-11-11 01:37:20 +01:00
gRoussac fee461fdf1 [*] FO : Set cache for StockAvailable::getQuantityAvailableByProduct 2013-11-11 01:00:55 +01:00
gRoussac 7e93b2cffd [-] FO : getTaxCalculator bad cache key 2013-11-11 00:13:35 +01:00
Jerome Nadaud a3082be2db // Remove unnecessary function 2013-11-08 17:53:26 +01:00
Jerome Nadaud 217a79eeae // Unify thumb param in files options 2013-11-08 17:49:56 +01:00
Jerome Nadaud ef469d7782 // Move spin and ladda js to products controller 2013-11-08 17:47:09 +01:00
Jerome Nadaud 5afe733e13 // Small fix on HelperUploader 2013-11-08 16:53:32 +01:00
Francois Gaillard 3b7387ffe8 [-] Classes : Hook - Installer & context shop id 2013-11-08 11:00:14 +01:00
Kevin Granger 42af175d22 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 2013-11-07 21:49:11 +01:00
Kevin Granger 402221ad0f // load enquire.js 2013-11-07 21:48:17 +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 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
djfm 1bb550cf63 // allow hook exceptions on product comparison page 2013-11-07 13:01:54 +00:00
gRoussac e6f9f806bf [-] FO : Fix bug #PSCFV-10892, getCMSPages by id_shop thnaks @jd440 2013-11-07 12:03:35 +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
Jerome Nadaud 0c1b77b3da // Fix Combinations list actions button problem 2013-11-06 12:18:52 +01:00
Jérôme Nadaud 54db0b705c Merge pull request #923 from PrestaEdit/1.6.x-fancybox 
//remove unnecessary addCSS (fancybox)
 2013-11-06 00:31:57 -08:00
PrestaLab b2e5c6090d Fixed tags with UTF-8 chars 
Fixed error Tag->Name is not valid if tag in non latin chars
 2013-11-05 23:33:44 -08:00
Kevin Granger 5ec5215919 // UI modules fixs 2013-11-05 18:17:39 +01:00
Damien Metzger a31dbeb68e // Fixed bootstrap mode for modules 2013-11-05 17:29:51 +01:00
Kevin Granger e702af6a67 Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap 
Conflicts:
	admin-dev/themes/default/css/admin-theme.css
 2013-11-05 16:42:09 +01:00