diff --git a/plugins/CoreHome/javascripts/filters/htmldecode-filter.js b/plugins/CoreHome/javascripts/filters/htmldecode-filter.js deleted file mode 100644 index c87e8f8385398aa5c2d41fdac766a6da42b48169..0000000000000000000000000000000000000000 --- a/plugins/CoreHome/javascripts/filters/htmldecode-filter.js +++ /dev/null @@ -1,12 +0,0 @@ -/*! - * Piwik - Web Analytics - * - * @link http://piwik.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - */ - -angular.module('piwikApp.filter').filter('htmldecode', function() { - return function(theString) { - return piwikHelper.htmlDecode(theString); - } -}); diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml index a19558ac1784246b80030b33f12c906a5161ea71..b6ab1e278fe77b16d1ddc9f30db1b347fb13b132 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml @@ -11,6 +11,8 @@ <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> <revenue_evolution>100%</revenue_evolution> + <group/> + <main_url>http://piwik.net</main_url> <idsite>1</idsite> </row> <row> @@ -23,6 +25,8 @@ <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> <revenue_evolution>0%</revenue_evolution> + <group/> + <main_url>http://piwik.net</main_url> <idsite>2</idsite> </row> </result> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml index f1534539736dd9ce9753cddbe2ba747c035d7655..e8fe27395c5eec9db5b7ca8d882ba2efcf5b4198 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml @@ -11,6 +11,8 @@ <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> <revenue_evolution>100%</revenue_evolution> + <group/> + <main_url>http://piwik.net</main_url> <idsite>1</idsite> </row> </result> @@ -25,6 +27,8 @@ <actions_evolution>3100%</actions_evolution> <pageviews_evolution>1450%</pageviews_evolution> <revenue_evolution>200%</revenue_evolution> + <group/> + <main_url>http://piwik.net</main_url> <idsite>1</idsite> </row> <row> @@ -37,6 +41,8 @@ <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> <revenue_evolution>0%</revenue_evolution> + <group/> + <main_url>http://piwik.net</main_url> <idsite>2</idsite> </row> </result> @@ -51,6 +57,8 @@ <actions_evolution>-68.8%</actions_evolution> <pageviews_evolution>-67.7%</pageviews_evolution> <revenue_evolution>-66.7%</revenue_evolution> + <group/> + <main_url>http://piwik.net</main_url> <idsite>1</idsite> </row> </result> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml index ae04fb0e55941853df4293ec23ec03d15d9e6351..fd7caaea77a94aea9947cb48730cc1deffad5372 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml @@ -11,6 +11,8 @@ <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> <revenue_evolution>100%</revenue_evolution> + <group/> + <main_url>http://piwik.net</main_url> <idsite>1</idsite> </row> <row> @@ -23,6 +25,8 @@ <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> <revenue_evolution>0%</revenue_evolution> + <group/> + <main_url>http://piwik.net</main_url> <idsite>2</idsite> </row> </result> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml index a19558ac1784246b80030b33f12c906a5161ea71..b6ab1e278fe77b16d1ddc9f30db1b347fb13b132 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml @@ -11,6 +11,8 @@ <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> <revenue_evolution>100%</revenue_evolution> + <group/> + <main_url>http://piwik.net</main_url> <idsite>1</idsite> </row> <row> @@ -23,6 +25,8 @@ <actions_evolution>100%</actions_evolution> <pageviews_evolution>100%</pageviews_evolution> <revenue_evolution>0%</revenue_evolution> + <group/> + <main_url>http://piwik.net</main_url> <idsite>2</idsite> </row> </result>