Commit Graph

2470 Commits

Author SHA1 Message Date
rGaillard d4f2bbc32b // Fix CMS getRecurseCategory in multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11551 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 20:24:44 +00:00
rMalie b3f683ea38 // Fix bug in search
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11550 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 20:21:58 +00:00
rGaillard 9f44210d82 // watermark is now multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11549 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 20:14:46 +00:00
tDidierjean 9b449a8350 // More translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11548 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 20:08:27 +00:00
mMarinetti cc91b4bd60 // removed useless Tools::displayError()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11547 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 19:58:01 +00:00
mMarinetti 0ace4281df // fix unique key in shop_url table
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11546 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 19:48:06 +00:00
rGaillard 22915d5b12 // Revert AdminShop categories
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11544 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 19:35:07 +00:00
bMancone e960e9c413 // translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11543 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 18:39:49 +00:00
bMancone 006e3ed14e // translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11542 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 18:36:27 +00:00
vKham c3dde0b518 // add stylesheet stats, commandes, new icon back to list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11541 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 18:10:07 +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
vSchoener f182be7896 // update translation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11539 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 18:07:28 +00:00
fBrignoli d41ea63e31 // FPDF removed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11538 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 18:06:41 +00:00
vChabot 8d159c06da // translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11537 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 17:59:07 +00:00
aFolletete 8aa88f4aab // add french translations for AdminOrders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11536 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 17:51:37 +00:00
vChabot 0a3803c941 // translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11535 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 17:50:52 +00:00
bMancone 2b9f2027f5 // fixed homeslider
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11534 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 17:46:31 +00:00
vSchoener bc6b960a80 // update translation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11533 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 17:45:07 +00:00
vSchoener 77545868c3 // update translation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11532 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 17:43:42 +00:00
mDeflotte cfd6918b70 // Fix smarty variable conflict
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11531 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 17:43:34 +00:00
vSchoener a4956730c3 // update translation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11530 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 17:37:50 +00:00
vSchoener 4cd47049fa // update translation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11528 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 17:33:25 +00:00
tDidierjean a5f4bb7eec // FO translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11527 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 17:33:25 +00:00
vChabot f402b12ce3 // translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11526 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 17:30:42 +00:00
fSerny b204c0f896 [*] BO : Native modules are now downloadable without login on addons
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11525 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 17:24:59 +00:00
mDeflotte 93d945d403 // Fix some problems with multishipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11524 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 17:24:16 +00:00
vSchoener ce9948699a // update translation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11523 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 17:23:12 +00:00
tDidierjean 6a2ee706d9 // Add more BO translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11522 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 17:22:04 +00:00
mBertholino ad79f651d8 [-] BO : fixed bug -> product/combination ergonomics
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11521 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 17:18:21 +00:00
rGaillard 739e51ce9a // Add specific_price management for backoffice order && fix installer
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11520 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 17:16:46 +00:00
vChabot 7a343196f1 // translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11519 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 17:12:56 +00:00
tDidierjean 8099005405 // Add BO translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11518 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 17:12:04 +00:00
lLefevre 9a37a8af4a // fix fatal error
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11517 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 17:03:01 +00:00
lLefevre ae64ec2897 // fix stock for virtual product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11515 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 16:49:42 +00:00
lLefevre fd22a6233e [-] FO : #PSTEST-104 : delete button add in AdminCartsController.php
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11514 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 16:48:41 +00:00
jBreux 6bafe02714 [+] Project : Added the ability for groups to show or hide prices for their members
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11513 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 16:42:17 +00:00
fBrignoli 1ff57cb314 // OrderDetails migration
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11512 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 16:37:23 +00:00
mDeflotte 07c031260e // Fix some problems with multishipping
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11511 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 16:27:02 +00:00
bMancone de0585128c // translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11510 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 16:23:27 +00:00
vChabot a089131884 // removing categories assocation with shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11509 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 16:18:24 +00:00
fGaillard 22945a1ba9 [-] Classes : #PSCFI-4464, #PSCFI-4494 : BugFix : smarty plugin edited, check if function mb_split exists (Ajax, add or delete into/from cart)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11508 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 16:17:33 +00:00
tDidierjean 5520f6767e // Fix SpecificPriceRule name property
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11507 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 16:17:15 +00:00
bMancone f0544da7dc // fixed form.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11506 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 16:13:02 +00:00
vChabot e5d53567ae // removing categories shop association
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11504 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 16:05:42 +00:00
vChabot f4780b88ef // translation fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11503 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 15:59:00 +00:00
tDidierjean bbaa2154de // Fix SpecificPriceRule form and multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11502 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 15:40:41 +00:00
jBreux 272ce10298 [+] Project : Add Smarty console options
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11501 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 15:35:34 +00:00
rGaillard 0cc6fee10b // Fix SpecificPriceRule add id_customer
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11500 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 15:33:52 +00:00
bMancone c1d793c10f // Quantities are now correctly setted when using the AttributeGenerator
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11499 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 15:22:20 +00:00
sThiebaut eeb6a3b133 // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11498 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 15:14:25 +00:00