Commit Graph

741 Commits

Author SHA1 Message Date
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
mDeflotte 52c86a9bc3 // Blocklayered
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11038 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-08 10:36:42 +00:00
lLefevre 7873905bb5 // fix norm && added PDO::FETCH_ASSOC in method fetch() for PDO
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11029 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-07 17:30:32 +00:00
dSevere 1f42bf8d4e // Bugs fix (Collection, SQL optimizations, Backoffice interfaces improvement, ...) + update db_settings_extends.sql for base datas relative to available quantities and suppliers
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11014 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 18:07:06 +00:00
mMarinetti eae123dbeb [+] MO : homeslider is now replacing editorial in default installation
[-] MO : homeslider bugfix multishop + add samples
[-] MO : blocksupplier updated hookname

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11011 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 17:53:23 +00:00
sThiebaut 9c42a4987d // maj
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@11008 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 17:38:25 +00:00
rMalie f55a9e04b9 [*] Classes: Db->execute() now return always a boolean. Use Db->query() instead.
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10999 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 15:41:34 +00:00
mDeflotte f24d06977b [-] MO : #PSCFI-4015 - layered navigation module on IE7 creates scripterror / empty query
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10987 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 14:26:43 +00:00
mDeflotte 35fea4b692 [-] FO : #PSCFI-3865 - Block Layered translation issues
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10985 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 14:23:57 +00:00
dSevere 5b9e12bba1 // Update Stats interface relative to stock available functionnality + retrocompatibility for supplier reference and wholesale_price for a product/product attribute
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10980 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 14:02:50 +00:00
mDeflotte b6f25900ee // Removing numerics from order reference
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10978 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 13:18:00 +00:00
fBrignoli 187aafaf51 [*] PDF : Licenses + Hook in templates
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10974 b9a71923-0436-4b27-9f14-aed3839534dd
2011-12-06 10:58:20 +00:00
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