Commit Graph

298 Commits

Author SHA1 Message Date
rMalie
f784411c4b // Remove useless prefix in blockcart json template
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10966 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 09:16:58 +00:00
vSchoener
221cbae5d9 // Fix merging issue
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10958 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 18:11:57 +00:00
lLefevre
a73e408196 [-] BO & FO & MO : #PSCFI-4237 : adding id_lang in method l() of class Mail()
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10954 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 17:22:47 +00:00
sThiebaut
5b1642b26e // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10952 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 17:22:04 +00:00
vSchoener
6255d67944 [-] MO : CarrierCompare, merge 1.4 => 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10938 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 16:26:59 +00:00
aNiassy
4831413af0 [-] #PSCFI-4325 : Modified " followup_1.txt ". It wasn't the same subject that followup_1.html
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10934 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 16:04:19 +00:00
fSerny
ce91cd792c [-] PROJECT : You can now execute hook in the tpl
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10932 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 15:49:56 +00:00
dSevere
a75ca6c40a // Update and fix some bugs on front and admin itnerfaces relative to available quantities functionnality
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10925 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 15:11:21 +00:00
mDeflotte
5586dcdc3d // BugFix Radio button don't work properly
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10921 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 14:52:46 +00:00
vKham
22fe972530 // add images css sprites for icon page stats
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10919 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 14:34:44 +00:00
mDeflotte
e6d6e35b4d // New template for the blocklayered
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10915 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 14:08:13 +00:00
rMalie
d56cb00d8d // Remove Module->templateAssign() from modules (use $this->smarty->assign() instead)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10914 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 14:04:35 +00:00
mMarinetti
9527d10ffe // fix module blocknewsletter new theme
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10909 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 13:42:25 +00:00
sThiebaut
fe8a28ed54 // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10907 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 13:40:51 +00:00
vSchoener
941ecdac62 [-] MO : Mondialrelay, merge 1.4 => 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10901 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 10:54:40 +00:00
vSchoener
a2230b0161 [-] MO : Carriercompare (shipping estimation), merge 1.4 => 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10900 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 10:54:01 +00:00
vSchoener
19656ae993 [-] MO : Mondialrelay, merge 1.4 => 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10898 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 10:46:33 +00:00
mMarinetti
863ea0d354 // module newsletter hook fix + added create table in db_settings_extends.sql
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10896 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-05 09:37:36 +00:00
mMarinetti
c37cf6d657 // fix newsletter block
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10885 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 17:21:24 +00:00
mMarinetti
d0c46a3d3e // added missing blue arrow in homefeatured module
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10883 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 17:03:19 +00:00
mMarinetti
22031f6a57 // fix hookDisplayHeader in blockcontact (module and default install)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10881 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 16:55:44 +00:00
mMarinetti
ca16a8b559 // homefeatured fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10880 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 16:46:45 +00:00
mMarinetti
1cafb7629b // fix homefeatured
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10879 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 16:42:26 +00:00
mMarinetti
203b5ae6ad // fix new theme / old php in modules
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10878 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 16:41:22 +00:00
vKham
57eaa5cddf // add class button bt-export, new stylesheets for page stats, forget password login
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10875 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 16:27:26 +00:00
mMarinetti
63abc464ac // fix new theme css
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10873 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 16:22:53 +00:00
mMarinetti
810dab5d27 // new theme fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10869 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 16:10:22 +00:00
mMarinetti
9cc30dc3fe [+] Project : default theme added
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10862 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 15:24:40 +00:00
dSevere
43654ffba1 // StockManager : bugs fix + improvement of StockManager utilisation in fucntion of global configuration
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10861 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 15:23:01 +00:00
fSerny
465542aac7 [-] MO : eKomi (1.3) - fix on warnings (PS 1.5)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10854 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-02 11:23:04 +00:00
vKham
8e2102c8ce // add title h2 all tab page product, stylesheets stats
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10841 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 17:39:44 +00:00
mDeflotte
567c23dafc // BugFix on blocklayered and sliders
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10836 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 15:49:13 +00:00
mDeflotte
0c87d98914 // Blocklayered: Slider could be change with two inputs or a list of values
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10822 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-01 09:16:10 +00:00
mDeflotte
ff3c4b6881 // Blocklayered: BugFix in pagination
// Blocklayered: Add translations
// Blocklayered: BugFix with sliders (when cursor min and max are at 0)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10805 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 14:50:45 +00:00
mDeflotte
3ab955a654 // Blocklayered: Allow texture for color attribute
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10792 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 09:44:44 +00:00
mDeflotte
314cd37e67 // Blocklayered: Remove url_params of products in ps 1.5
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10786 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 08:46:02 +00:00
mDeflotte
a42ab201f0 // Blocklayered: BO message used "echo", replaced by a return.
// Blocklayered: Bug when show_limit = 0

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10785 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-30 08:33:37 +00:00
mDeflotte
557e05ae01 // Now blocklayered work with PS1.5 and 1.4
// Adding some improvement to the blocklayered : Filters are now customizable (checkbox, radio, ...)

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10763 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-29 18:03:21 +00:00
vKham
ad65287eeb // new layout page stats, substitute fieldset by div, legend by h2, delete stylesheet on html
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10760 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-29 17:42:38 +00:00
rMalie
9ca2fe4ca5 // Fix typo in blockwishlist
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10728 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-29 09:53:59 +00:00
mDeflotte
d3cf49aaef // blocklayered is now available for PS 1.4 and 1.5.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10715 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-28 16:25:48 +00:00
fBrignoli
66cbf514f4 [*] MO : Vatnumber - a warning is now displayed if the field "Your country" is empty (related #PSCFI-4200)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10712 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-28 15:33:46 +00:00
mDeflotte
a3b64f3253 // BugFix: removing a bad "return"
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10706 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-28 13:54:11 +00:00
mDeflotte
b957188797 // Translation files
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10699 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-28 10:51:48 +00:00
rGaillard
73148dda1d // Change urls of prestashop api
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10696 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-28 10:22:58 +00:00
rMalie
6b61051a16 [*] MO: remove all static call of Module::display() method. Use it as a method on a Module instance.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10695 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-28 10:04:41 +00:00
rMalie
95e1518335 // Fix display method on paypal module
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10694 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-28 09:10:37 +00:00
rGaillard
19749a2102 // Fix link in backoffice with multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10685 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-25 17:52:44 +00:00
rMalie
fe435bdeea // Log edited, this modification on Module::displayTemplate was reverted in a better one
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10675 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-25 16:09:13 +00:00
mDeflotte
506773b46c // Adding reference in admin order details
// Adding reference in payment return of cheque and bankwire module

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10669 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-25 15:45:38 +00:00