Commit Graph

359 Commits

Author SHA1 Message Date
mDeflotte
2a957e615a // Fixing problem with blocklayered
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11748 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-23 09:02:55 +00:00
vChabot
eee9c0dbf0 // translation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11725 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 23:07:40 +00:00
rGaillard
ca3ab742f0 // ImageType is now applied to a them
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11708 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 22:08:40 +00:00
aFolletete
d2f89e79ba // revert from r11699
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11702 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 21:56:00 +00:00
rGaillard
e8a3c10175 // ImageType is now applied to a them
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11700 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 21:48:40 +00:00
fSerny
7a09986e0c [-] PROJECT : Module controller now handle the column display (time to go to MacDo :)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11673 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 19:09:50 +00:00
mDeflotte
d1f8e02485 // Fixing problems with blockcart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11642 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 16:56:10 +00:00
rGaillard
b74fec078e // BlockLink
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11639 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 16:46:02 +00:00
rMalie
1f7c5e246b [+] MO: Add Module controller, Cheque and Bankwire modules use it
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11635 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 16:31:03 +00:00
bMancone
9c42712cb8 // updated homeslider
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11634 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 16:28:33 +00:00
sThiebaut
9924aaf850 // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11616 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 15:09:52 +00:00
rMalie
cb00fd4529 [-] MO: Fix displayHeader hook in homeFeatured
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11576 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-22 10:28:56 +00:00
rGaillard
8ab8ef1fec // cms_block multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11560 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 21:17:36 +00:00
aFolletete
d8b9f6b70e // update homeslider preview data
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11558 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 21:05:57 +00:00
bMancone
76a270ab66 // fixed homeSlider
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11554 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 20:29:21 +00:00
rGaillard
9f44210d82 // watermark is now multishop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11549 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 20:14:46 +00:00
vKham
c3dde0b518 // add stylesheet stats, commandes, new icon back to list
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11541 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 18:10:07 +00:00
mDeflotte
5866679f7c // Fix blockcart removing products
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11540 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 18:09:48 +00:00
bMancone
2b9f2027f5 // fixed homeslider
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11534 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 17:46:31 +00:00
mDeflotte
cfd6918b70 // Fix smarty variable conflict
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11531 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 17:43:34 +00:00
vChabot
a089131884 // removing categories assocation with shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11509 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 16:18:24 +00:00
jBreux
4c5806856e // Fix duplicates and standardize tab and author
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11480 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 13:32:37 +00:00
vChabot
59146657ab // fix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11474 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 12:33:26 +00:00
mDeflotte
857a59ae9d // BugFix : BlockTopMenu is not visible when user is connected
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11468 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 10:56:09 +00:00
jmCollin
53ba841568 //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11466 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 10:45:01 +00:00
mDeflotte
9637f7f409 // BugFix : Problems with blockcart
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11456 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-21 09:52:38 +00:00
fSerny
a1e0b74fcc [*] PROJECT : Moving partner module to another repository
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11445 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 23:05:48 +00:00
vChabot
6ef2e2cc50 [*] BO : New category management with multi shop
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11437 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-20 17:36:08 +00:00
jmCollin
5720e0190f // Fix bug in preg_match
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11359 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 14:23:08 +00:00
rMalie
b7ae37f6d7 // Change prototype of methods from(), leftJoin(), innerJoin(), leftOuterJoin() and naturalJoin() for DbQuery class
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11351 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 11:13:13 +00:00
jmCollin
b432570f9d //
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11342 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 09:51:26 +00:00
jmCollin
8bca38ad20 Fix memory bug with Prestafraud configuration
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11340 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 09:41:39 +00:00
fGaillard
82419c80aa [-] Classes : #PSCFI-4477 : BugFix GSiteMap priority - Decimals no longer take care about local numeric separator
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11338 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 09:37:38 +00:00
mDeflotte
21d4c051bd // Traductions files
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11336 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-19 09:25:37 +00:00
vAugagneur
1d545efe66 //move jquery plugin in the good folder
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11333 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-18 21:17:06 +00:00
aFolletete
4b4a4bbfce // fix notice error on payment validation
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11324 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-17 16:44:48 +00:00
lLefevre
fd1ad0f57a // FO : enable languages if > 1
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11265 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 14:30:05 +00:00
mDeflotte
86aa61d3c0 // BugFix : Blocklayered little fix with product order
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11258 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 13:41:53 +00:00
mDeflotte
5d941ccc26 // BugFix
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11247 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-15 10:50:42 +00:00
mMarinetti
26c8f164a9 [*] MO : mailjet is now in advertising_marketing category (instead of front_office_features)
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11202 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 12:24:42 +00:00
sThiebaut
668f117382 // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11196 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-14 09:17:50 +00:00
mMarinetti
3c055ccf7a [-] MO : editorial : bugfix on install/uninstall, norm
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11167 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-13 10:54:52 +00:00
fGaillard
9dff6c5a8c [-] MO : #PSCFI-4389 : Block Advertising hookHeader added
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11132 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 13:41:38 +00:00
mDeflotte
aaf0127906 // BlockLayered : Adding product shop restriction
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11116 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 10:46:19 +00:00
mMarinetti
d93415cfad // module editorial hooks name
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11114 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-12 10:35:18 +00:00
mMarinetti
a551a424b6 // new modules hooked for default theme, fixed hook names
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11087 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 15:52:37 +00:00
mDeflotte
de2e800ebd // Blocklayered : Filter templates could be associated to shops now
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11083 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-09 15:47:15 +00:00
sThiebaut
085f64c85f // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11066 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 17:07:55 +00:00
mDeflotte
c1d6e68cd6 // BugFix : Blocklayered
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11043 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 10:50:54 +00:00
mDeflotte
403d24ff4b // BugFix : Blocklayered
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11040 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 10:45:27 +00:00