0e494ed7db
// revert
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9129 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 12:27:01 +00:00
bf609d8374
//
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9128 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 11:27:45 +00:00
92b032e8dd
// StockManagement : Interface/Factory/Module
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9126 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 09:56:55 +00:00
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
38a23cf978
// refactoring function (delete useless functions)
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9123 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 09:24:44 +00:00
539b92b651
[+] BO : added action button in autocomplete module list
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9122 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 08:05:29 +00:00
3c12ce1943
// db_settings_extends updated
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9121 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 08:02:34 +00:00
8e25db88cf
// modification upgrade sql 1.5.0.1
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9120 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 07:51:36 +00:00
5e4eece1de
// little correction
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9119 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 07:47:07 +00:00
27fc74ffa5
// adding default restrictions on install
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9118 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 07:46:49 +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
2f20dea507
// no more media in header.inc
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9111 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 15:32:11 +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
4d7bf6f76a
//small fix
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9102 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 13:54:33 +00:00
ef8f39babe
//small fix
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9101 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-06 13:41:24 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
mMarinetti