dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,959 Commits 9 Branches 19 Tags
403db40a7fab6f895b2bc0d6439b445a96cbcbd0
Commit Graph

1645 Commits

Author SHA1 Message Date
tDidierjean
403db40a7f [*] BO : #PSTEST-784 - selected attribute is now visible 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13434 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 14:50:01 +00:00
fBrignoli
07e1787cdd [-] BO : Bug Fixed #PSTESTS-672 An error has occured during currency creation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13433 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 14:49:49 +00:00
mDeflotte
c9bcaec32b [-] BO : BugFix : #PSTEST-807 : stay on the form when an error occured 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13423 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 12:00:12 +00:00
rMalie
5cce9a9d22 // Fix "you edit field for" multishop #PSTEST-796 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13422 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 10:32:45 +00:00
rMalie
748f3647ee // Fix group shop filter association in getList() and improve assoshop with Group: text 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13421 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-17 10:06:00 +00:00
rMalie
b0d24b3ae4 // Fix shop association in admin on attributes page 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13412 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-16 17:11:49 +00:00
rMalie
3c79768737 [*] Classes : table prefix is no longer required in Db::getInstance()->delete() method 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13396 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-16 14:54:52 +00:00
mDeflotte
83053fa035 // [-] BO : #PSTEST-769 - Use context instead of the Configuration::get() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13394 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-16 14:23:07 +00:00
mDeflotte
5b942b7993 [-] BO : #PSTEST-769 - The default country must be pre-selected on address list 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13393 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-16 14:13:04 +00:00
rMalie
b0590e342e // Fix default shop associations in helper shop #PSTEST-770 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13392 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-16 14:10:30 +00:00
mDeflotte
a17726f8ea [-] BO : #PSFV-503 - Fix bug with image generation 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13368 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-15 17:31:39 +00:00
rMalie
b1a1d78533 // Fix default shop associations in helper shop #PSTEST-746 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13367 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-15 16:43:32 +00:00
fSerny
da7ff75852 [+] BO : New hooks added (helpers + order history) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13349 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-15 13:54:50 +00:00
fGaillard
f0e4ba651d [*] MO : BlockCMS module 1.5 compliant + translations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13347 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-15 13:50:25 +00:00
rMalie
97c7e11df0 // Improve multishop ergonomy (new toolbar) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13333 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-15 10:04:05 +00:00
tDidierjean
8897f81335 // Fix bulk deletion of attributes 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13327 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 17:34:08 +00:00
tDidierjean
2e0d20d9f1 [-] BO : fix bug #PSFV-421 - bug with redirection after login 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13317 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 16:29:21 +00:00
aFolletete
3f5d7edf0b // fixed bug #PSTEST-552 
// Clean code

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13312 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 15:08:40 +00:00
rMalie
b2ad614fd9 // Remove shop url when a shop is deleted #PSTEST-747 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13304 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 13:50:04 +00:00
rMalie
cecc3721d4 // Improve multishop ergonomy with a link to missing url on shop list 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13303 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 13:20:17 +00:00
tDidierjean
3311fd7d25 // AdminController refactoring 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13300 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 10:47:40 +00:00
tDidierjean
c2eaa4af59 [-] BO : fix Save&Stay not working on combination page 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13298 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 10:44:08 +00:00
mDeflotte
e58ca980cd [-] Classes : #PSTEST-717 - Fix an infinite loop 
// Add missing params $products

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13293 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 10:36:53 +00:00
rMalie
bc016fc498 // Optimization on Product cache 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13283 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 09:39:18 +00:00
mDeflotte
7d64fa4d60 [-] Classes : #PSTEST-275 #PSFV-304 - Method Module::getPosition() was missing 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13279 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-14 08:35:31 +00:00
dMetzger
ec0798fe8a [-] FO : If a product is given for free in a cart rule and is already in the cart, the price is subtracted #PSTEST-715 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13275 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 17:47:40 +00:00
tDidierjean
1c6b736418 // revert wrong change ($_FILES is needed in afterImageUpload() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13274 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 17:38:03 +00:00
tDidierjean
4b9bcd5932 [-] BO : #PSTEST-705 fix scene image upload 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13273 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 17:36:34 +00:00
rMalie
e15452ce61 // Fix quick link access for multishop #PSFV-478 #PSTEST-687 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13272 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 17:22:12 +00:00
rMalie
d92c298178 // Fix redirection to index when friendly url are activated #PSFV-488 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13270 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 16:56:28 +00:00
lLefevre
fcc3b4b27d // Fix change controllers/ by controllers/front/ for list meta tags 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13267 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 15:40:23 +00:00
tDidierjean
54080062f7 // Finish removing the "id_theme in ImageType" code 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13265 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 15:35:05 +00:00
rMalie
7682d57803 // Refacto of lang functions (all code moved in Translate class) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13262 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 15:20:25 +00:00
mDeflotte
68b4b1c6bc // Improving adding address with order-opc 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13256 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 14:15:23 +00:00
tDidierjean
b9de42493c [-] BO : fix #PSTEST-718 combinations images not saved 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13254 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 13:50:37 +00:00
vAugagneur
21e8fabafb [-] BO : fixed small image duplication in carrier listing 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13252 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 13:08:06 +00:00
rMalie
43d56e2faf // Fix configuration when multishop is disabled 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13246 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 10:08:59 +00:00
rMalie
ecc49b160e // Replace 'server' with 'host' in PDO DSN #PSFV-442 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13245 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 10:00:55 +00:00
rMalie
a5d5173438 // Fix $useSSL retro-compatibility 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13239 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-13 09:19:10 +00:00
mDeflotte
bea0732df7 // Allow query from Db::excuteS, to start by an open parenthese 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13203 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-10 08:20:06 +00:00
dMetzger
a056a78177 // A few dozens queries less on every pages... 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13197 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-09 17:15:05 +00:00
vChabot
241ddaf652 [-] BO : BugFix : #PSFV-462 : category tree view displayed according to he shop context 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13168 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-09 09:49:42 +00:00
rMalie
bf6b6cd5ca // Fix Tools::toCamelCase() 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13156 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-09 09:13:11 +00:00
rMalie
1cd38d2621 // Fix SpecificPrice::update() #PSFV-473 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13155 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-09 08:57:52 +00:00
tDidierjean
64b14de8d2 // Fix AdminController translations not being parsed 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13151 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-08 17:58:35 +00:00
tDidierjean
15b4c98b3a // Fix some helper translations 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13149 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-08 17:38:14 +00:00
aKorczak
bb170150c5 [-] WS : Fix bug on translated_configurations entity 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13146 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-08 17:24:05 +00:00
lLefevre
78f345fe98 // Update list of emails files which are native 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13145 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-08 17:20:26 +00:00
aKorczak
c891bbc049 [*] WS : Add entity specific_prices 
[*] WS : Add entity specific_price_rules


git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13143 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-08 16:46:57 +00:00
aKorczak
de544a8be4 [-] WS : Fix xlink 
[*] WS : Add entity tax_rule_groups
[*] WS : Fix ObjectModel issue
[*] WS : Delete sqlId not used
[*] WS : Fix entity configurations
[*] WS : Fix entity translated_configurations


git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13138 b9a71923-0436-4b27-9f14-aed3839534dd
 2012-02-08 15:42:53 +00:00