Commit Graph

318 Commits

Author SHA1 Message Date
lBrieu 9d42140fa9 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8257 b9a71923-0436-4b27-9f14-aed3839534dd 2011-08-30 14:11:26 +00:00
lBrieu e347e11872 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8254 b9a71923-0436-4b27-9f14-aed3839534dd 2011-08-30 13:44:57 +00:00
lBrieu 7d5f1ae314 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8253 b9a71923-0436-4b27-9f14-aed3839534dd 2011-08-30 13:42:35 +00:00
lBrieu 814a847878 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8252 b9a71923-0436-4b27-9f14-aed3839534dd 2011-08-30 13:40:31 +00:00
lBrieu 6ccb93e606 [-] Remove employee fields
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8251 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-30 13:38:50 +00:00
lBrieu 4817e97cd8 [+] Add employee fields for notifications in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8250 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-30 13:38:36 +00:00
bMancone 375e0a4f6d [-] MO : HomeSlider
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8249 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-30 13:24:06 +00:00
lBrieu 76f7326832 [+] Add some JS and integrates notifications in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8248 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-30 12:06:17 +00:00
lBrieu 9a169ae91f [+] Add handling for notifications in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8247 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-30 12:04:07 +00:00
lBrieu cb5fc11308 [+] Add some fields in the employee tab to handle notifications in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8246 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-30 12:03:10 +00:00
lBrieu af96604d69 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8245 b9a71923-0436-4b27-9f14-aed3839534dd 2011-08-30 12:01:29 +00:00
lBrieu 5dcc1a65bf [+] Add CSS modifications for notifications in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8244 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-30 12:00:12 +00:00
lBrieu 1134ed9a02 [+] Add icons for notifications in BO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8243 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-30 11:59:04 +00:00
lBrieu 3f57d1f64a git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8240 b9a71923-0436-4b27-9f14-aed3839534dd 2011-08-30 08:37:37 +00:00
bMancone 6616d46842 [*] MO : productComments - It's now possible to delete comments, beside moderation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8237 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-29 16:21:57 +00:00
lBrieu f59d648bda git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8236 b9a71923-0436-4b27-9f14-aed3839534dd 2011-08-29 15:39:57 +00:00
lBrieu 835093d7e0 [+] Allows to add notifications on the shop (backoffice only)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8235 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-29 15:35:57 +00:00
lBrieu fa6152abc7 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8233 b9a71923-0436-4b27-9f14-aed3839534dd 2011-08-29 14:27:22 +00:00
lBrieu 5521ce88c2 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8232 b9a71923-0436-4b27-9f14-aed3839534dd 2011-08-29 14:26:56 +00:00
lBrieu e0ea67b2d5 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8231 b9a71923-0436-4b27-9f14-aed3839534dd 2011-08-29 14:14:13 +00:00
bMancone 53467eb7d3 [-] MO : productComments fixed
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8220 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-29 09:19:43 +00:00
tDidierjean 16516953fb // Merge -> revision 8206
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8210 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-26 15:52:42 +00:00
rMalie d33325c23f // Fix currencies for multishop + meta
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8209 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-26 15:10:52 +00:00
lBrieu 9271f5bebc [+] Label changed for "uninstalled" to "non installed" (CC)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8208 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-26 14:16:04 +00:00
lBrieu c61be32591 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8207 b9a71923-0436-4b27-9f14-aed3839534dd 2011-08-26 14:14:10 +00:00
fBrignoli 64b6633fdd // static call in hookTaxManager
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8203 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-26 08:40:04 +00:00
rMalie 68c7be42c2 // Merge -> revision 8199
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8200 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-26 07:59:29 +00:00
rMalie 2c60ea0863 // Fix multi virtual uri on same domain for htaccess + products on multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8196 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-25 15:27:49 +00:00
rMalie 4c421016ed // Add class_index.php for autoload
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8186 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-25 09:33:50 +00:00
bMancone f530ade4f6 [*] MO : crossseling - the main title now depends on the number of products in the cart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8183 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-25 07:10:51 +00:00
bMancone 39a13dff73 [*] MO : crossseling - Added hookShopingCart (uses all products in the cart)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8182 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-24 17:09:22 +00:00
bMancone 631c3d7fbc [-] MO : FavoriteProducts - now adds/removes correctly products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8180 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-24 16:00:02 +00:00
rMalie b12bf222a9 git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8179 b9a71923-0436-4b27-9f14-aed3839534dd 2011-08-24 15:57:10 +00:00
rMalie 89fcb38dc7 // Force install of modules in global context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8178 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-24 15:04:50 +00:00
bMancone 829ad87f8a [-] MO : HomeSlider - Added PS_USE_SQL_SLAVE
[-] MO : FavoriteProducts - Fixed link


git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8177 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-24 14:23:36 +00:00
fBrignoli 0c68e37e40 [-] FO : Removed deprecated function Tax::getProductTaxRate
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8174 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-24 13:40:41 +00:00
bMancone acee5463dd [-] MO : HomeSlider
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8173 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-24 13:28:31 +00:00
bMancone c2922f16e3 [+] MO : Added HomeSlider
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8172 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-24 12:45:50 +00:00
lCherifi 2d228a4fb8 integration new theme standard
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8169 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-23 14:27:30 +00:00
lCherifi 2a1e42606b integration new theme standard
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8168 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-23 14:25:09 +00:00
lCherifi c0bd68221a integration new theme standard
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8167 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-23 14:23:18 +00:00
rMalie 0ac3122871 // Fix dispatcher (order meta rewrites by length)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8159 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-23 08:58:36 +00:00
fBrignoli 7e1ac5572e // validateControler is now deprecated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8158 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-23 08:58:07 +00:00
rMalie 6d414e45c5 // Fix orders with friendly URL and dispatcher
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8157 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-23 08:54:14 +00:00
rMalie b2ff23ecac [+] FO : add module-moduleName-pageName ID on body of module pages
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8156 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-23 08:06:57 +00:00
rMalie 22d23f8324 // Merge -> revision 8149
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8151 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-22 16:22:16 +00:00
rMalie d7eaa5f5a4 // Fix search on multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8150 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-22 16:10:17 +00:00
rMalie a4f6bde797 // Fix change on currencies with context
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8148 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-22 14:46:32 +00:00
rMalie 99c89469fb // Fix order detail controller bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8147 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-22 14:29:13 +00:00
rMalie 93b9a835d4 // Fix some bugs on multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8145 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-22 13:44:20 +00:00