Commit Graph

1368 Commits

Author SHA1 Message Date
lLefevre
c781f25760 [*] BO : added right of multi-shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9157 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 15:39:55 +00:00
rMalie
de7107b58c // MCached renamed in CacheMemcache + CacheFS renamed in CacheFs
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9136 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 12:49:15 +00:00
mMarinetti
9236b287b1 // revert
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9135 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 12:40:46 +00:00
vChabot
6749d55e54 // improve JS (select/unselect all)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9130 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 12:29:51 +00:00
mMarinetti
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
rMalie
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
vAugagneur
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
mMarinetti
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
vChabot
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
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
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
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
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
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
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
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
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
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
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
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
lLefevre
723efe49f6 //update .tpl name AdminRequestSqlController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8995 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 16:45:27 +00:00
lLefevre
e12b202e85 // Added AdminShopUrlController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8994 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 16:44:23 +00:00
rMalie
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
vAugagneur
ad7cef7424 //use Tools::isSubmit() instead of array_key_exist('', $_POST);
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8986 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 15:18:18 +00:00
vAugagneur
fffe36a72b //fixed small bug
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8985 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 14:40:40 +00:00
aFolletete
ae7f8eeada // Rename adminAddresses template
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8971 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 13:19:57 +00:00
lLefevre
3842184c8a //Added method bulkexport in AdminRequestSqlController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8959 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 09:30:03 +00:00
rMalie
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
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
lLefevre
9af35db5ce //Added AdminRequestSqlController
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8938 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 15:28:44 +00:00
tDidierjean
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
mDeflotte
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
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
tDidierjean
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
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
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
mMarinetti
1e13bf599b // fix duplicated
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8900 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 16:39:17 +00:00
tDidierjean
923eb2cd21 // fixed item edition for AdminAddresses
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8897 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 16:25:58 +00:00
mMarinetti
940d412a0c // fix links in main menu,
// + moved tab AdminTracking.php to AdminTrackingController.php


git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8894 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 16:13:34 +00:00
mMarinetti
df9948c445 // fix display subtabs when employee is on hover on adminHome
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8893 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 16:08:42 +00:00
mMarinetti
e8ff5b025f // fix displaying subtabs link,
// fix adminHome links


git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8892 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 16:02:26 +00:00
mDeflotte
b5a03180f5 // AdminCustomer : "</from>" have nothing to do in the translation function l();
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8882 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 14:33: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