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

63 Commits

Author SHA1 Message Date
fBrignoli 329a0966ca [-] FO : Notice if blocknewsletter has been removed 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9229 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-11 12:59:30 +00:00
aNiassy 3a6f44828e [-] FO : Applied the context to the cart in the ParentOrderController::_setDefaultCarrierSelection() method 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9223 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-11 12:34:44 +00:00
rMalie 577221ff08 // Remove bad _SQL_USE_SLAVE_ uses + normalize Db->executeS(), Db->execute() and Db->numRows() names 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9178 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-10 12:18:56 +00:00
rMalie b4d436ca21 // Merge -> revision 9061 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9069 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-05 15:21:55 +00:00
lBrieu 22d2088e69 [-] Solve problem when trying to view a specific order on the history page (bad order id) 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9040 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-05 07:55:21 +00:00
rMalie 2a764cfd14 // Fix downloadable files in admin 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9031 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-04 16:10:05 +00:00
vChabot 2adb0ed5b7 // guest checkout works with the 2 registration process 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8983 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-10-03 14:35:43 +00:00
vChabot 8fcc94e777 [*] Registration type is now in 2 steps or all in one 
// refactoring AuthController.php (front)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8941 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-30 15:48:20 +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
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
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
mMarinetti 4b56fa5c68 // PdfOrderSlipController with eol 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8916 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-30 08:17:00 +00:00
mDeflotte a2483c8114 // ChangeCurrencyController : refacto done 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8914 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-30 07:42:20 +00:00
mDeflotte 97a30b4aab // CompareController : refacto done 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8913 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-30 07:37:20 +00:00
mDeflotte aab66997da // CaregoryController : FixBug : Product list must be assigned to the template AFTER being calculated 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8912 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-30 07:22:42 +00:00
mDeflotte ddc6b504c8 // ContactController : refacto done 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8911 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-30 07:06:56 +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
mDeflotte 117583a0d0 //CmsController : Refacto done 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8891 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-29 15:55:36 +00:00
vChabot 355bad0fba // fix undefined var $customer 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8889 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-29 15:45:09 +00:00
mDeflotte a73ef6232a //DiscountController : Refacto done 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8887 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-29 15:15:55 +00:00
mDeflotte 317346ce46 // Normalization 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8886 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-29 15:12:57 +00:00
mDeflotte af54cbaf32 //GetFileController : Refacto done 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8885 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-29 15:12:34 +00:00
mDeflotte 38bfdcd843 //GuestTrackingController : Refacto done 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8883 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-29 14:39:13 +00:00
mDeflotte 8554df3197 //historyController : Refacto done 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8881 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-29 13:54:54 +00:00
mDeflotte b1e011cabd //IdentityController : Refacto done 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8879 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-29 13:48:39 +00:00
rMalie 41138b45c0 // Fix addressesController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8878 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-29 13:43:59 +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
mDeflotte 5292c8547b //IndexController : Refacto done 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8876 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-29 13:18:48 +00:00
mDeflotte 645c251c8a //IndexController : Refacto done + normalization 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8875 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-29 13:18:36 +00:00
mDeflotte 98b04bb67b //ManufacturerController : Normalization 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8874 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-29 13:16:03 +00:00
mDeflotte 073c5f16f2 //SupplierController+ManufacturerController : Refacto done 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8873 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-29 13:12:28 +00:00
mDeflotte 38a5ed6c79 //ModuleController+MyAccountController+NewProductsController+OrderConfirmationController : Refacto done 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8872 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-29 12:58:08 +00:00
mDeflotte 642db2b948 //OrderController : Refacto done + modify some comments 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8870 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-29 12:28:09 +00:00
mDeflotte f9c565699b //OrderDetailController : Refacto done + modify some comments 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8869 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-29 11:53:00 +00:00
mDeflotte 590fbe0ef0 //OrderReturnController : Refacto done 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8868 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-29 09:05:03 +00:00
mDeflotte 50bdd80431 //OrderOpcController+OrderSlipController+PageNotFoundController : Refacto done 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8867 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-29 09:03:41 +00:00
mDeflotte e689f575dd //PreProcess => PostProcess 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8866 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-29 09:01:59 +00:00
mDeflotte 5f02dc0d0e //StoresController : Refacto done 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8865 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-29 08:59:11 +00:00
mDeflotte 6a96dd1371 //Use protected instead of private function 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8863 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-29 07:07:06 +00:00
rMalie 36088f9e6c // Refacto AttachementController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8857 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-28 16:19:50 +00:00
rMalie 2b96479279 // Refacto AddressesController 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8856 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-28 16:16:20 +00:00
mDeflotte f30c29afa4 //ParentOrderController : Refacto done 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8855 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-28 16:14:50 +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
mDeflotte c26b75987e //ProductController : Refacto done 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8852 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-28 15:17:03 +00:00
mDeflotte 164006e767 //PasswordController+PdfInvoiceController+PdfOrderReturnController+PdfOrederSlipController+PricesDropController : Refacto done 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8848 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-28 13:56:53 +00:00
mDeflotte d943eb7b2b //SearchController+SitemapController : Refacto done 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8847 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-28 13:51:35 +00:00
mDeflotte 5a5bc410bf //StatisticsController : Refacto done 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8846 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-28 13:49:32 +00:00
mDeflotte 65fbf9138c //StoresController : Refacto done 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8845 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-28 13:47:11 +00:00
mDeflotte 02d6a07110 //SupplierController : Refacto done 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8844 b9a71923-0436-4b27-9f14-aed3839534dd
 2011-09-28 13:43:00 +00:00