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

167 Commits

Author SHA1 Message Date
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
mDeflotte
b2a616aba3 [-] FO : #PSCFV-3121 - New JS vars baseUri. This vars must be used instead of baseDir for ajax queries. 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16326 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-11 08:48:28 +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
mDeflotte
5068e5a413 // Add class on body to hide / show left and right column 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16182 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-03 07:45:24 +00:00
mDeflotte
447d86b6c6 [-] FO : #PSCFV-2951 - Fix bug with dispatcher and route rule with multilanguage 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16175 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-07-02 14:16:47 +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
rGaillard
b2b29c4270 // Performance optimizations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16024 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-14 14:11:11 +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
mDeflotte
8562c2c9b4 // Fix bug with redirection on IE and dev mod enable 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15972 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-11 15:21:38 +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
rMalie
dde916a786 // Fix useless instance of modules in FrontController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15918 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-07 12:03:54 +00:00
rGaillard
ec59cb25c6 // small fix 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15887 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-06 17:10:24 +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
rMalie
e01aa221ff // Fix SSL with multishop #PSCFV-2646 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15806 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-04 08:59:10 +00:00
rMalie
4f4ac2f26c // Fix SSL with multishop #PSCFV-2646 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15805 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-06-04 08:52:42 +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
0857f92f7a // Norm and doc for Shop class 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15756 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-30 09:50:10 +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
dMetzger
859f360783 // Autoassignation of the cart rule when log out 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15610 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-22 10:20:36 +00:00
rGaillard
d422dae42a // Delete isXmlHttpRequest 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15523 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 15:14:29 +00:00
vSchoener
1dfcca6270 [-] FO : Fix SSL redirection 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15507 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 14:02:24 +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
aFolletete
67c9cff587 // add comment 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15481 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 09:42:19 +00:00
aFolletete
f41b5ba922 [+] Classes : include new method isXmlHttpRequest() in Controller class, allows to make ajax request without ajax=1 in GET parameter 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15479 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-21 09:38:11 +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
b5bc94f78c // Cart must not be null when given to a module 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15419 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-19 10:32:38 +00:00
dMetzger
1f555e5111 // Keep the behavior of the 1.4 for displayMaintenancePage() (retro-compatibility) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15418 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-19 10:25:43 +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
mDeflotte
2fd7807ae5 // Fix bug with js inclusion 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15394 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-18 15:25:33 +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
tDidierjean
4c1c549c8a [-] BO : fix #PSCFV-2377 - missing JS files when saving product with errors 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15338 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-16 13:31:44 +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
aFolletete
8a766fb104 // clean code 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15171 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-10 13:33:38 +00:00
aFolletete
c1b590804a // Fix uses of $cookie var in CompareProduct 
// Fix little issue on Geolocation
[-] FO : Fix issue on compare product when cookie->id_compare value is invalid

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15170 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-10 13:32:56 +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
vAugagneur
4f3e19ed5f //remove mobile theme 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15138 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-09 20:57:15 +00:00