Merge pull request #11357 from piwik/3.x-dev

Release Piwik 3.0.2-b4

CHANGELOG.md

@@ -8,6 +8,7 @@ The Product Changelog at **[piwik.org/changelog](http://piwik.org/changelog)** l
 
 ### New APIs
 * The JavaScript Tracker now supports CrossDomain tracking. The following tracker methods were added for this: `enableCrossDomainLinking`, `disableCrossDomainLinking`, `isCrossDomainLinkingEnabled`
+* Added JavaScript Tracker method `getLinkTrackingTimer` to get the value of the configured link tracking time
 * Added a new method `Piwik\Plugin\Report::getMetricNamesToProcessReportTotals()` that lets you define which metrics should show percentages in the table report visualization on hover. If defined, these percentages will be automatically calculated.
 
 ## Piwik 3.0.1

LEGALNOTICE

@@ -116,10 +116,6 @@ THIRD-PARTY COMPONENTS AND LIBRARIES
 	Link:  http://mths.be/placeholder
 	License:  Dual licensed: MIT (Expat) or GPL
 
-	Name:  jquery smartbanner
-	Link:  https://github.com/jasny/jquery.smartbanner
-	License:  Dual licensed: MIT (Expat)
-
 	Name:  json2.js
 	Link:  http://json.org/
 	License:  Public domain

core/API/DataTableManipulator/ReportTotalsCalculator.php

@@ -129,6 +129,7 @@ private function makeSureToWorkOnFirstLevelDataTable($table)
         }
 
         $request = $this->request;
+        unset($request['idSubtable']); // to make sure we work on first level table
 
         /** @var \Piwik\Period $period */
         $period = $table->getMetadata('period');

core/API/Inconsistencies.php

@@ -37,7 +37,9 @@ public function getPercentMetricsToFormat()
             'bounce_rate_returning',
             'nb_visits_percentage',
             '/.*_evolution/',
-            '/goal_.*_conversion_rate/'
+            '/goal_.*_conversion_rate/',
+            '/form_.*_rate/',
+            '/field_.*_rate/',
         );
     }
 }

core/ReportRenderer/Html.php

@@ -9,7 +9,9 @@
 namespace Piwik\ReportRenderer;
 
 use Piwik\Piwik;
+use Piwik\Plugin;
 use Piwik\Plugins\API\API;
+use Piwik\Plugins\CoreAdminHome\CustomLogo;
 use Piwik\ReportRenderer;
 use Piwik\SettingsPiwik;
 use Piwik\Site;
@@ -85,6 +87,7 @@ public function getRenderedReport()
     private function epilogue()
     {
         $view = new View('@CoreHome/ReportRenderer/_htmlReportFooter');
+        $view->hasWhiteLabel = Plugin\Manager::getInstance()->isPluginLoaded('WhiteLabel');
         $this->rendering .= $view->render();
     }
 
@@ -105,6 +108,10 @@ public function renderFrontPage($reportTitle, $prettyDate, $description, $report
         $frontPageView->assign("idSite", $this->idSite);
         $frontPageView->assign("period", $period);
 
+        $customLogo = new CustomLogo();
+        $frontPageView->assign("isCustomLogo", $customLogo->isEnabled() && CustomLogo::hasUserLogo());
+        $frontPageView->assign("logoHeader", $customLogo->getHeaderLogoUrl($pathOnly = false));
+
         $date = Date::now()->setTimezone(Site::getTimezoneFor($this->idSite))->toString();
         $frontPageView->assign("date", $date);
 

core/Version.php

@@ -20,7 +20,7 @@ final class Version
      * The current Piwik version.
      * @var string
      */
-    const VERSION = '3.0.2-b3';
+    const VERSION = '3.0.2-b4';
 
     public function isStableVersion($version)
     {

js/piwik.js

@@ -992,7 +992,7 @@ if (typeof JSON_PIWIK !== 'object' && typeof window.JSON === 'object' && window.
     disablePerformanceTracking, setGenerationTimeMs,
     doNotTrack, setDoNotTrack, msDoNotTrack, getValuesFromVisitorIdCookie, enableCrossDomainLinking,
     disableCrossDomainLinking, isCrossDomainLinkingEnabled,
-    addListener, enableLinkTracking, enableJSErrorTracking, setLinkTrackingTimer,
+    addListener, enableLinkTracking, enableJSErrorTracking, setLinkTrackingTimer, getLinkTrackingTimer,
     enableHeartBeatTimer, disableHeartBeatTimer, killFrame, redirectFile, setCountPreRendered,
     trackGoal, trackLink, trackPageView, trackRequest, trackSiteSearch, trackEvent,
     setEcommerceView, addEcommerceItem, trackEcommerceOrder, trackEcommerceCartUpdate,
@@ -1032,7 +1032,7 @@ if (typeof JSON_PIWIK !== 'object' && typeof window.JSON === 'object' && window.
 /*members push */
 /*global Piwik:true */
 /*members addPlugin, getTracker, getAsyncTracker, getAsyncTrackers, addTracker, trigger, on, off, retryMissedPluginCalls,
-          DOM, onLoad, onReady, JSON */
+          DOM, onLoad, onReady, isNodeVisible, isOrWasNodeVisible, JSON */
 /*global Piwik_Overlay_Client */
 /*global AnalyticsTracker:true */
 /*members initialize */
@@ -5928,6 +5928,15 @@ if (typeof window.Piwik !== 'object') {
                 configTrackerPause = delay;
             };
 
+            /**
+             * Get delay for link tracking (in milliseconds)
+             *
+             * @param int delay
+             */
+            this.getLinkTrackingTimer = function () {
+                return configTrackerPause;
+            };
+
             /**
              * Set list of file extensions to be recognized as downloads
              *
@@ -6988,7 +6997,17 @@ if (typeof window.Piwik !== 'object') {
                  *
                  * @param function callback
                  */
-                onReady: trackCallbackOnReady
+                onReady: trackCallbackOnReady,
+
+                /**
+                 * Detect whether a node is visible right now.
+                 */
+                isNodeVisible: isVisible,
+
+                /**
+                 * Detect whether a node has been visible at some point
+                 */
+                isOrWasNodeVisible: content.isNodeVisible
             },
 
             /**