Merge branch 'master' into 3.0-m06

Conflicts:
	.travis.yml
	bower.json
	core/Notification/Manager.php
	core/Updates.php
	core/Updates/2.16.2-b2.php
	core/Version.php
	libs/Zend/Validate/Hostname.php
	libs/bower_components/jScrollPane/ajax.html
	libs/bower_components/jScrollPane/anchors.html
	libs/bower_components/jScrollPane/api.html
	libs/bower_components/jScrollPane/arrow_hover.html
	libs/bower_components/jScrollPane/arrow_positions.html
	libs/bower_components/jScrollPane/arrows.html
	libs/bower_components/jScrollPane/auto_reinitialise.html
	libs/bower_components/jScrollPane/basic.html
	libs/bower_components/jScrollPane/caps.html
	libs/bower_components/jScrollPane/changelog.html
	libs/bower_components/jScrollPane/destroy.html
	libs/bower_components/jScrollPane/drag_size.html
	libs/bower_components/jScrollPane/dynamic_content.html
	libs/bower_components/jScrollPane/dynamic_height.html
	libs/bower_components/jScrollPane/dynamic_width.html
	libs/bower_components/jScrollPane/events.html
	libs/bower_components/jScrollPane/faqs.html
	libs/bower_components/jScrollPane/fixed_width.html
	libs/bower_components/jScrollPane/focus.html
	libs/bower_components/jScrollPane/fullpage_scroll.html
	libs/bower_components/jScrollPane/iframe.html
	libs/bower_components/jScrollPane/iframe2.html
	libs/bower_components/jScrollPane/iframe_content1.html
	libs/bower_components/jScrollPane/iframe_content2.html
	libs/bower_components/jScrollPane/image.html
	libs/bower_components/jScrollPane/image2.html
	libs/bower_components/jScrollPane/index.html
	libs/bower_components/jScrollPane/invisibles.html
	libs/bower_components/jScrollPane/known_issues.html
	libs/bower_components/jScrollPane/less_basic.html
	libs/bower_components/jScrollPane/mwheel_intent.html
	libs/bower_components/jScrollPane/override_animate.html
	libs/bower_components/jScrollPane/runeimp.html
	libs/bower_components/jScrollPane/runeimp2.html
	libs/bower_components/jScrollPane/scroll_on_left.html
	libs/bower_components/jScrollPane/scroll_to.html
	libs/bower_components/jScrollPane/scroll_to_animate.html
	libs/bower_components/jScrollPane/settings.html
	libs/bower_components/jScrollPane/short.html
	libs/bower_components/jquery/.bower.json
	libs/bower_components/jquery/LICENSE.txt
	libs/bower_components/jquery/dist/jquery.js
	libs/bower_components/jquery/dist/jquery.min.js
	libs/bower_components/jquery/dist/jquery.min.map
	libs/bower_components/jquery/sizzle/dist/sizzle.js
	libs/bower_components/jquery/src/ajax.js
	libs/bower_components/jquery/src/ajax/jsonp.js
	libs/bower_components/jquery/src/ajax/load.js
	libs/bower_components/jquery/src/ajax/parseJSON.js
	libs/bower_components/jquery/src/ajax/parseXML.js
	libs/bower_components/jquery/src/ajax/script.js
	libs/bower_components/jquery/src/ajax/xhr.js
	libs/bower_components/jquery/src/attributes/attr.js
	libs/bower_components/jquery/src/attributes/classes.js
	libs/bower_components/jquery/src/attributes/prop.js
	libs/bower_components/jquery/src/attributes/support.js
	libs/bower_components/jquery/src/attributes/val.js
	libs/bower_components/jquery/src/callbacks.js
	libs/bower_components/jquery/src/core.js
	libs/bower_components/jquery/src/core/access.js
	libs/bower_components/jquery/src/core/init.js
	libs/bower_components/jquery/src/core/parseHTML.js
	libs/bower_components/jquery/src/core/ready.js
	libs/bower_components/jquery/src/css.js
	libs/bower_components/jquery/src/css/curCSS.js
	libs/bower_components/jquery/src/css/hiddenVisibleSelectors.js
	libs/bower_components/jquery/src/css/support.js
	libs/bower_components/jquery/src/css/var/swap.js
	libs/bower_components/jquery/src/data.js
	libs/bower_components/jquery/src/data/accepts.js
	libs/bower_components/jquery/src/deferred.js
	libs/bower_components/jquery/src/deprecated.js
	libs/bower_components/jquery/src/dimensions.js
	libs/bower_components/jquery/src/effects.js
	libs/bower_components/jquery/src/effects/Tween.js
	libs/bower_components/jquery/src/event.js
	libs/bower_components/jquery/src/event/support.js
	libs/bower_components/jquery/src/manipulation.js
	libs/bower_components/jquery/src/manipulation/support.js
	libs/bower_components/jquery/src/offset.js
	libs/bower_components/jquery/src/queue.js
	libs/bower_components/jquery/src/serialize.js
	libs/bower_components/jquery/src/traversing.js
	libs/bower_components/jquery/src/traversing/findFilter.js
	libs/bower_components/jquery/src/var/concat.js
	libs/bower_components/jquery/src/var/indexOf.js
	libs/bower_components/jquery/src/var/push.js
	libs/bower_components/jquery/src/var/slice.js
	libs/bower_components/jquery/src/wrap.js
	plugins/API/ProcessedReport.php
	plugins/AnonymousPiwikUsageMeasurement
	plugins/CoreConsole/Commands/ManagePlugin.php
	plugins/CoreHome/javascripts/dataTable.js
	plugins/CoreHome/javascripts/manifest.json
	plugins/CoreHome/templates/_topBar.twig
	plugins/CoreUpdater/templates/updateSuccess.twig
	plugins/CustomAlerts
	plugins/CustomDimensions
	plugins/DevicesDetection/Reports/GetBrowserVersions.php
	plugins/DevicesDetection/Reports/GetBrowsers.php
	plugins/ExamplePlugin/Updates/0.0.2.php
	plugins/Feedback/templates/index.twig
	plugins/LogViewer
	plugins/Morpheus/stylesheets/general/_forms.less
	plugins/Morpheus/templates/layout.twig
	plugins/Morpheus/templates/user.twig
	plugins/QueuedTracking
	plugins/SegmentEditor/stylesheets/segmentation.less
	plugins/SitesManager/tests/Integration/ApiTest.php
	tests/PHPUnit/Integration/WidgetsListTest.php
	tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml
	tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml
	tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml
	tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
	tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
	tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
	tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
	tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
	tests/UI/expected-ui-screenshots
	tests/UI/specs/SegmentSelectorEditor_spec.js

