Commit Graph

189 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 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
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
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
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 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
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
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
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
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
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
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
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
aFolletete 78f6a4e20a [*] Classes : improve performances of "Feature detachable" feature
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8754 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-24 15:03:21 +00:00
vChabot 83fc0977c9 [*] BO : Features are now sortable.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8751 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-23 15:45:40 +00:00
mMarinetti 926063e08f [+] BO : New AdminController system, including smarty backoffice, thanks to Raphael and Thomas
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8742 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-23 15:01:49 +00:00
rMalie 4181a8ea5b // Rename Module->smartyAssign to Module->templateAssign
[+] Front: Add module controller + url dispatch for modules

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8738 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-23 13:50:33 +00:00
fBrignoli 14a3e123db [-] BO : Missing add one after another type in admintaxrulesgroup
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8737 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-23 13:25:27 +00:00
mDeflotte 118338a5ea [*] BO : Gender - Allow image resizing
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8736 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-23 13:04:52 +00:00
mDeflotte a127911a7f [-] Install : Add gender durring install
[*] FO : Add gender_type "neutral"
// Normalization

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8733 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-23 09:58:19 +00:00
vAugagneur 1c01c20149 //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8723 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-22 15:46:42 +00:00
rMalie 4f2a090e24 // Merge -> revision 8720
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8722 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-22 15:45:10 +00:00
fBrignoli f8989018a7 // Tax::initializeAddress =>Address::initialize
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8700 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-21 15:43:12 +00:00
tDidierjean 14f55eccb7 // change header and footer smarty inclusion
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8697 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-21 15:26:44 +00:00
fBrignoli bbb13f5568 // missing init selected_states
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8694 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-21 14:42:55 +00:00
vChabot 46ba33ef92 // import csv ok for group attribute position
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8693 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-21 14:38:12 +00:00
vAugagneur 8b6ec916e0 [+] BO : now you can choose type of attribute group (select , color, radio)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8691 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-21 14:29:32 +00:00
rMalie fd45c7bb4d // Fix validation of emails preferences
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8685 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-21 12:55:57 +00:00
vChabot d0102a81b7 [*] BO : groups attributes are now sortable
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8683 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-21 10:04:54 +00:00
tDidierjean 92cc465a3c // Creation of AdminController : Admin tabs will now extend this class (see AdminTools.php for example)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8667 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-20 16:04:35 +00:00
tDidierjean b45dd02452 // remove deprecated PS_ADMIN_DIR by _PS_ADMIN_DIR_
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8666 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-20 15:53:57 +00:00
dMetzger 6bc3640449 // Removed leading "*" before PHP opening tag in AdminDB.php
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8658 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-20 09:30:36 +00:00
vChabot 58c8c71018 // import csv ok for product attribute position
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8652 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-20 08:25:50 +00:00
aFolletete c3cc90a191 // Many improvements for Feature Detachable
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8648 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-19 15:55:52 +00:00