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

117 Commits

Author SHA1 Message Date
vAugagneur
8b459e499e //remove unused code 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16559 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-25 07:09:36 +00:00
dMetzger
a90af8cd44 // Quick patch for multishop_specific / need to be check by vAugagneur #PSCFV-3329 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16556 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-24 17:48:18 +00:00
vAugagneur
7eec6c7294 //fixed multishop CRUD bug 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16555 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-24 16:45:52 +00:00
lLefevre
810692e577 [-] BO : fix #PSCFV-3244 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16467 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-18 09:17:33 +00:00
rGaillard
a606873630 [-] BO: Fix some bugs on advanced stock management 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16446 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-16 18:29:34 +00:00
vAugagneur
ba1e9b59e5 [-] BO : fixed bug #PSCFV-3202 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16442 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-16 15:35:32 +00:00
dMetzger
61d4e45a1a [-] BO : fixed problem with case sensitive path #PSCFV-3179 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16381 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-12 15:15:12 +00:00
lLefevre
9bc7869e2b [*] TR : update English translations key for Errors 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16371 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-12 10:14:41 +00:00
lLefevre
75cbe6f6ec [*] TR : update English translations key for Back Office 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16369 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-12 10:04:56 +00:00
dMetzger
5761c8af29 [-] BO : fixed access rights in employee permissions #PSCFV-3157 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16359 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-12 07:33:27 +00:00
dMetzger
9fae45b209 [-] BO : advanced stock management should not appear when the advanced stock management is deactivated #PSCFV-3141 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16338 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-11 12:47:29 +00:00
dMetzger
649cb9af43 // Changed the name of a multishop variable to multishop_specific, in order to avoid confusion 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16293 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-09 15:48:22 +00:00
vChabot
7c160a8073 [-] BO : BugFix : #PSCFV-2965 : Localization : updating default currency does not change currency on BO 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16289 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-09 14:18:12 +00:00
dMetzger
647070205b [*] BO : Added an override capability for the admin templates 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16288 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-09 14:12:37 +00:00
rGaillard
788364120e // ajax.php clean and bug fixes 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16035 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-15 13:22:07 +00:00
vChabot
021272870f [-] BO : BugFix : #PSCFV-2798 : Multistore : BUG on the "modify products page" with another shop device 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16010 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-13 13:23:52 +00:00
lLefevre
133a92fd40 [-] BO : #PSCFV-2716 : Fix memory limit when upload image file 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15919 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-07 12:12:41 +00:00
rGaillard
2bce691ae8 // Improve performance and bug fixes 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15882 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-06 16:22:48 +00:00
vAugagneur
4179bc4d74 //added bulk action for enable or disable item 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15822 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-04 12:00:09 +00:00
fBrignoli
00047b3bea // toolbar one more time 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15804 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-04 08:41:31 +00:00
rMalie
b6f84715b6 // Hide checkbox in configuration multishop when employee manage only 1 shop #PSCFV-2649 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15800 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-04 07:49:20 +00:00
rMalie
5cc66edb28 // Filter list of entities per shop in admin if employee is not super admin #PSCFV-2525 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15749 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-30 08:22:48 +00:00
fBrignoli
ec368446f4 [-] BO : Bug Fixed #PSCFV-2555 - AdminController with Options: Add new button turns into Save 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15738 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-29 13:24:35 +00:00
lLefevre
122465b198 [-] BO : fix #PSCFV-2467 : Now, You can update your theme in AdminThemes 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15490 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 12:22:54 +00:00
vChabot
b71fee03d1 [-] BO : BugFix : #PSCFV-2440 : Impossible to delete a shop with share option 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15431 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-19 12:23:58 +00:00
dMetzger
df97a11ac8 [-] BO : admin tab without multishop classes couldn't be displayed #PSCFV-2427 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15410 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-19 09:25:25 +00:00
rMalie
b635abaf30 // Fix admin carriers multishop bug #PSCFV-2380 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15397 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-18 15:44:46 +00:00
rMalie
a37dbc1e44 // Fix lot of multishop bugs (updateAssoShop reworked, remove multishop property for country / zone / currency / carrier, getList()) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15386 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-18 14:54:37 +00:00
rGaillard
66c9b52d43 // Fix product stocks on multishop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15379 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-18 14:32:29 +00:00
fSerny
e18bcf9733 [*] PROJECT : Adding hook on FrontController and AdminController SetMedia method 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15361 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-17 17:55:01 +00:00
vChabot
8e871f10ac [-] BO : BugFix : #PSCFV-2337 : Multishop : Attributes and values : problem creation attribute 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15328 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-16 09:05:23 +00:00
vChabot
42b3e483b7 // little fix sql categories and product 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15307 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-15 09:46:04 +00:00
vChabot
f92adc9626 [-] BO : Categories do not appear in allshop context 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15302 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-15 08:47:36 +00:00
lLefevre
897c6acb82 [-] FO : #PSCFV-2151 : Translations of errors are connected width sprintf() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15265 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-14 11:45:41 +00:00
rMalie
f91dc64cad // Fix admin controller 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15212 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-11 09:55:21 +00:00
jObregon
825b3a0057 [-] BO : Check if store is set. 
[-] BO : #PSCFV-2164 Added description for Cache options, and fixed links
[-] FO : #PSCFV-2138 Removed * on Home Phone (it's not a required field)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15184 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-10 15:04:16 +00:00
rMalie
a54244de89 // Hide "my shop" in quick select if no url created for shop 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15162 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-10 10:04:44 +00:00
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