4 files changed, 12 insertions, 8 deletions

diff --git a/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php b/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php
index 4065fd10f7..ef6ad37ea8 100644
--- a/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php
+++ b/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php
@@ -26,7 +26,6 @@ class AllColumns extends HtmlTable
     public function beforeRender()
     {
         $this->config->show_extra_columns  = true;
-        $this->config->datatable_css_class = 'dataTableVizAllColumns';
         $this->config->show_exclude_low_population = true;
 
         parent::beforeRender();
@@ -34,6 +33,8 @@ class AllColumns extends HtmlTable
 
     public function beforeGenericFiltersAreAppliedToLoadedDataTable()
     {
+        $this->config->datatable_css_class = 'dataTableVizAllColumns';
+        
         $this->dataTable->filter('AddColumnsProcessedMetrics');
 
         $properties = $this->config;
@@ -67,7 +68,8 @@ class AllColumns extends HtmlTable
 
     public function beforeLoadDataTable()
     {
-        $this->requestConfig->request_parameters_to_modify['pivotBy'] = null; // always unset pivotBy
+        unset($this->requestConfig->request_parameters_to_modify['pivotBy']);
+        unset($this->requestConfig->request_parameters_to_modify['pivotByColumn']);
     }
 
     protected function isPivoted()
diff --git a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php
index 94cfa60050..a31a88d190 100644
--- a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php
+++ b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php
@@ -20,10 +20,10 @@ class Bar extends JqplotGraph
     const ID = 'graphVerticalBar';
     const FOOTER_ICON       = 'icon-chart-bar';
     const FOOTER_ICON_TITLE = 'General_VBarGraph';
-
-    public function beforeRender()
+    
+    public function beforeLoadDataTable()
     {
-        parent::beforeRender();
+        parent::beforeLoadDataTable();
 
         $this->config->datatable_js_type = 'JqplotBarGraphDataTable';
     }
diff --git a/plugins/CoreVisualizations/javascripts/jqplot.js b/plugins/CoreVisualizations/javascripts/jqplot.js
index 5f51e7e341..e840a71537 100644
--- a/plugins/CoreVisualizations/javascripts/jqplot.js
+++ b/plugins/CoreVisualizations/javascripts/jqplot.js
@@ -282,7 +282,7 @@
          * creating span elements with ticks and adding their width.
          * Rendered ticks have to be visible to get their real width. But it
          * is too fast for user to notice it. If total ticks width is bigger
-         * than container width then half of ticks is beeing cut out and their
+         * than container width then half of ticks is being cut out and their
          * width is tested again. Until their total width is smaller than chart
          * div. There is a failsafe so check will be performed no more than 20
          * times, which is I think more than enough. Each tick have its own
diff --git a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig
index 1fbbf6517f..a85ee66852 100644
--- a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig
+++ b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig
@@ -20,6 +20,7 @@
         {% else %}
             {%- for rowId, row in dataTable.getRows() -%}
                 {%- set rowHasSubtable = not subtablesAreDisabled and row.getIdSubDataTable() and properties.subtable_controller_action is not null -%}
+                {%- set rowSubtableId = row.getMetadata('idsubdatatable_in_db')|default(row.getIdSubDataTable()) -%}
                 {%- set isSummaryRow = rowId == constant('Piwik\\DataTable::ID_SUMMARY_ROW') -%}
                 {%- set shouldHighlightRow = isSummaryRow and properties.highlight_summary_row -%}
 
@@ -30,9 +31,10 @@
                                or not properties.replace_row_with_subtable|default(false) -%}
 
                 {% if showRow %}
-                <tr {% if rowHasSubtable %}id="{{ row.getIdSubDataTable() }}"{% endif %}
+                <tr {% if rowHasSubtable %}id="{{ rowSubtableId }}"{% endif %}
                     {% if row.getMetadata('segment') is not false %} data-segment-filter="{{ row.getMetadata('segment')|e('html_attr') }}"{% endif %}
                     {% if row.getMetadata('url') is not false %} data-url-label="{{ row.getMetadata('url')|rawSafeDecoded }}"{% endif %}
+                    data-row-metadata="{{ row.getMetadata|json_encode|e('html_attr') }}"
                     class="{{ row.getMetadata('css_class') }} {% if rowHasSubtable %}subDataTable{% endif %}{% if shouldHighlightRow %} highlight{% endif %}{% if isSummaryRow %} summaryRow{% endif %}"
                     {% if rowHasSubtable %}title="{{ 'CoreHome_ClickRowToExpandOrContract'|translate }}"{% endif %}>
                     {% for column in properties.columns_to_display %}
@@ -45,7 +47,7 @@
 
                 {# display subtable if present and showing expanded datatable #}
                 {% if properties.show_expanded|default(false) and rowHasSubtable %}
-                    {% include "@CoreVisualizations/_dataTableViz_htmlTable.twig" with {'dataTable': row.getSubtable(), 'idSubtable': row.getIdSubDataTable()} %}
+                    {% include "@CoreVisualizations/_dataTableViz_htmlTable.twig" with {'dataTable': row.getSubtable(), 'idSubtable': rowSubtableId} %}
                 {% endif %}
             {%- endfor -%}
         {% endif %}