Commit Graph

707 Commits

Author SHA1 Message Date
mMarinetti 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
vAugagneur 646eda2e4e //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9094 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 12:06:18 +00:00
vAugagneur e228825648 //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9093 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 12:05:37 +00:00
rMalie 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
vAugagneur 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
aFolletete 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
aFolletete 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
lLefevre 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
lLefevre da0ae2d9cb //added AdminSearchEnginesController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9083 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 08:26:24 +00:00
lLefevre 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
jmCollin 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
vAugagneur 097846fe14 //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9077 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 15:57:42 +00:00
vAugagneur fda5b287c9 //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9076 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 15:55:57 +00:00
rMalie f407514c7e // Remove counties in db_settings_lite.sql
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9075 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 15:51:29 +00:00
aFolletete 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
vChabot 23c5f297ce // little fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9072 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 15:45:01 +00:00
vAugagneur 5423757ab8 //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9070 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 15:35:03 +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
vChabot 51de6be6cc // fix conflict
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9065 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 14:57:52 +00:00
rMalie 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
lBrieu 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
lBrieu fce8c6a4e0 [*] FO : Hide the download link if the virtual product do not have files associated with it
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9062 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 14:27:30 +00:00
lBrieu 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
lBrieu 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
lBrieu 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
lLefevre a1f4c147b9 //update adminStates.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9055 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 12:48:31 +00:00
lLefevre 3133e7ab27 //added AdminStatesController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9054 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 12:42:52 +00:00
rMalie 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
vAugagneur a39871ee84 //fixed small bug on search category
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9049 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 09:39:13 +00:00
vAugagneur 2ea5c7d0ba //fixed small bug on search category
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9048 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 09:34:38 +00:00
lLefevre 06713441d5 //Added AdminAliasesController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9047 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 09:34:10 +00:00
vAugagneur 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
lLefevre 13607b185b //correct errors in norms
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9044 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 08:57:38 +00:00
lLefevre 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
lLefevre 899c461853 // Added AdminGroupShopController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9042 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 08:18:44 +00:00
lLefevre 1c6dae34d1 //fixed bug update form
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9041 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-05 08:17:51 +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
vAugagneur 99593ce1b5 //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9033 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 16:25:08 +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
lLefevre e80543448a //replace password and secure_key by ****
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9030 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 16:03:24 +00:00
vAugagneur 9391324c8d //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9029 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 15:54:49 +00:00
jmCollin 7dba311ab1 // fix bug with combination
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9028 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 15:51:28 +00:00
lLefevre 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
vAugagneur 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
lLefevre 65e3e5b8de //fixed bug activeVisu in list_content.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9024 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 15:06:36 +00:00
lLefevre 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
lLefevre 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
lLefevre 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
vAugagneur 35280d155d //small fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9013 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-04 12:42:20 +00:00
mDeflotte 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