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

144 Commits

Author SHA1 Message Date
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
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
dMetzger
7cb052a52b [-] FO : improvements with OPC, Cart Rules and refresh #PSCFV-377 #PSCFV-2196 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15118 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-09 14:36:53 +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
vChabot
807252f5af [-] FO : BugFix : #PSCFV-2243 : CCC optimization on scripts compile each script two times 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15103 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-09 13:30:12 +00:00
fSerny
8947a4be80 [-] FO : Center column is now in full size when left column is not displayed #PSCFV-1497 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15093 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-05-09 09:50:33 +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
rMalie
d1e8a28f2b // Move and refacto Tools::getMetaTags(), Tools::getHomeMetaTags() and Tools::completeMetaTags() to Meta class 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14938 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-27 08:46:52 +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
lLefevre
5c6e33b72a [*] BO : #PSFV-832 : change the type of the property "ajax" 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14655 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-04-16 13:24:28 +00:00