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

80 Commits

Author SHA1 Message Date
rMalie
5a6fe7aff2 // Set context to single shop if an employee have auth on only one shop #PSCFV-2182 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15144 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-10 08:50:39 +00:00
rMalie
ccfef659c9 // Multishop interface reworked 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15121 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-09 15:05:39 +00:00
tDidierjean
0416403b37 [-] BO : fix bug #PSCFV-2251 - http_build_query must fix arg_separator 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15104 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-09 13:39:19 +00:00
tDidierjean
70ca2d47c3 // remove deprecated method 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15091 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-09 09:29:52 +00:00
vAugagneur
5057379ded [-] BO : fixed bug #PSCFV-2217 - Assign new zone in BO > Localisation > States generate an error 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15089 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-09 09:02:02 +00:00
lLefevre
13c2b91ff6 // Now translation in validateRules() method uses sprintf 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14832 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-24 08:28:10 +00:00
rMalie
278ec73d66 // Fix BO connection bug with employees auth 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14807 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-23 12:07:26 +00:00
rMalie
60a140c91f // Fix bug on auths for sub employees #PSFV-849 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14804 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-23 09:38:24 +00:00
lLefevre
b5d6b66f24 // Refacto AdminTranslationsController : now you can translated your files by themes 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14799 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-23 08:11:54 +00:00
rMalie
264885203d // Remove Shop::getTotalShopWhoExists (rofl ...) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14761 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-19 09:42:26 +00:00
tDidierjean
dac784f83e [-] BO : fix #PSTEST-1175 - duplicate text in toolbar in AdminAttributesGroups 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14755 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-19 08:40:13 +00:00
tDidierjean
41d8630e97 [*] BO : #PSFV-865 - it is now possible to use drag and drop positions in custom controllers using HelperList 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14740 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-18 15:48:38 +00:00
lLefevre
b33b8642b6 // Fix error path image tab 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14736 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-18 15:11:32 +00:00
rMalie
ba4c5dbb18 // Some optimization #PI-121 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14723 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-18 09:57:19 +00:00
lLefevre
2ae5cf56ab // Fix small bug 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14722 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-18 09:50:48 +00:00
lLefevre
5b912196b0 // Fix file_exists errors on the retrocompatibility image tab 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14716 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-18 09:26:31 +00:00
tDidierjean
a71704fb4e [-] BO : fix #PSTEST-1169 broken processing of list filters 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14688 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 15:08:36 +00:00
rMalie
0c2dd0cd2f // MERGE product_multistore branch : product fields are now editable per shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14682 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 13:32:12 +00:00
tDidierjean
ca71733f00 [*] BO : #PSTEST-1157 - Ajax deletion of virtual file 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14668 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-17 08:07:35 +00:00
rGaillard
3c2f9de5ba // small fixes 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14651 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-16 09:47:34 +00:00
tDidierjean
244a2f9102 [*] BO : #PI-123 - toolbar and page title refactoring 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14594 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-12 08:34:38 +00:00
tDidierjean
30b8e697c7 // change page time load calculation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14567 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-11 11:53:44 +00:00
lLefevre
07e7391036 [-] Bo : Fixed #PSTEST-1055 & #PSFV-768 : update call identifier 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14533 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-06 14:07:08 +00:00
tDidierjean
758e8d07a2 // Rename fieldsDisplay to fields_list part1 (timeout) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14376 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-29 16:26:54 +00:00
tDidierjean
1caed40bd6 // Fix missing rename 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14375 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-29 16:17:39 +00:00
tDidierjean
59547b2914 // Renaming options to fields_options 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14374 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-29 16:14:14 +00:00
vSchoener
2a2b6c43dc [-] BO : Fixed bug #PSFV-282. Add back the currentIndex and token global value for the modules compatibility 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14332 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-28 12:52:11 +00:00
tDidierjean
d752b192f5 // Refactoring: remove $token arg from process functions 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14269 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-26 15:25:36 +00:00
lLefevre
eff611403c [-] BO : #PSTEST-1046 : Fix translation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14244 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-23 16:03:43 +00:00
rMalie
5b9de8ac00 // Refacto generateShopList() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14183 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-15 09:33:23 +00:00
tDidierjean
9515faa556 // Fix notice with processBulkDelete and invalid input 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14154 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-14 14:03:26 +00:00
lLefevre
0e9e23aaae // Fix update english key of translations in all files 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14143 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-14 12:25:51 +00:00
tDidierjean
1341dcf329 [*] BO : #PSFV-481 - Refactor HelperList position management 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14099 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-13 16:22:23 +00:00
fGaillard
7bf4922120 // Fix JS log 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14043 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-12 14:52:09 +00:00
fSerny
b542939c9f [-] BO : Bug fix #PSTEST-1014 #PSTEST-966 - Wrong call of smarty translation function 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14041 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-12 14:50:14 +00:00
mDeflotte
ec1671e226 [-] BO : #PSFV-646 - Fix problem with button save & preview 
// Replace some "else if" by "elseif"

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14030 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-12 10:32:07 +00:00
tDidierjean
60a6855ec8 // Fix some BO access check on actions 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13965 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-08 13:30:09 +00:00
tDidierjean
aa50294a44 [-] BO : fix bug #PSFV-529 - AdminGeolocalisation : isCleanHtml control on checkbox 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13961 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-08 10:39:15 +00:00
rMalie
088a86df3c // Fix minor bug on shop urls #PSTEST-911 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13906 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-06 16:40:07 +00:00
rMalie
c5d04bb467 // Fix minor bug on shop urls #PSTEST-911 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13905 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-06 16:39:02 +00:00
rMalie
0c40a13560 // Remove $noTabLink in AdminController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13830 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-05 10:00:17 +00:00
rMalie
0f865fd2d6 [*] BO : reorganization of admin tabs 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13820 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-03-02 14:44:07 +00:00
tDidierjean
eae3bc2d84 // rename $toolbar_fix to $toolbar_scroll part1 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13711 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-28 17:38:42 +00:00
tDidierjean
3d402f6b4f // fix AdminMeta options form and toolbar 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13709 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-28 17:28:35 +00:00
rMalie
e5b646b0f8 // Fix multishop context in BO 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13648 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-27 17:14:33 +00:00
dMetzger
f6b91055d5 [+] BO : added a new option for the products : do they appear in the catalog, in the search, both or neither 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13638 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-27 15:55:40 +00:00
rMalie
e422445e65 // Display of payment modules per shop #PSTEST-833 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13625 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-27 15:18:51 +00:00
rMalie
c2cef61a5a // Replace shop->addSqlRestriction() and shop->addSqlRestrictionOnLang() by static versions 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13618 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-27 12:15:30 +00:00
rMalie
1c2f174bdb // Improve multishop_context in AdminController and rename shop->getListOfID() by Shop::getContextListShopID() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13615 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-27 09:49:19 +00:00
rGaillard
2408b4ac5f [+] Core : products and carriers tax rules are associated to shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13586 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-24 09:26:18 +00:00