Commit Graph

370 Commits

Author SHA1 Message Date
rMalie ae5fc92bf7 // Merge -> revision 8984
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8988 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 15:48:07 +00:00
lBrieu 79115b2572 [*] FO : Update filename if product has combinations (and files associated to them)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8987 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 15:39:06 +00:00
lBrieu 1193a572c1 [*] FO : Update filename if product has combinations (and files associated to them)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8968 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 13:05:08 +00:00
fBrignoli 0874edc9c3 // cache on getTaxCalculator()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8966 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 12:43:05 +00:00
rMalie ef17d0b7da // Merge -> revision 8952
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8957 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 09:14:01 +00:00
vAugagneur f1e265fad4 //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8956 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 09:02:42 +00:00
vAugagneur 09338a79bf //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8954 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 08:35:50 +00:00
vAugagneur 07ff8bba2a [-] Classes : fixed small bug on CCC
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8953 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 08:22:33 +00:00
rMalie 9ca40220be // Optimisation ObjectModel + hydrateCollection
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8942 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 16:04:33 +00:00
tDidierjean c1d5575723 // added customizable bulk actions for lists in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8936 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 15:08:35 +00:00
mDeflotte 3b827893b1 [*] Add reference for carriers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8933 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 14:59:07 +00:00
rMalie 2068aaaf2a // Norm on controllers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8930 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 13:50:55 +00:00
mDeflotte 72672c7a8f [-] BO : BugFix - Not possible to save a carrier
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8927 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 13:19:25 +00:00
vAugagneur 2fbc132933 [+] Classes : added new class Media => It contains all the method related to media like CSS, JS
[+] Classes : added new method Media::addJquery(), Media::addJqueryUI(), Media::addJqueryPlugin()
[~] Deprecated : All method related to CCC has been moved in class Media

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8926 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 13:01:10 +00:00
tDidierjean 1c206de2ba // Update list generation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8922 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 10:00:20 +00:00
mDeflotte 9e5832fb33 [-] All : Class Product, error in SQL request
// some normalization is class product (all is not done)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8919 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 09:29:36 +00:00
rMalie 3620f0837f // Merge -> 8910
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8917 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 08:17:25 +00:00
tDidierjean aa5684360d // update to AdminController init() and postProcess()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8902 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 17:20:16 +00:00
jmCollin 3e9e437ac1 [+] FO : add files for combination
[*] FO : Create virtual products with no associated file

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8901 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 16:40:44 +00:00
rMalie 227e13680b // Refacto of CategoryController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8898 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 16:31:32 +00:00
tDidierjean 923eb2cd21 // fixed item edition for AdminAddresses
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8897 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 16:25:58 +00:00
mMarinetti 940d412a0c // fix links in main menu,
// + moved tab AdminTracking.php to AdminTrackingController.php


git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8894 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 16:13:34 +00:00
mMarinetti e8ff5b025f // fix displaying subtabs link,
// fix adminHome links


git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8892 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 16:02:26 +00:00
mDeflotte 76fedb28db // Remove "space" in class Tools
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8884 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 14:42:03 +00:00
rMalie 42c5603cc3 [+] Classes: Add ObjectModel::hydrateCollection() in order to transform arrays from sql queries return in list of objects
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8877 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 13:23:54 +00:00
tDidierjean bf3736c820 // Added HelperList, AdminAddressController, and fixed subtab display
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8858 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 16:32:42 +00:00
rMalie be8d2136be // Merge -> revision 8851
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8854 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 16:03:30 +00:00
rMalie ccd0383e88 // Refacto of cartController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8853 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 15:40:28 +00:00
mMarinetti e620a3d350 [+] BO : now Back-office has meta-title by controller
// fix back office template, add missing override

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8849 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 14:15:07 +00:00
mMarinetti df7416a453 // now class RequestSql can be overridden
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8841 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 11:47:39 +00:00
mMarinetti 82410874d3 [+] BO : new method $link->getAdminLink($controller), to build admin url with token
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8840 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 10:20:44 +00:00
rMalie 7281de8839 // Add Link->getAdminLink()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8839 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 09:53:30 +00:00
lLefevre 089a31f32c //fix correction norm and language in AdminGroups
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8838 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 09:47:33 +00:00
vChabot 58d205edc5 // add method ajaxProcess in "run" method
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8827 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 08:06:10 +00:00
vChabot 2b3e74baaa // fix error
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8824 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 07:31:45 +00:00
lLefevre 8a4c8e1d04 //fix correction norm in SQL manager
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8822 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 07:10:24 +00:00
rMalie a1a1c8340e // AddressController : refacto done
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8820 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 16:21:25 +00:00
vAugagneur 474ef2b3d0 //fixed sql bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8819 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 16:06:25 +00:00
rMalie a1854047e9 // Fix dispatcher with rewriting in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8816 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 15:52:59 +00:00
rMalie 8a4660a378 // Fix bugs on frontControllers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8815 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 15:28:41 +00:00
vChabot 3d36012cb9 // parse error
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8814 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 15:20:41 +00:00
tDidierjean 3192ddb27d // change to Controller workflow
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8813 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 15:20:30 +00:00
vChabot 2045401f9e // cleaning code (norm / perf)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8810 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 15:08:24 +00:00
aFolletete 810f17c38e // rename index.tpl to layout.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8809 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 14:52:52 +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
mMarinetti 41c4897976 // ajax-tab usage of Dispatcher
// adminHome.tpl
// header.tpl fix


git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8805 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 14:18:27 +00:00
rMalie 98b1103e2e // Remove debug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8803 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 13:27:11 +00:00
rMalie 6a1ea62d13 // Refacto of controllers PART 2
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8802 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 13:04:24 +00:00
rMalie 80e750c4c9 [+] Classes: Add PHP exceptions support + handler
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8797 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 12:10:47 +00:00
rMalie 7c32b171cd // Fix lcfirst use !
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8796 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 12:08:14 +00:00