Commit Graph

5386 Commits

Author SHA1 Message Date
mMarinetti fdd72b47fa // admincontroller fix when json
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10586 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 18:36:59 +00:00
tDidierjean 9ebe542fdb // fix product live preview and duplication
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10585 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 18:33:11 +00:00
dMetzger c32038a6f4 // Removed the underlined space in the BO list headers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10584 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 18:20:08 +00:00
rGaillard d3458a1c26 // Revert good priorities on conditions
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10583 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 18:16:55 +00:00
vChabot d9b6c6401a // adding the php upgrade to move every orders into order_carrier
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10582 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 18:10:01 +00:00
vSchoener e66762fc85 // Update bad javascript var for opc
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10581 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 18:09:50 +00:00
lLefevre bcd15e8f6f // Fix bug in AdminCustomersController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10580 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 18:01:07 +00:00
dMetzger f670f7573f [+] BO : add new feature, Order edition
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10579 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 17:45:52 +00:00
lLefevre 5660c09d62 // delete btn preview if the shop have not virtual_uri in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10577 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 17:37:16 +00:00
bMancone 45fbdd8635 // Stock : improved translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10574 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 17:23:10 +00:00
mDeflotte 3989b708c8 // Delivery option are now auto-selected in the checkout
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10572 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 17:21:30 +00:00
fBrignoli ba7ec2dd9d [-] FO : Undefined method getOutOfStock
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10571 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 17:18:09 +00:00
lLefevre b365c2befa // delete btn preview if the shop have not virtual_uri in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10570 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 17:14:19 +00:00
tDidierjean d84b5b2749 // BO menu now uses the new icons
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10569 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 17:12:18 +00:00
rMalie 69feff1ee1 // Fix stock for multishop on search
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10568 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 17:07:46 +00:00
lLefevre cc50d29cc3 // added link for preview in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10566 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 17:05:29 +00:00
fBrignoli 9c01024080 [-] CO : option "fields" is not required
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10565 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 17:01:52 +00:00
rMalie e4654570e9 // Some fix on multishop + stock
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10564 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 17:00:20 +00:00
lLefevre 38d17b447e // Fix bug in AdminProductsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10562 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 16:49:15 +00:00
vAugagneur c13021dad0 //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10561 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 16:46:46 +00:00
tDidierjean 2d3db2e15d // Add actions to product list and fix product duplication
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10560 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 16:45:14 +00:00
vKham 4804005df2 //new custom stylesheet login, add new images logo module partenaires, admin css
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10559 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 16:45:13 +00:00
rGaillard 1207b5bf40 // Small fixes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10558 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 16:31:53 +00:00
mDeflotte 7ac2f24ff3 // BugFix : use current($array instead of $array[0]
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10557 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 16:22:08 +00:00
lLefevre 74145e0081 // fix bug added action edit and delete in AdminScenesController + norms
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10555 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 16:13:23 +00:00
dSevere 2d238bbac7 // Stock Management : Show stock interfaces only if the option is active in the configuration + debug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10554 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 16:07:57 +00:00
bMancone 5735102138 // #PSFV-125 - homeSlider fixed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10553 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 15:55:49 +00:00
fBrignoli f3e2225957 // css
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10552 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 15:41:27 +00:00
bMancone 6db622ece6 // Stock : updated tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10551 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 15:38:36 +00:00
mMarinetti 67ba2e5df5 // phpdoc fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10550 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 15:37:50 +00:00
rMalie 3bbbdf8de5 // Fix multishop javascript for preferences and shop url
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10549 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 15:37:29 +00:00
tDidierjean 5dbd54ff5f // Fix helper translations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10548 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 15:28:05 +00:00
lLefevre 8370b1cd15 // fix bug smarty method in .tpl {l s =''} for {l s=''}
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10547 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 15:24:04 +00:00
tDidierjean 1d734487ff // Fix google autotranslate
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10546 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 15:19:53 +00:00
vKham 74fb39ef4b add new images menu heaeder navigation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10544 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 15:09:36 +00:00
tDidierjean cb8cec2551 // refactoring AdminTranslations
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10542 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 15:00:48 +00:00
tDidierjean 3e39010a9b // fixes to AdminController:translate() performance
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10541 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 15:00:19 +00:00
bMancone 0367e98504 // Stock : updated styles in templates
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10538 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 14:29:49 +00:00
rGaillard f8acb56108 // Little change on adminpayment
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10537 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 14:29:40 +00:00
lLefevre 8a5493103d // fix bug change translate AdminTab for AdminController in AdminTranslationsController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10536 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 14:25:13 +00:00
bMancone eb2d92644f // Added translations + new design for AdminStockCover & AdminStockInstantState
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10535 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 14:21:25 +00:00
mDeflotte a6f7bec80f // Improving carrier option render in the product admin tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10533 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 14:03:23 +00:00
vAugagneur e710e73009 //new screencast frame
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10532 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 14:03:20 +00:00
mMarinetti 668f3676eb // fix redirect
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10531 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 14:01:28 +00:00
mDeflotte 73e4b5fe56 // BugFix : With Guest Checkout, an alert is displaying each time we increase/decrease the quantity of a product
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10530 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 13:59:14 +00:00
lLefevre 391fea452c // fix added autocomplete in module blocksearch
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10529 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 13:58:23 +00:00
vChabot 109c38c5e0 // adding combination URL to the cart summary
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10528 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 13:50:50 +00:00
fSerny 4c83dce8f4 [-] BO : AdminModule Addons Icon now appear in AutoComplete Search
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10527 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 13:49:15 +00:00
vAugagneur 3359ebb347 //clean footer.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10526 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 13:39:24 +00:00
dMetzger bb7050715b // bug fix for the cart rules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10525 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 13:38:41 +00:00