From 28066b5c94205624f2761a3cab19879afa40adff Mon Sep 17 00:00:00 2001 From: Stefan Giehl Date: Tue, 28 Feb 2017 22:49:58 +0100 Subject: do not show smtp password in html (#11428) --- plugins/CoreAdminHome/Controller.php | 6 ++++++ .../angularjs/smtp/mail-smtp.controller.js | 17 ++++++++++++----- plugins/CoreAdminHome/templates/generalSettings.twig | 3 ++- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php index 8481410e0c..3b96590946 100644 --- a/plugins/CoreAdminHome/Controller.php +++ b/plugins/CoreAdminHome/Controller.php @@ -132,6 +132,12 @@ class Controller extends ControllerAdmin $mail['type'] = Common::getRequestVar('mailType', ''); $mail['username'] = Common::unsanitizeInputValue(Common::getRequestVar('mailUsername', '')); $mail['password'] = Common::unsanitizeInputValue(Common::getRequestVar('mailPassword', '')); + + if (!array_key_exists('mailPassword', $_POST)) { + // use old password if it wasn't set in request + $mail['password'] = Config::getInstance()->mail['password']; + } + $mail['encryption'] = Common::getRequestVar('mailEncryption', ''); Config::getInstance()->mail = $mail; diff --git a/plugins/CoreAdminHome/angularjs/smtp/mail-smtp.controller.js b/plugins/CoreAdminHome/angularjs/smtp/mail-smtp.controller.js index 1ef0ce0510..98b8f9743d 100644 --- a/plugins/CoreAdminHome/angularjs/smtp/mail-smtp.controller.js +++ b/plugins/CoreAdminHome/angularjs/smtp/mail-smtp.controller.js @@ -17,21 +17,28 @@ var self = this; this.isLoading = false; + this.passwordChanged = false; this.save = function () { this.isLoading = true; - piwikApi.withTokenInUrl(); - piwikApi.post({module: 'CoreAdminHome', action: 'setMailSettings'}, { + var mailSettings = { mailUseSmtp: this.enabled ? '1' : '0', mailPort: this.mailPort, mailHost: this.mailHost, mailType: this.mailType, mailUsername: this.mailUsername, - mailPassword: this.mailPassword, - mailEncryption: this.mailEncryption, - }).then(function (success) { + mailEncryption: this.mailEncryption + }; + + if (this.passwordChanged) { + mailSettings.mailPassword = this.mailPassword; + } + + piwikApi.withTokenInUrl(); + piwikApi.post({module: 'CoreAdminHome', action: 'setMailSettings'}, mailSettings) + .then(function (success) { self.isLoading = false; diff --git a/plugins/CoreAdminHome/templates/generalSettings.twig b/plugins/CoreAdminHome/templates/generalSettings.twig index 69a17cb17e..8a78087345 100644 --- a/plugins/CoreAdminHome/templates/generalSettings.twig +++ b/plugins/CoreAdminHome/templates/generalSettings.twig @@ -130,8 +130,9 @@
+ value="{{ mail.password ? '******' }}" inline-help="{{ help|e('html_attr') }}">
Date: Wed, 1 Mar 2017 11:09:05 +1300 Subject: Fix Clicking on the "Dashboard" top link hides all dashboard content (#11429) * Fix Clicking on the "Dashboard" top link hides all dashboard content fixes #11386 * also fix links in admin menu --- plugins/CoreHome/templates/_menu.twig | 4 ++-- plugins/CoreHome/templates/_topBar.twig | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/CoreHome/templates/_menu.twig b/plugins/CoreHome/templates/_menu.twig index 7fa08961ec..a6f72eb3ef 100644 --- a/plugins/CoreHome/templates/_menu.twig +++ b/plugins/CoreHome/templates/_menu.twig @@ -25,7 +25,7 @@
  • - {{ name|translate }} @@ -58,7 +58,7 @@ {% for name,urlParameters in level2 %} {% if name|slice(0,1) != '_' %}
  • - {{ name|translate }}
    • {% endif %} diff --git a/plugins/CoreHome/templates/_topBar.twig b/plugins/CoreHome/templates/_topBar.twig index 42582f0dc1..f284d8a282 100644 --- a/plugins/CoreHome/templates/_topBar.twig +++ b/plugins/CoreHome/templates/_topBar.twig @@ -13,7 +13,7 @@ {{ menu._html|raw }} {% else %} {{ _self.menuItemLabel(label, icon) }} {% endif %} {% endmacro %} -- cgit v1.2.3 From 4f0c60c851792331fba094bcff90780ac2c9298f Mon Sep 17 00:00:00 2001 From: mattab Date: Wed, 1 Mar 2017 01:40:49 +0100 Subject: InnoCraft Cloud --- README.md | 2 +- plugins/CoreUpdater/templates/updateSuccess.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8095a31036..40f7fbe51f 100644 --- a/README.md +++ b/README.md @@ -53,7 +53,7 @@ See http://piwik.org/docs/requirements/ See http://piwik.org/docs/installation/ -If you do not have a server, consider our Piwik Hosting partner: http://piwik.org/hosting/ +If you do not have a server, consider our Piwik Hosting partner: https://www.innocraft.cloud/ ## Changelog diff --git a/plugins/CoreUpdater/templates/updateSuccess.twig b/plugins/CoreUpdater/templates/updateSuccess.twig index 0e57bade27..d1897777d9 100644 --- a/plugins/CoreUpdater/templates/updateSuccess.twig +++ b/plugins/CoreUpdater/templates/updateSuccess.twig @@ -27,7 +27,7 @@ {{ 'CoreUpdater_ServicesSupport'|translate }}
    - {{ 'CoreUpdater_CloudHosting'|translate }} + {{ 'CoreUpdater_CloudHosting'|translate }}
    -- cgit v1.2.3 From 00406374a88b8b1f617b17ff12258c5d86463145 Mon Sep 17 00:00:00 2001 From: Matthieu Aubry Date: Wed, 1 Mar 2017 10:22:06 +0100 Subject: Updated our own composer libraries to latest (#11430) * Updated our own composer libraries to latest * trigger build * build * adds missing icons --- composer.lock | 34 ++++++++++----------- .../Referrers/images/searchEngines/laban.vn.png | Bin 0 -> 617 bytes .../images/searchEngines/search.lilo.org.png | Bin 0 -> 1227 bytes 3 files changed, 17 insertions(+), 17 deletions(-) create mode 100644 plugins/Referrers/images/searchEngines/laban.vn.png create mode 100644 plugins/Referrers/images/searchEngines/search.lilo.org.png diff --git a/composer.lock b/composer.lock index 581111e200..81891faa81 100644 --- a/composer.lock +++ b/composer.lock @@ -15,7 +15,7 @@ "url": "https://github.com/composer/semver.git", "reference": "df4463baa9f44fe6cf0a6da4fde2934d4c0a2747" }, - "dist": { + "dist": { "type": "zip", "url": "https://api.github.com/repos/composer/semver/zipball/df4463baa9f44fe6cf0a6da4fde2934d4c0a2747", "reference": "df4463baa9f44fe6cf0a6da4fde2934d4c0a2747", @@ -885,16 +885,16 @@ }, { "name": "piwik/piwik-php-tracker", - "version": "1.1.0", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/piwik/piwik-php-tracker.git", - "reference": "41dd1c03a5c324e3791b9ca82c092337dc3a0cdf" + "reference": "5f435290eb8a82b14630882c6e52520eef13f883" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/piwik/piwik-php-tracker/zipball/41dd1c03a5c324e3791b9ca82c092337dc3a0cdf", - "reference": "41dd1c03a5c324e3791b9ca82c092337dc3a0cdf", + "url": "https://api.github.com/repos/piwik/piwik-php-tracker/zipball/5f435290eb8a82b14630882c6e52520eef13f883", + "reference": "5f435290eb8a82b14630882c6e52520eef13f883", "shasum": "" }, "type": "library", @@ -921,20 +921,20 @@ "piwik", "tracker" ], - "time": "2016-12-27 09:41:03" + "time": "2017-02-18 09:41:30" }, { "name": "piwik/referrer-spam-blacklist", - "version": "1.0.11", + "version": "1.0.12", "source": { "type": "git", "url": "https://github.com/piwik/referrer-spam-blacklist.git", - "reference": "bf001c4e2bba063d5f13e714047c4822a975371a" + "reference": "0f2c50d94def37f66e389e04f809741cbac2d7cd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/piwik/referrer-spam-blacklist/zipball/bf001c4e2bba063d5f13e714047c4822a975371a", - "reference": "bf001c4e2bba063d5f13e714047c4822a975371a", + "url": "https://api.github.com/repos/piwik/referrer-spam-blacklist/zipball/0f2c50d94def37f66e389e04f809741cbac2d7cd", + "reference": "0f2c50d94def37f66e389e04f809741cbac2d7cd", "shasum": "" }, "type": "library", @@ -943,20 +943,20 @@ "Public Domain" ], "description": "Community-contributed list of referrer spammers", - "time": "2017-01-03 21:55:42" + "time": "2017-02-27 16:54:54" }, { "name": "piwik/searchengine-and-social-list", - "version": "1.3.5", + "version": "1.3.6", "source": { "type": "git", "url": "https://github.com/piwik/searchengine-and-social-list.git", - "reference": "8302a7414bd48f44916bd4858859607838ac2526" + "reference": "2d9efdabd2133ffdef0b607999b49ba59491cc43" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/piwik/searchengine-and-social-list/zipball/8302a7414bd48f44916bd4858859607838ac2526", - "reference": "8302a7414bd48f44916bd4858859607838ac2526", + "url": "https://api.github.com/repos/piwik/searchengine-and-social-list/zipball/2d9efdabd2133ffdef0b607999b49ba59491cc43", + "reference": "2d9efdabd2133ffdef0b607999b49ba59491cc43", "shasum": "" }, "type": "library", @@ -965,7 +965,7 @@ "Public Domain" ], "description": "Search engine and social network definitions used by Piwik", - "time": "2016-11-09 20:36:59" + "time": "2017-02-28 16:33:02" }, { "name": "psr/log", @@ -1502,7 +1502,7 @@ "description": "XHProf: A Hierarchical Profiler for PHP", "homepage": "http://pecl.php.net/package/xhprof", "keywords": [ - "performance", + "performance", "profiling" ], "time": "2015-02-26 14:37:51" diff --git a/plugins/Referrers/images/searchEngines/laban.vn.png b/plugins/Referrers/images/searchEngines/laban.vn.png new file mode 100644 index 0000000000..3ce6a3697f Binary files /dev/null and b/plugins/Referrers/images/searchEngines/laban.vn.png differ diff --git a/plugins/Referrers/images/searchEngines/search.lilo.org.png b/plugins/Referrers/images/searchEngines/search.lilo.org.png new file mode 100644 index 0000000000..99ba06abfa Binary files /dev/null and b/plugins/Referrers/images/searchEngines/search.lilo.org.png differ -- cgit v1.2.3 From 62322f33b48935cd645f02bd79b94a418e6be654 Mon Sep 17 00:00:00 2001 From: Matthieu Aubry Date: Wed, 1 Mar 2017 10:33:35 +0100 Subject: Cells in email reports should reuse same font size and family (#11434) * Cells in email reports should reuse same font size and family * Fix tests --- .../templates/ReportRenderer/_htmlReportBody.twig | 4 +- ...duledReports.generateReport_month.original.html | 2412 +++++++-------- ...eduledReports.generateReport_week.original.html | 3220 ++++++++++---------- 3 files changed, 2818 insertions(+), 2818 deletions(-) diff --git a/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig b/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig index f901ddd6be..d331175edd 100644 --- a/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig +++ b/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig @@ -46,10 +46,10 @@ {% else %} {% set rowMetadata=null %} {% endif %} - + {% set cycleIndex=cycleIndex+1 %} {% for columnId, columnName in reportColumns %} - + {% if columnId == 'label' %} {% if rowMetrics[columnId] is defined %} {% if rowMetadata.logo is defined %} diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html index fe63fbe641..be472ece87 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html @@ -395,54 +395,54 @@ - - + + Site 1 - + 11 - + 43 - + 43 - + $ 0 - + 0 - + 0 - + $ 0 - - + + Site 2 - + 1 - + 3 - + 3 - + $ 0 - + 0 - + 0 - + $ 0 @@ -470,58 +470,58 @@ - - + + Unique visitors - + 2 - - + + Visits - + 11 - - + + Actions - + 43 - - + + Maximum actions in one visit - + 5 - - + + Actions per Visit - + 3.9 - - + + Avg. Visit Duration (in seconds) - + 00:10:55 - - + + Bounce Rate - + 27% @@ -576,52 +576,52 @@ - - + +   Unknown - + 8 - + 40 - + 5 - + 00:15:01 - + 0% - + $ 0 - - + +   Desktop - + 3 - + 3 - + 1 - + 00:00:00 - + 100% - + $ 0 @@ -664,25 +664,25 @@ - - + + Unknown - + 11 - + 43 - + 3.9 - + 00:10:55 - + 27% - + $ 0 @@ -725,27 +725,27 @@ - - + +   Unknown - + 11 - + 43 - + 3.9 - + 00:10:55 - + 27% - + $ 0 @@ -788,48 +788,48 @@ - - + + 800x300 - + 9 - + 41 - + 4.6 - + 00:13:21 - + 11% - + 0% - - + + 1024x768 - + 2 - + 2 - + 1 - + 00:00:00 - + 100% - + 0% @@ -872,52 +872,52 @@ - - + +   Unknown - + 8 - + 40 - + 5 - + 00:15:01 - + 0% - + 0% - - + +   Windows XP - + 3 - + 3 - + 1 - + 00:00:00 - + 100% - + 0% @@ -960,77 +960,77 @@ - - + +   Unknown - + 8 - + 40 - + 5 - + 00:15:01 - + 0% - + 0% - - + +   Firefox - + 2 - + 2 - + 1 - + 00:00:00 - + 100% - + 0% - - + +   Opera - + 1 - + 1 - + 1 - + 00:00:00 - + 100% - + 0% @@ -1073,77 +1073,77 @@ - - + +   Unknown - + 8 - + 40 - + 5 - + 00:15:01 - + 0% - + 0% - - + +   Firefox 3.6 - + 2 - + 2 - + 1 - + 00:00:00 - + 100% - + 0% - - + +   Opera 9.63 - + 1 - + 1 - + 1 - + 00:00:00 - + 100% - + 0% @@ -1186,71 +1186,71 @@ - - + + Unknown / Unknown / 800x300 - + 8 - + 40 - + 5 - + 00:15:01 - + 0% - + 0% - - + + Windows / Firefox / 1024x768 - + 2 - + 2 - + 1 - + 00:00:00 - + 100% - + 0% - - + + Windows / Opera / 800x300 - + 1 - + 1 - + 1 - + 00:00:00 - + 100% - + 0% @@ -1293,52 +1293,52 @@ - - + +   Unknown - + 8 - + 40 - + 5 - + 00:15:01 - + 0% - + 0% - - + +   Windows - + 3 - + 3 - + 1 - + 00:00:00 - + 100% - + 0% @@ -1381,71 +1381,71 @@ - - + + Unknown - + 8 - + 40 - + 5 - + 00:15:01 - + 0% - + 0% - - + + Gecko (Firefox) - + 2 - + 2 - + 1 - + 00:00:00 - + 100% - + 0% - - + + Presto (Opera) - + 1 - + 1 - + 1 - + 00:00:00 - + 100% - + 0% @@ -1476,132 +1476,132 @@ - - + +   Cookie - + 11 - + 100% - - + +   Flash - + 11 - + 100% - - + +   Java - + 11 - + 100% - - + +   Director - + 0 - + 0% - - + +   Gears - + 0 - + 0% - - + +   Pdf - + 0 - + 0% - - + +   Quicktime - + 0 - + 0% - - + +   Realplayer - + 0 - + 0% - - + +   Silverlight - + 0 - + 0% - - + +   Windowsmedia - + 0 - + 0% @@ -1644,52 +1644,52 @@ - - + +   Unknown - + 8 - + 40 - + 5 - + 00:15:01 - + 0% - + $ 0 - - + +   France - + 3 - + 3 - + 1 - + 00:00:00 - + 100% - + $ 0 @@ -1732,48 +1732,48 @@ - - + + Unknown - + 8 - + 40 - + 5 - + 00:15:01 - + 0% - + $ 0 - - + + Europe - + 3 - + 3 - + 1 - + 00:00:00 - + 100% - + $ 0 @@ -1816,27 +1816,27 @@ - - + +   Unknown - + 11 - + 43 - + 3.9 - + 00:10:55 - + 27% - + $ 0 @@ -1879,48 +1879,48 @@ - - + + Unknown - + 8 - + 40 - + 5 - + 00:15:01 - + 0% - + 0% - - + + French - + 3 - + 3 - + 1 - + 00:00:00 - + 100% - + 0% @@ -1963,27 +1963,27 @@ - - + +   Unknown - + 11 - + 43 - + 3.9 - + 00:10:55 - + 27% - + $ 0 @@ -2026,48 +2026,48 @@ - - + + Unknown (xx) - + 8 - + 40 - + 5 - + 00:15:01 - + 0% - + 0% - - + + French (fr) - + 3 - + 3 - + 1 - + 00:00:00 - + 100% - + 0% @@ -2095,82 +2095,82 @@ - - + + 0-10s - + 3 - - + + 11-30s - + 0 - - + + 31-60s - + 0 - - + + 1-2 min - + 0 - - + + 2-4 min - + 0 - - + + 4-7 min - + 0 - - + + 7-10 min - + 0 - - + + 10-15 min - + 0 - - + + 15-30 min - + 8 - - + + 30+ min - + 0 @@ -2198,82 +2198,82 @@ - - + + 1 page - + 3 - - + + 2 pages - + 0 - - + + 3 pages - + 0 - - + + 4 pages - + 0 - - + + 5 pages - + 8 - - + + 6-7 pages - + 0 - - + + 8-10 pages - + 0 - - + + 11-14 pages - + 0 - - + + 15-20 pages - + 0 - - + + 21+ pages - + 0 @@ -2304,156 +2304,156 @@ - - + + 1 visit - + 3 - + 27% - - + + 2 visits - + 8 - + 73% - - + + 3 visits - + 0 - + 0% - - + + 4 visits - + 0 - + 0% - - + + 5 visits - + 0 - + 0% - - + + 6 visits - + 0 - + 0% - - + + 7 visits - + 0 - + 0% - - + + 8 visits - + 0 - + 0% - - + + 9-14 visits - + 0 - + 0% - - + + 15-25 visits - + 0 - + 0% - - + + 26-50 visits - + 0 - + 0% - - + + 51-100 visits - + 0 - + 0% - - + + 101-200 visits - + 0 - + 0% - - + + 201+ visits - + 0 - + 0% @@ -2481,122 +2481,122 @@ - - + + New visits - + 2 - - + + 0 days - + 1 - - + + 1 day - + 0 - - + + 2 days - + 1 - - + + 3 days - + 1 - - + + 4 days - + 1 - - + + 5 days - + 1 - - + + 6 days - + 1 - - + + 7 days - + 1 - - + + 8-14 days - + 2 - - + + 15-30 days - + 0 - - + + 31-60 days - + 0 - - + + 61-120 days - + 0 - - + + 121-364 days - + 0 - - + + 365+ days - + 0 @@ -2624,66 +2624,66 @@ - - + + Unique returning visitors - + 2 - - + + Returning Users - + 0 - - + + Returning Visits - + 9 - - + + Actions by Returning Visits - + 41 - - + + Maximum actions in one returning visit - + 5 - - + + Bounce Rate for Returning Visits - + 11% - - + + Avg. Actions per Returning Visit - + 4.6 - - + + Avg. Duration of a Returning Visit (in sec) - + 00:13:21 @@ -2726,554 +2726,554 @@ - - + + 0h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 1h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 2h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 3h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 4h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 5h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 6h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 7h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 8h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 9h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 10h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 11h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 12h - + 11 - + 43 - + 3.9 - + 00:10:55 - + 27% - + 0% - - + + 13h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 14h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 15h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 16h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 17h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 18h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 19h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 20h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 21h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 22h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 23h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% @@ -3316,554 +3316,554 @@ - - + + 0h - + 1 - + 1 - + 1 - + 00:00:00 - + 100% - + $ 0 - - + + 1h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 2h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 3h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 4h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 5h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 6h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 7h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 8h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 9h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 10h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 11h - + 8 - + 40 - + 5 - + 00:15:01 - + 0% - + $ 0 - - + + 12h - + 1 - + 1 - + 1 - + 00:00:00 - + 100% - + $ 0 - - + + 13h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 14h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 15h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 16h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 17h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 18h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 19h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 20h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 21h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 22h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 23h - + 1 - + 1 - + 1 - + 00:00:00 - + 100% - + $ 0 @@ -3906,163 +3906,163 @@ - - + + Monday - + 2 - + 6 - + 3 - + 00:07:31 - + 50% - + 0% - - + + Tuesday - + 2 - + 10 - + 5 - + 00:15:01 - + 0% - + 0% - - + + Wednesday - + 1 - + 5 - + 5 - + 00:15:01 - + 0% - + 0% - - + + Thursday - + 1 - + 5 - + 5 - + 00:15:01 - + 0% - + 0% - - + + Friday - + 1 - + 5 - + 5 - + 00:15:01 - + 0% - + 0% - - + + Saturday - + 1 - + 5 - + 5 - + 00:15:01 - + 0% - + 0% - - + + Sunday - + 3 - + 7 - + 2.3 - + 00:05:00 - + 67% - + 0% @@ -4090,74 +4090,74 @@ - - + + Pageviews - + 43 - - + + Unique Pageviews - + 27 - - + + Downloads - + 0 - - + + Unique Downloads - + 0 - - + + Outlinks - + 0 - - + + Unique Outlinks - + 0 - - + + Searches - + 0 - - + + Unique Keywords - + 0 - - + + Avg. generation time - + 0.3s @@ -4185,26 +4185,26 @@ - - + + Bytes transferred overall - + 0 - - + + Bytes transferred pageviews - + 0 - - + + Bytes transferred downloads - + 0 @@ -4247,102 +4247,102 @@ - - + + index.htm - + 9 - + 9 - + 00:05:20 - + 11% - + 11% - + 0.3s - - + + Page URL not defined - + 17 - + 9 - + 00:00:00 - + 0% - + 0% - + 0.22s - - + + thankyou - + 16 - + 8 - + 00:04:30 - + 0% - + 100% - + 0.31s - - + + products - + 1 - + 1 - + 00:00:00 - + 100% - + 100% - + 0.15s @@ -4379,40 +4379,40 @@ - - + + index.htm - + 9 - + 1 - + 11% - + 0.3s - - + + products - + 1 - + 1 - + 100% - + 0.15s @@ -4449,36 +4449,36 @@ - - + + second visitor/two days later/a new visit - + 8 - + 0 - + 0% - + 0.32s - - + + first page view - + 2 - + 2 - + 100% - + 0.14s @@ -4515,59 +4515,59 @@ - - + + index.htm - + 1 - + 9 - + 11% - + 0.3s - - + + thankyou - + 8 - + 8 - + 100% - + 0.31s - - + + products - + 1 - + 1 - + 100% - + 0.15s @@ -4604,36 +4604,36 @@ - - + + Checkout/Purchasing... - + 8 - + 8 - + 100% - + 0.45s - - + + first page view - + 2 - + 2 - + 100% - + 0.14s @@ -4676,117 +4676,117 @@ - - + + Checkout/Purchasing... - + 8 - + 8 - + 00:00:00 - + 0% - + 100% - + 0.45s - - + + second visitor/two days later/a new visit - + 8 - + 8 - + 00:06:00 - + 0% - + 0% - + 0.32s - - + + second visitor/two days later/second page view - + 8 - + 8 - + 00:09:00 - + 0% - + 0% - + 0.17s - - + + first page view - + 2 - + 2 - + 00:00:00 - + 100% - + 100% - + 0.14s - - + + Page Name not defined - + 1 - + 1 - + 00:00:00 - + 0% - + 0% - + 0.22s @@ -4901,71 +4901,71 @@ - - + + Websites - + 6 - + 22 - + 3.7 - + 00:10:01 - + 33% - + $ 0 - - + + Campaigns - + 4 - + 20 - + 5 - + 00:15:01 - + 0% - + $ 0 - - + + Direct Entry - + 1 - + 1 - + 1 - + 00:00:00 - + 100% - + $ 0 @@ -5008,48 +5008,48 @@ - - + + referrer.com - + 6 - + 22 - + 3.7 - + 00:10:01 - + 33% - + 0% - - + + goal-matching-url-parameter - + 4 - + 20 - + 5 - + 00:15:01 - + 0% - + 0% @@ -5104,77 +5104,77 @@ - - + + referrer.com/Other_Page.htm - + 2 - + 10 - + 5 - + 00:15:01 - + 0% - + $ 0 - - + + referrer.com/Other_Page.htm - + 2 - + 10 - + 5 - + 00:15:01 - + 0% - + $ 0 - - + + referrer.com/page.htm?param=valuewith some spaces - + 2 - + 2 - + 1 - + 00:00:00 - + 100% - + $ 0 @@ -5223,25 +5223,25 @@ - - + + goal-matching-url-parameter - referrer.com - + 4 - + 20 - + 5 - + 00:15:01 - + 0% - + $ 0 @@ -5269,34 +5269,34 @@ - - + + Conversions - + 0 - - + + Visits with Conversions - + 0 - - + + Revenue - + $ 0 - - + + Conversion Rate - + 0% diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html index a068adcd4d..6b3d2cc819 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html @@ -455,54 +455,54 @@ - - + + Piwik test - + 5 - + 16 - + 16 - + $ 13361.11 - + 5 - + 4 - + $ 13351.11 - - + + Piwik test - + 2 - + 1 - + 1 - + $ 250 - + 1 - + 0 - + $ 0 @@ -530,58 +530,58 @@ - - + + Unique visitors - + 1 - - + + Visits - + 5 - - + + Actions - + 16 - - + + Maximum actions in one visit - + 6 - - + + Actions per Visit - + 3.2 - - + + Avg. Visit Duration (in seconds) - + 00:22:49 - - + + Bounce Rate - + 20% @@ -630,71 +630,71 @@ - - + + ValueIsZero - Custom Variable value not defined - + 5 - + 16 - + 3.2 - + 00:22:49 - + 20% - + $ 13361.11 - - + + VisitorType - NewLoggedOut - + 5 - + 16 - + 3.2 - + 00:22:49 - + 20% - + $ 13361.11 - - + + VisitorName - Great name! - + 4 - + 12 - + 3 - + 00:25:32 - + 25% - + $ 13351.11 @@ -737,27 +737,27 @@ - - + +   Desktop - + 5 - + 16 - + 3.2 - + 00:22:49 - + 20% - + $ 13361.11 @@ -800,25 +800,25 @@ - - + + Unknown - + 5 - + 16 - + 3.2 - + 00:22:49 - + 20% - + $ 13361.11 @@ -861,27 +861,27 @@ - - + +   Unknown - + 5 - + 16 - + 3.2 - + 00:22:49 - + 20% - + $ 13361.11 @@ -924,25 +924,25 @@ - - + + 1024x768 - + 5 - + 16 - + 3.2 - + 00:22:49 - + 20% - + 80% @@ -985,27 +985,27 @@ - - + +   Windows XP - + 5 - + 16 - + 3.2 - + 00:22:49 - + 20% - + 80% @@ -1048,27 +1048,27 @@ - - + +   Firefox - + 5 - + 16 - + 3.2 - + 00:22:49 - + 20% - + 80% @@ -1111,27 +1111,27 @@ - - + +   Firefox 3.6 - + 5 - + 16 - + 3.2 - + 00:22:49 - + 20% - + 80% @@ -1174,25 +1174,25 @@ - - + + Windows / Firefox / 1024x768 - + 5 - + 16 - + 3.2 - + 00:22:49 - + 20% - + 80% @@ -1235,27 +1235,27 @@ - - + +   Windows - + 5 - + 16 - + 3.2 - + 00:22:49 - + 20% - + 80% @@ -1298,25 +1298,25 @@ - - + + Gecko (Firefox) - + 5 - + 16 - + 3.2 - + 00:22:49 - + 20% - + 80% @@ -1347,132 +1347,132 @@ - - + +   Cookie - + 5 - + 100% - - + +   Flash - + 5 - + 100% - - + +   Java - + 5 - + 100% - - + +   Director - + 0 - + 0% - - + +   Gears - + 0 - + 0% - - + +   Pdf - + 0 - + 0% - - + +   Quicktime - + 0 - + 0% - - + +   Realplayer - + 0 - + 0% - - + +   Silverlight - + 0 - + 0% - - + +   Windowsmedia - + 0 - + 0% @@ -1515,52 +1515,52 @@ - - + +   Poland - + 4 - + 12 - + 3 - + 00:25:32 - + 25% - + $ 13351.11 - - + +   France - + 1 - + 4 - + 4 - + 00:12:01 - + 0% - + $ 10 @@ -1603,25 +1603,25 @@ - - + + Europe - + 5 - + 16 - + 3.2 - + 00:22:49 - + 20% - + $ 13361.11 @@ -1664,27 +1664,27 @@ - - + +   Unknown - + 5 - + 16 - + 3.2 - + 00:22:49 - + 20% - + $ 13361.11 @@ -1727,48 +1727,48 @@ - - + + Polish - + 4 - + 12 - + 3 - + 00:25:32 - + 25% - + 75% - - + + French - + 1 - + 4 - + 4 - + 00:12:01 - + 0% - + 100% @@ -1811,27 +1811,27 @@ - - + +   Unknown - + 5 - + 16 - + 3.2 - + 00:22:49 - + 20% - + $ 13361.11 @@ -1874,48 +1874,48 @@ - - + + Polish (pl) - + 4 - + 12 - + 3 - + 00:25:32 - + 25% - + 75% - - + + French (fr) - + 1 - + 4 - + 4 - + 00:12:01 - + 0% - + 100% @@ -1943,82 +1943,82 @@ - - + + 0-10s - + 0 - - + + 11-30s - + 0 - - + + 31-60s - + 0 - - + + 1-2 min - + 0 - - + + 2-4 min - + 0 - - + + 4-7 min - + 1 - - + + 7-10 min - + 0 - - + + 10-15 min - + 2 - - + + 15-30 min - + 1 - - + + 30+ min - + 1 @@ -2046,82 +2046,82 @@ - - + + 1 page - + 0 - - + + 2 pages - + 0 - - + + 3 pages - + 2 - - + + 4 pages - + 1 - - + + 5 pages - + 0 - - + + 6-7 pages - + 1 - - + + 8-10 pages - + 0 - - + + 11-14 pages - + 0 - - + + 15-20 pages - + 0 - - + + 21+ pages - + 0 @@ -2152,156 +2152,156 @@ - - + + 1 visit - + 3 - + 60% - - + + 2 visits - + 2 - + 40% - - + + 3 visits - + 0 - + 0% - - + + 4 visits - + 0 - + 0% - - + + 5 visits - + 0 - + 0% - - + + 6 visits - + 0 - + 0% - - + + 7 visits - + 0 - + 0% - - + + 8 visits - + 0 - + 0% - - + + 9-14 visits - + 0 - + 0% - - + + 15-25 visits - + 0 - + 0% - - + + 26-50 visits - + 0 - + 0% - - + + 51-100 visits - + 0 - + 0% - - + + 101-200 visits - + 0 - + 0% - - + + 201+ visits - + 0 - + 0% @@ -2329,122 +2329,122 @@ - - + + New visits - + 1 - - + + 0 days - + 1 - - + + 1 day - + 0 - - + + 2 days - + 0 - - + + 3 days - + 0 - - + + 4 days - + 0 - - + + 5 days - + 0 - - + + 6 days - + 0 - - + + 7 days - + 0 - - + + 8-14 days - + 0 - - + + 15-30 days - + 0 - - + + 31-60 days - + 0 - - + + 61-120 days - + 0 - - + + 121-364 days - + 0 - - + + 365+ days - + 0 @@ -2472,66 +2472,66 @@ - - + + Unique returning visitors - + 1 - - + + Returning Users - + 0 - - + + Returning Visits - + 4 - - + + Actions by Returning Visits - + 12 - - + + Maximum actions in one returning visit - + 6 - - + + Bounce Rate for Returning Visits - + 25% - - + + Avg. Actions per Returning Visit - + 3 - - + + Avg. Duration of a Returning Visit (in sec) - + 00:25:32 @@ -2574,554 +2574,554 @@ - - + + 0h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 1h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 2h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 3h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 4h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 5h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 6h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 7h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 8h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 9h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 10h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 11h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 12h - + 5 - + 16 - + 3.2 - + 00:22:49 - + 20% - + 80% - - + + 13h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 14h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 15h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 16h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 17h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 18h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 19h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 20h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 21h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 22h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + 23h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% @@ -3164,554 +3164,554 @@ - - + + 0h - + 1 - + 4 - + 4 - + 00:12:01 - + 0% - + $ 10 - - + + 1h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 2h - + 2 - + 9 - + 4.5 - + 00:42:01 - + 0% - + $ 3111.11 - - + + 3h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 4h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 5h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 6h - + 1 - + 0 - + 0 - + 00:06:03 - + 100% - + $ 10240 - - + + 7h - + 1 - + 3 - + 3 - + 00:12:01 - + 0% - + $ 0 - - + + 8h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 9h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 10h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 11h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 12h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 13h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 14h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 15h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 16h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 17h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 18h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 19h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 20h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 21h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 22h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 - - + + 23h - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + $ 0 @@ -3754,163 +3754,163 @@ - - + + Monday - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + Tuesday - + 3 - + 13 - + 4.3 - + 00:30:01 - + 0% - + 66.67% - - + + Wednesday - + 2 - + 3 - + 1.5 - + 00:12:02 - + 50% - + 100% - - + + Thursday - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + Friday - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + Saturday - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% - - + + Sunday - + 0 - + 0 - + 0 - + 00:00:00 - + 0% - + 0% @@ -3938,66 +3938,66 @@ - - + + Pageviews - + 16 - - + + Unique Pageviews - + 4 - - + + Downloads - + 0 - - + + Unique Downloads - + 0 - - + + Outlinks - + 0 - - + + Unique Outlinks - + 0 - - + + Searches - + 0 - - + + Unique Keywords - + 0 @@ -4025,26 +4025,26 @@ - - + + Bytes transferred overall - + 0 - - + + Bytes transferred pageviews - + 0 - - + + Bytes transferred downloads - + 0 @@ -4084,24 +4084,24 @@ - - + + index.htm - + 16 - + 4 - + 00:03:23 - + 0% - + 100% @@ -4135,18 +4135,18 @@ - - + + index.htm - + 4 - + 0 - + 0% @@ -4180,44 +4180,44 @@ - - + + View product left in cart - + 1 - + 0 - + 0% - - + + incredible title! - + 1 - + 0 - + 0% - - + + Looking at Electronics & Cameras page with a page level custom variable - + 1 - + 0 - + 0% @@ -4251,18 +4251,18 @@ - - + + index.htm - + 4 - + 4 - + 100% @@ -4296,30 +4296,30 @@ - - + + View product left in cart - + 3 - + 3 - + 100% - - + + Another Product page with multiple categories - + 1 - + 1 - + 100% @@ -4359,162 +4359,162 @@ - - + + View product left in cart - + 9 - + 3 - + 00:02:00 - + 0% - + 100% - - + + Another Product page - + 1 - + 1 - + 00:06:00 - + 0% - + 0% - - + + Another Product page with multiple categories - + 1 - + 1 - + 00:00:00 - + 0% - + 100% - - + + Another Product page with no category - + 1 - + 1 - + 00:00:00 - + 0% - + 0% - - + + incredible title! - + 1 - + 1 - + 00:06:00 - + 0% - + 0% - - + + Looking at Electronics & Cameras page again - + 1 - + 1 - + 00:06:00 - + 0% - + 0% - - + + Looking at Electronics & Cameras page with a page level custom variable - + 1 - + 1 - + 00:06:00 - + 0% - + 0% - - + + Looking at product page - + 1 - + 1 - + 00:12:00 - + 0% - + 0% @@ -4629,25 +4629,25 @@ - - + + Direct Entry - + 5 - + 16 - + 3.2 - + 00:22:49 - + 20% - + $ 13361.11 @@ -4711,82 +4711,82 @@ - - + + Ecommerce Orders - + 4 - - + + Visits with Conversions - + 2 - - + + Revenue - + $ 13351.11 - - + + Subtotal - + $ 2700 - - + + Tax - + $ 531 - - + + Shipping - + $ 120.11 - - + + Discount - + $ 686 - - + + Purchased Products - + 12 - - + + Average Order Value - + $ 3337.78 - - + + Conversion Rate - + 40% @@ -4814,106 +4814,106 @@ - - + + 1 visit - + 2 - - + + 2 visits - + 2 - - + + 3 visits - + 0 - - + + 4 visits - + 0 - - + + 5 visits - + 0 - - + + 6 visits - + 0 - - + + 7 visits - + 0 - - + + 8 visits - + 0 - - + + 9-14 visits - + 0 - - + + 15-25 visits - + 0 - - + + 26-50 visits - + 0 - - + + 51-100 visits - + 0 - - + + 101+ visits - + 0 @@ -4941,114 +4941,114 @@ - - + + 0 days - + 4 - - + + 1 day - + 0 - - + + 2 days - + 0 - - + + 3 days - + 0 - - + + 4 days - + 0 - - + + 5 days - + 0 - - + + 6 days - + 0 - - + + 7 days - + 0 - - + + 8-14 days - + 0 - - + + 15-30 days - + 0 - - + + 31-60 days - + 0 - - + + 61-120 days - + 0 - - + + 121-364 days - + 0 - - + + 365+ days - + 0 @@ -5076,42 +5076,42 @@ - - + + Abandoned Carts - + 3 - - + + Revenue left in cart - + $ 7530.33 - - + + Products left in cart - + 12 - - + + Average Order Value - + $ 2510.11 - - + + Conversion Rate - + 60% @@ -5139,106 +5139,106 @@ - - + + 1 visit - + 1 - - + + 2 visits - + 2 - - + + 3 visits - + 0 - - + + 4 visits - + 0 - - + + 5 visits - + 0 - - + + 6 visits - + 0 - - + + 7 visits - + 0 - - + + 8 visits - + 0 - - + + 9-14 visits - + 0 - - + + 15-25 visits - + 0 - - + + 26-50 visits - + 0 - - + + 51-100 visits - + 0 - - + + 101+ visits - + 0 @@ -5266,114 +5266,114 @@ - - + + 0 days - + 3 - - + + 1 day - + 0 - - + + 2 days - + 0 - - + + 3 days - + 0 - - + + 4 days - + 0 - - + + 5 days - + 0 - - + + 6 days - + 0 - - + + 7 days - + 0 - - + + 8-14 days - + 0 - - + + 15-30 days - + 0 - - + + 31-60 days - + 0 - - + + 61-120 days - + 0 - - + + 121-364 days - + 0 - - + + 365+ days - + 0 @@ -5419,132 +5419,132 @@ - - + + SKU2 - + $ 1500 - + 1 - + 1 - + 1 - + $ 1500 - + 1 - + 100% - - + + SKU VERY nice indeed - + $ 1011.22 - + 3 - + 2 - + 4 - + $ 255.61 - + 1.5 - + 50% - - + + ANOTHER SKU HERE - + $ 600 - + 6 - + 1 - + 0 - + $ 100 - + 6 - + 0% - - + + TRIPOD SKU - + $ 200 - + 2 - + 1 - + 0 - + $ 100 - + 2 - + 0% - - + + SKU IN ABANDONED CART TWO - + $ 0 - + 0 - + 0 - + 3 - + $ 0 - + 0 - + 0% @@ -5590,158 +5590,158 @@ - - + + Canon SLR - + $ 1500 - + 1 - + 1 - + 0 - + $ 1500 - + 1 - + 0% - - + + PRODUCT name - + $ 1011.22 - + 3 - + 2 - + 2 - + $ 255.61 - + 1.5 - + 100% - - + + PRODUCT name BIS - + $ 600 - + 6 - + 1 - + 0 - + $ 100 - + 6 - + 0% - - + + TRIPOD - bought day after - + $ 200 - + 2 - + 1 - + 0 - + $ 100 - + 2 - + 0% - - + + PRODUCT TWO LEFT in cart - + $ 0 - + 0 - + 0 - + 3 - + $ 0 - + 0 - + 0% - - + + PRODUCT THREE LEFT in cart - + $ 0 - + 0 - + 0 - + 3 - + $ 1332 - + 0 - + 0% @@ -5787,210 +5787,210 @@ - - + + Electronics & Cameras - + $ 2500 - + 3 - + 2 - + 3 - + $ 1000 - + 1.5 - + 66.67% - - + + Multiple Category 1 - + $ 1000 - + 2 - + 1 - + 1 - + $ 500 - + 2 - + 100% - - + + Multiple Category 2 - + $ 1000 - + 2 - + 1 - + 1 - + $ 500 - + 2 - + 100% - - + + Multiple Category 4 - + $ 1000 - + 2 - + 1 - + 1 - + $ 500 - + 2 - + 100% - - + + Multiple Category 5 - + $ 1000 - + 2 - + 1 - + 1 - + $ 500 - + 2 - + 100% - - + + Product Category not defined - + $ 611.22 - + 7 - + 2 - + 4 - + $ 55.61 - + 3.5 - + 50% - - + + Tools - + $ 200 - + 2 - + 1 - + 0 - + $ 100 - + 2 - + 0% - - + + Category TWO LEFT in cart - + $ 0 - + 0 - + 0 - + 3 - + $ 0 - + 0 - + 0% @@ -6018,34 +6018,34 @@ - - + + Conversions - + 5 - - + + Visits with Conversions - + 4 - - + + Revenue - + $ 13361.11 - - + + Conversion Rate - + 80% @@ -6076,145 +6076,145 @@ - - + + 1 visit - + 1 - + $ 0 - - + + 2 visits - + 0 - + $ 0 - - + + 3 visits - + 0 - + $ 0 - - + + 4 visits - + 0 - + $ 0 - - + + 5 visits - + 0 - + $ 0 - - + + 6 visits - + 0 - + $ 0 - - + + 7 visits - + 0 - + $ 0 - - + + 8 visits - + 0 - + $ 0 - - + + 9-14 visits - + 0 - + $ 0 - - + + 15-25 visits - + 0 - + $ 0 - - + + 26-50 visits - + 0 - + $ 0 - - + + 51-100 visits - + 0 - + $ 0 - - + + 101+ visits - + 0 - + $ 0 @@ -6245,156 +6245,156 @@ - - + + 0 days - + 1 - + $ 0 - - + + 1 day - + 0 - + $ 0 - - + + 2 days - + 0 - + $ 0 - - + + 3 days - + 0 - + $ 0 - - + + 4 days - + 0 - + $ 0 - - + + 5 days - + 0 - + $ 0 - - + + 6 days - + 0 - + $ 0 - - + + 7 days - + 0 - + $ 0 - - + + 8-14 days - + 0 - + $ 0 - - + + 15-30 days - + 0 - + $ 0 - - + + 31-60 days - + 0 - + $ 0 - - + + 61-120 days - + 0 - + $ 0 - - + + 121-364 days - + 0 - + $ 0 - - + + 365+ days - + 0 - + $ 0 @@ -6422,34 +6422,34 @@ - - + + Conversions - + 1 - - + + Visits with Conversions - + 1 - - + + Revenue - + $ 10 - - + + Conversion Rate - + 20% @@ -6477,106 +6477,106 @@ - - + + 1 visit - + 1 - - + + 2 visits - + 0 - - + + 3 visits - + 0 - - + + 4 visits - + 0 - - + + 5 visits - + 0 - - + + 6 visits - + 0 - - + + 7 visits - + 0 - - + + 8 visits - + 0 - - + + 9-14 visits - + 0 - - + + 15-25 visits - + 0 - - + + 26-50 visits - + 0 - - + + 51-100 visits - + 0 - - + + 101+ visits - + 0 @@ -6604,114 +6604,114 @@ - - + + 0 days - + 1 - - + + 1 day - + 0 - - + + 2 days - + 0 - - + + 3 days - + 0 - - + + 4 days - + 0 - - + + 5 days - + 0 - - + + 6 days - + 0 - - + + 7 days - + 0 - - + + 8-14 days - + 0 - - + + 15-30 days - + 0 - - + + 31-60 days - + 0 - - + + 61-120 days - + 0 - - + + 121-364 days - + 0 - - + + 365+ days - + 0 -- cgit v1.2.3 From 3869b4c62b8e3e9cf5574c697385d07b29c1a187 Mon Sep 17 00:00:00 2001 From: Matthieu Aubry Date: Wed, 1 Mar 2017 10:35:15 +0100 Subject: :boom: Piwik 3.0.2 KaBOOM :boom: https://piwik.org/changelog/piwik-3-0-2/ --- core/Version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Version.php b/core/Version.php index 77da2b94fb..3fca643578 100644 --- a/core/Version.php +++ b/core/Version.php @@ -20,7 +20,7 @@ final class Version * The current Piwik version. * @var string */ - const VERSION = '3.0.2-rc1'; + const VERSION = '3.0.2'; public function isStableVersion($version) { -- cgit v1.2.3