14542fea44
// Merge -> revision 9124
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9125 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 09:54:43 +00:00
1cdc37f80d
//
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9114 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 15:45:53 +00:00
bd1657dc01
//
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9113 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 15:36:28 +00:00
e7fa851a7c
// move js_files and css_files assign in initFooter
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9112 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 15:34:05 +00:00
4134ed3f5d
[*] BO : Modules can now be authorized or not by client group
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9108 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 15:22:25 +00:00
40d0463987
//small fix
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9106 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 14:52:02 +00:00
7a75fe3c57
//small fix
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9105 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 14:51:47 +00:00
f9bcf3f84f
[-] Installer : Fix country_to_timezone in last step
...
[+] BO : now AdminProducts and AdminCategories are separated from AdminCatalog
[+] FO : new method Category::getAllChildren() (the return value is an array, but can evolve to a collection
// Uses of Media:: in header.inc.php
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9097 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 13:02:24 +00:00
3d0e96b313
// context->controller now work for adminController too
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9090 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 09:55:28 +00:00
6c7d1a5ee7
[*] Classes : addJqueryUI automaticaly add css
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9089 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 09:51:37 +00:00
05de006711
// fix bug on AdminController and callback usage
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9087 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 09:48:48 +00:00
6cb41061cf
// fix norm
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9086 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 09:39:45 +00:00
bac1d615cb
[-] BO : fixed bug in method displayDate() to the class Tools
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9084 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 09:17:56 +00:00
6f9f82a2e5
//update property in AdminController
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9081 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 16:31:51 +00:00
5e8cd2a3f2
// Fix shipping cost for virtual products
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9078 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 16:02:12 +00:00
9d063a0a67
// fix norm
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9073 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 15:45:57 +00:00
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
66db4c486d
// Small fix on exceptions
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9064 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 14:43:25 +00:00
4b8ae2693c
[*] FO : Hide the download link and download icon if the virtual product do not have files associated with it
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9063 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 14:28:47 +00:00
9eda5d4cdc
[*] FO : get the product attribute id for download link
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9059 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 13:57:02 +00:00
3dc3144727
[*] FO : change the download link for files associated to product attributes
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9057 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 13:54:56 +00:00
fc8a13192c
[+] FO : don't send email if there's no file associated to the virtual product
...
[*] FO : change the download link for files associated to product attributes
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9056 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 13:53:51 +00:00
0e33114d4d
// Improve exception display
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9051 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 12:05:40 +00:00
053af8843f
[+] Classes : Media::getJqueryPluginPath() - added new parameter $folder
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9045 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 09:01:19 +00:00
018cd09251
//added array _listSkipDelete in AdminController
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9043 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 08:30:00 +00:00
b3e47d5274
//Added bulk action in AdminShopUrlController and fixed norms
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9027 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 15:45:47 +00:00
1bb02e3abf
[+] Classes : Helper::renderAdminCategorieTree() have new params "$use_search" to add a input search
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9026 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 15:42:56 +00:00
ab53862f87
//delete info() in HelperList
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9023 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 14:59:03 +00:00
4c720551a8
//assign var listSkipDelete in list_content.tpl
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9022 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 14:49:20 +00:00
c1594d0a66
//added message errors and success, Norms
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9021 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 14:23:23 +00:00
2da2b5c374
// Normalization
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9011 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 12:04:19 +00:00
a499af94bb
//update property _listSkipDelete
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9010 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 12:01:55 +00:00
e1d3f25007
//added property _listSkipDelete
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9008 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 11:56:02 +00:00
61d80451da
//update of the method _displayEnableLink() call line 171
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9004 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 07:09:53 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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