Commit Graph

239 Commits

Author SHA1 Message Date
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
tDidierjean
94e015fb29 // Delete old AdminAddresses
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8860 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 16:50:58 +00:00
tDidierjean
bf3736c820 // Added HelperList, AdminAddressController, and fixed subtab display
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8858 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 16:32:42 +00:00
rMalie
be8d2136be // Merge -> revision 8851
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8854 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 16:03:30 +00:00
mMarinetti
e620a3d350 [+] BO : now Back-office has meta-title by controller
// fix back office template, add missing override

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8849 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 14:15:07 +00:00
lLefevre
089a31f32c //fix correction norm and language in AdminGroups
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8838 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 09:47:33 +00:00
lLefevre
c304a2c620 //fix correction norm in AdminProducts
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8830 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 08:26:46 +00:00
mMarinetti
c97115fd98 // fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8829 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 08:13:58 +00:00
mMarinetti
877074f659 [*] BO : moved 2 javascript functions to display success or error on AdminAccess are now available everywhere (thanks to Loic)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8825 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 07:32:39 +00:00
lLefevre
8a4c8e1d04 //fix correction norm in SQL manager
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8822 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-28 07:10:24 +00:00
mMarinetti
86f18ce106 // remove AdminHome tab
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8811 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 15:10:26 +00:00
vChabot
2045401f9e // cleaning code (norm / perf)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8810 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 15:08:24 +00:00
aFolletete
810f17c38e // rename index.tpl to layout.tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8809 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 14:52:52 +00:00
rMalie
1b6d0d1be3 // Merge -> revision 8800
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8808 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 14:30:06 +00:00
mMarinetti
41c4897976 // ajax-tab usage of Dispatcher
// adminHome.tpl
// header.tpl fix


git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8805 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 14:18:27 +00:00
vAugagneur
4c255554fe [-] BO : fixed ajax file-upload request
[-] BO : now you can really delete image in BO
//added translations

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8804 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 13:33:39 +00:00
vChabot
fc88323443 // perf
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8801 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 12:54:47 +00:00
lLefevre
916cee53e5 [*] BO : change span.hint
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8789 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 08:13:53 +00:00
lLefevre
2171c5598c [*] BO : refactoring AdminAccess
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8788 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-27 08:12:33 +00:00
lLefevre
7b1344becf git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8782 b9a71923-0436-4b27-9f14-aed3839534dd 2011-09-26 16:46:48 +00:00
jmCollin
2309720a0b //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8778 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-26 16:04:15 +00:00
jmCollin
da24f70c91 // Fix for Strict standards: Creating default object from empty value, when try to add a new product without product name or friendly URL
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8777 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-26 15:53:36 +00:00
rMalie
45eb3a52ad // Fix admin dispatcher
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8774 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-26 14:36:18 +00:00
vChabot
255160292a // import OK for product feature
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8772 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-26 13:50:53 +00:00
lLefevre
12942dd4a8 //Fixed correct norm in class RequestSql
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8765 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-26 10:22:35 +00:00
rMalie
6a39d24f05 // Improve flexibility of dispatcher + fix controllers access in BO (only admin controllers are loaded by the dispatcher)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8764 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-26 09:57:00 +00:00
tDidierjean
e98c1cdf5c // fix missing include for multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8763 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-26 09:18:07 +00:00
lLefevre
60c004493e [+] BO : add SQL manager
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8760 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-26 08:30:14 +00:00
rMalie
ff51f77bba // Fix token on adminHome
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8758 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-26 08:24:38 +00:00
mMarinetti
a139df824f // maj default theme for admin
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8757 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-26 08:09:34 +00:00