Commit Graph

64 Commits

Author SHA1 Message Date
rMalie
90b73cb6ab // Fix z-index on blockcart add product animation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13832 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-05 10:12:50 +00:00
dMetzger
d5c2094706 // Temp fix for cart rule and multi-shipping - not fully functionnal yet but still better than before
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13771 b9a71923-0436-4b27-9f14-aed3839534dd
2012-03-01 09:45:39 +00:00
rMalie
9a109487a1 // French translations (by Xavier)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13761 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-29 17:21:05 +00:00
rMalie
2454cd7863 // Welcome 2012²
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13573 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-23 16:33:10 +00:00
dMetzger
7e73e088e5 [-] FO : ajax cart now display cart rules correctly #PSTEST-724
// Small addition to the controller override

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13527 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-22 11:02:49 +00:00
mMarinetti
10b3e3d8d3 // Welcome 2012
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13520 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-22 09:28:22 +00:00
rMalie
2d6fd402c9 // French translations (by Xavier)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13342 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-15 13:22:27 +00:00
vChabot
64cdc4aea0 // report bugfix from saving customization with combination
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13226 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-10 14:08:03 +00:00
dMetzger
3a0862130f // Deprecated code removed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13185 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-09 15:39:14 +00:00
dMetzger
5f95dda75d // Small display fixes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@13181 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-09 15:07:52 +00:00
mDeflotte
45a22cf98e [-] BO : #PSTEST-637 - Removing a product from ajax-cart don't refresh the cart summary
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12966 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-03 10:42:05 +00:00
rMalie
7ebff4d7ae // Modules langs files moved to modules/*/translations/ folder
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12900 b9a71923-0436-4b27-9f14-aed3839534dd
2012-02-01 14:42:15 +00:00
mDeflotte
b2293bb146 [-] MO : #PSTEST-606 - Fix Bug with product description line of ajax cart not removed when the product is removed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12827 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-31 09:15:44 +00:00
rMalie
9c823e3cdd // Normalize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12719 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-26 14:44:24 +00:00
aFolletete
41a0711869 [-] MO : fixed javascript bug on mouse event
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12558 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-19 14:09:12 +00:00
sThiebaut
2c9bd617d6 // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12225 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-06 09:48:52 +00:00
mDeflotte
f1dabc398e [-] MO : #PSFV-236 - Fixed little problem with form vars named "ajax"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12189 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-05 14:09:51 +00:00
bMancone
631309d2d2 // #PSFV-124 Licenses update
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@12137 b9a71923-0436-4b27-9f14-aed3839534dd
2012-01-04 14:54:25 +00:00
mDeflotte
d1f8e02485 // Fixing problems with blockcart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11642 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 16:56:10 +00:00
mDeflotte
5866679f7c // Fix blockcart removing products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11540 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 18:09:48 +00:00
mDeflotte
9637f7f409 // BugFix : Problems with blockcart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11456 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 09:52:38 +00:00
mDeflotte
5d941ccc26 // BugFix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11247 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 10:50:42 +00:00
rMalie
f784411c4b // Remove useless prefix in blockcart json template
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10966 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 09:16:58 +00:00
sThiebaut
5b1642b26e // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10952 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 17:22:04 +00:00
rMalie
d56cb00d8d // Remove Module->templateAssign() from modules (use $this->smarty->assign() instead)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10914 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 14:04:35 +00:00
sThiebaut
fe8a28ed54 // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10907 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 13:40:51 +00:00
mMarinetti
203b5ae6ad // fix new theme / old php in modules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10878 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 16:41:22 +00:00
mMarinetti
810dab5d27 // new theme fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10869 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 16:10:22 +00:00
mMarinetti
9cc30dc3fe [+] Project : default theme added
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10862 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 15:24:40 +00:00
mDeflotte
a3b64f3253 // BugFix: removing a bad "return"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10706 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-28 13:54:11 +00:00
mDeflotte
eab460df2d // BugFix id_carrier in cart not defined + choosing address delivery for multishiping on opc
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10389 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-22 09:28:22 +00:00
rMalie
9d10de0848 // Merge -> 10309
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10333 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 11:05:10 +00:00
vKham
c441358b40 // new icon for adminhome, adminmodules and header
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10318 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-21 09:21:26 +00:00
mDeflotte
5e6ab08a00 // Merging multishipping branche on 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10259 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-18 11:13:31 +00:00
aFolletete
5553d55063 // Module changes for new native template
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10093 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-14 10:56:15 +00:00
vChabot
568327849c [*] FO : combination link from product page are now the same as the combination link from blocklayered
// Cart is now accepting the combination link

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10028 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-10 10:45:19 +00:00
dMetzger
486622522c [+] Project : Vouchers are now replaced by cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9771 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-01 18:50:42 +00:00
rMalie
42564ca3d0 // Merge -> revision 9435
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9438 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-19 08:14:42 +00:00
rMalie
45645f1f50 // Merge -> revision 9352
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9354 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-14 08:20:54 +00:00
rMalie
1b6d0d1be3 // Merge -> revision 8800
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8808 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 14:30:06 +00:00
rMalie
4181a8ea5b // Rename Module->smartyAssign to Module->templateAssign
[+] Front: Add module controller + url dispatch for modules

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8738 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-23 13:50:33 +00:00
rMalie
2dbea99b61 [+] MO: Add Module->smartyAssign method, in order to assign variables with module name as prefix in module's templates
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8718 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-22 12:05:49 +00:00
aFolletete
4bacf38897 // revert
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8505 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-12 15:25:21 +00:00
aFolletete
3eff951265 [+] Project : adding Features detachables in order to improve performance
// clean code

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8328 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-03 17:21:32 +00:00
lCherifi
2a1e42606b integration new theme standard
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8168 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-23 14:25:09 +00:00
rMalie
52d1d13891 // Merge -> revision 8014
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8021 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-11 12:00:05 +00:00
rMalie
d1d4d57eca // Revert normalization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8019 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-11 10:20:59 +00:00
rMalie
f62cdb1963 // Normalization
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8017 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-11 09:58:20 +00:00
tDidierjean
5d090a25b3 // Context part 27
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7812 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-29 14:29:57 +00:00
tDidierjean
d80c7b5ba8 // Context part 26
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7804 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-28 16:37:50 +00:00