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
79115b2572
[*] FO : Update filename if product has combinations (and files associated to them)
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8987 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 15:39:06 +00:00
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
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
2adb0ed5b7
// guest checkout works with the 2 registration process
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8983 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 14:35:43 +00:00
e3f67a1d82
//added missing icons
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8979 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 14:16:30 +00:00
af180672b1
//small fix
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8977 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 14:11:55 +00:00
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
1193a572c1
[*] FO : Update filename if product has combinations (and files associated to them)
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8968 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 13:05:08 +00:00
0874edc9c3
// cache on getTaxCalculator()
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8966 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 12:43:05 +00:00
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
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
f1e265fad4
//small fix
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8956 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 09:02:42 +00:00
09338a79bf
//small fix
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8954 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 08:35:50 +00:00
07ff8bba2a
[-] Classes : fixed small bug on CCC
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8953 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-03 08:22:33 +00:00
9ca40220be
// Optimisation ObjectModel + hydrateCollection
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8942 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 16:04:33 +00:00
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
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
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
2a8a547fe3
[-] Fix problem with js files due to the retro compatibility
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8935 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 15:06:59 +00:00
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
2068aaaf2a
// Norm on controllers
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8930 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 13:50:55 +00:00
72672c7a8f
[-] BO : BugFix - Not possible to save a carrier
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8927 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 13:19:25 +00:00
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
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
3e1c4e426f
// _frontController now work again
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8921 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 09:51:35 +00:00
9e5832fb33
[-] All : Class Product, error in SQL request
...
// some normalization is class product (all is not done)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8919 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 09:29:36 +00:00
7770d914a0
// removed extra file
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8918 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 08:22:52 +00:00
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
4b56fa5c68
// PdfOrderSlipController with eol
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8916 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 08:17:00 +00:00
a2483c8114
// ChangeCurrencyController : refacto done
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8914 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 07:42:20 +00:00
97a30b4aab
// CompareController : refacto done
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8913 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 07:37:20 +00:00
aab66997da
// CaregoryController : FixBug : Product list must be assigned to the template AFTER being calculated
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8912 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 07:22:42 +00:00
ddc6b504c8
// ContactController : refacto done
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8911 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-30 07:06:56 +00:00
aa5684360d
// update to AdminController init() and postProcess()
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8902 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 17:20:16 +00:00
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
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
e90bd74e36
// translate for virtual product
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8899 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 16:32:36 +00:00
227e13680b
// Refacto of CategoryController
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8898 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 16:31:32 +00:00
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
093c743141
[-] FO : BugFix - Ajax error on editing address durring ordering process
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8896 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 16:19:33 +00:00
8b59a8dd04
// Fix authentification gender
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8895 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 16:13:50 +00:00
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
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
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
117583a0d0
//CmsController : Refacto done
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8891 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 15:55:36 +00:00
355bad0fba
// fix undefined var $customer
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8889 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 15:45:09 +00:00
a73ef6232a
//DiscountController : Refacto done
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8887 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 15:15:55 +00:00
317346ce46
// Normalization
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8886 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 15:12:57 +00:00
af54cbaf32
//GetFileController : Refacto done
...
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8885 b9a71923-0436-4b27-9f14-aed3839534dd
2011-09-29 15:12:34 +00:00
rMalie