diff options
author | sgiehl <stefan@piwik.org> | 2018-01-11 17:35:51 +0300 |
---|---|---|
committer | sgiehl <stefan@piwik.org> | 2018-01-11 17:37:27 +0300 |
commit | 69f8b5ef3bcf1d9528f66334873cd633205eafe2 (patch) | |
tree | 6f297f4499d5d73f4362f52a9871c114bf0e8631 | |
parent | 5df3a22ac9ad14865cf8bca71d2c5794fae08abd (diff) |
update test files
15 files changed, 40 insertions, 40 deletions
diff --git a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml index a19da6ec04..45ee7902c5 100644 --- a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml +++ b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml @@ -21,7 +21,7 @@ </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>It is recommended, but not required, to specify the various URLs, one per line, that your visitors use to access this website. Alias URLs for a website will not appear in the Referrers > Websites report. Note that it is not necessary to specify the URLs with and without 'www' as Piwik automatically considers both.</inlineHelp> + <inlineHelp>It is recommended, but not required, to specify the various URLs, one per line, that your visitors use to access this website. Alias URLs for a website will not appear in the Referrers > Websites report. Note that it is not necessary to specify the URLs with and without 'www' as Matomo automatically considers both.</inlineHelp> <templateFile /> <introduction /> <condition /> @@ -37,7 +37,7 @@ </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>When enabled, Piwik will only track internal actions when the Page URL is one of the known URLs for your website. This prevents people from spamming your analytics with URLs for other websites.<br />The domain and the path has to be an exact match and each valid subdomain has to be specified separately. For example when the known URLs are 'http://example.com/path' and 'http://good.example.com', tracking requests for 'http://example.com/otherpath' or 'http://bad.example.com' are ignored.</inlineHelp> + <inlineHelp>When enabled, Matomo will only track internal actions when the Page URL is one of the known URLs for your website. This prevents people from spamming your analytics with URLs for other websites.<br />The domain and the path has to be an exact match and each valid subdomain has to be specified separately. For example when the known URLs are 'http://example.com/path' and 'http://good.example.com', tracking requests for 'http://example.com/otherpath' or 'http://bad.example.com' are ignored.</inlineHelp> <templateFile /> <introduction /> <condition /> @@ -78,7 +78,7 @@ </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>Enter the list of IPs, one per line, that you wish to exclude from being tracked by Piwik. You can use wildcards, eg. 1.2.3.* or 1.2.*.*<br /><br />Your current IP address is <i>127.0.0.1</i></inlineHelp> + <inlineHelp>Enter the list of IPs, one per line, that you wish to exclude from being tracked by Matomo. You can use wildcards, eg. 1.2.3.* or 1.2.*.*<br /><br />Your current IP address is <i>127.0.0.1</i></inlineHelp> <templateFile /> <introduction /> <condition /> @@ -98,7 +98,7 @@ </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>Enter the list of URL Query Parameters, one per line, to exclude from the Page URLs reports. Regular expressions such as /^sess.*|.*[dD]ate$/ are suported.<br /><br />Piwik will automatically exclude the common session parameters (phpsessid, sessionid, ...).</inlineHelp> + <inlineHelp>Enter the list of URL Query Parameters, one per line, to exclude from the Page URLs reports. Regular expressions such as /^sess.*|.*[dD]ate$/ are suported.<br /><br />Matomo will automatically exclude the common session parameters (phpsessid, sessionid, ...).</inlineHelp> <templateFile /> <introduction /> <condition /> @@ -118,7 +118,7 @@ </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>Enter the list of user agents to exclude from being tracked by Piwik.<br /><br />If the visitor's user agent string contains any of the strings you specify, the visitor will be excluded from Piwik.<br />You can use this to exclude some bots from being tracked.</inlineHelp> + <inlineHelp>Enter the list of user agents to exclude from being tracked by Matomo.<br /><br />If the visitor's user agent string contains any of the strings you specify, the visitor will be excluded from Matomo.<br />You can use this to exclude some bots from being tracked.</inlineHelp> <templateFile /> <introduction /> <condition /> @@ -137,7 +137,7 @@ <row key="0">Do not track Site Search</row> </availableValues> <description /> - <inlineHelp>You can use Piwik to track and report what visitors are searching in your website's internal search engine.</inlineHelp> + <inlineHelp>You can use Matomo to track and report what visitors are searching in your website's internal search engine.</inlineHelp> <templateFile /> <introduction /> <condition /> @@ -210,7 +210,7 @@ <row>Ecommerce enabled</row> </availableValues> <description /> - <inlineHelp>When enabled, the "Goals" report will have a new "Ecommerce" section.<br />Piwik allows for advanced Ecommerce Analytics tracking & reporting. Learn more about <a href='https://matomo.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>.</inlineHelp> + <inlineHelp>When enabled, the "Goals" report will have a new "Ecommerce" section.<br />Matomo allows for advanced Ecommerce Analytics tracking & reporting. Learn more about <a href='https://matomo.org/docs/ecommerce-analytics/' target='_blank'> Ecommerce Analytics</a>.</inlineHelp> <templateFile /> <introduction /> <condition /> diff --git a/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php b/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php index 30ddbd7cd6..d4469dcca1 100644 --- a/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php +++ b/tests/PHPUnit/Integration/Tracker/TrackerCodeGeneratorTest.php @@ -36,7 +36,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase $doNotTrack = true, $disableCookies = false, $trackNoScript = true, $crossDomain = true); - $expected = "<!-- Piwik --> + $expected = "<!-- Matomo --> <script type="text/javascript"> var _paq = _paq || []; /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ @@ -63,7 +63,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase })(); </script> <noscript><p><img src="//piwik-server/piwik/piwik.php?idsite=1&rec=1" style="border:0;" alt="" /></p></noscript> -<!-- End Piwik Code --> +<!-- End Matomo Code --> "; $this->assertEquals($expected, $jsTag); @@ -75,7 +75,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase $jsTag = $generator->generate($idSite = 1, $piwikUrl = 'http://localhost/piwik'); - $expected = "<!-- Piwik --> + $expected = "<!-- Matomo --> <script type="text/javascript"> var _paq = _paq || []; /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ @@ -89,7 +89,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); })(); </script> -<!-- End Piwik Code --> +<!-- End Matomo Code --> "; $this->assertEquals($expected, $jsTag); @@ -113,7 +113,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase $customCampaignNameQueryParam = "campaignKey", $customCampaignKeywordParam = "keywordKey", $doNotTrack = true); - $expected = "<!-- Piwik --> + $expected = "<!-- Matomo --> <script type="text/javascript"> var _paq = _paq || []; /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ @@ -136,7 +136,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); })(); </script> -<!-- End Piwik Code --> +<!-- End Matomo Code --> "; $this->assertEquals($expected, $jsTag); @@ -160,7 +160,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase $customCampaignNameQueryParam = "campaignKey", $customCampaignKeywordParam = "keywordKey", $doNotTrack = true); - $expected = "<!-- Piwik --> + $expected = "<!-- Matomo --> <script type="text/javascript"> var _paq = _paq || []; /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ @@ -184,7 +184,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); })(); </script> -<!-- End Piwik Code --> +<!-- End Matomo Code --> "; $this->assertEquals($expected, $jsTag); @@ -204,7 +204,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase $jsTag = $generator->generate($idSite = 1, $piwikUrl = 'http://localhost/piwik', $mergeSubdomains = true, $groupPageTitlesByDomain = true, $mergeAliasUrls = true); - $expected = "<!-- Piwik --> + $expected = "<!-- Matomo --> <script type="text/javascript"> var _paq = _paq || []; /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ @@ -219,7 +219,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase })(); </script> <script type='text/javascript' src="//localhost/piwik/piwik.js"></script> -<!-- End Piwik Code --> +<!-- End Matomo Code --> "; $this->assertEquals($expected, $jsTag); @@ -241,7 +241,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase $customCampaignKeywordParam = 'abc"def' ); - $expected = '<!-- Piwik --> + $expected = '<!-- Matomo --> <script type="text/javascript"> var _paq = _paq || []; /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ @@ -262,7 +262,7 @@ class TrackerCodeGeneratorTest extends IntegrationTestCase g.type=\'text/javascript\'; g.async=true; g.defer=true; g.src=u+\'piwik.js\'; s.parentNode.insertBefore(g,s); })(); </script> -<!-- End Piwik Code --> +<!-- End Matomo Code --> '; $this->assertEquals($expected, $jsTag); diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml index 4edaf88364..5aba36c049 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__CorePluginsAdmin.getSystemSettings.xml @@ -20,7 +20,7 @@ <latest_2x_beta>Latest beta 2.X (Long Term Support version)</latest_2x_beta> </availableValues> <description /> - <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=https://matomo.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.matomo.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp> + <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=https://matomo.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Matomo.<br/>If Matomo is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.matomo.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp> <templateFile /> <introduction>Release channel</introduction> <condition /> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml index 4edaf88364..5aba36c049 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__CorePluginsAdmin.getSystemSettings.xml @@ -20,7 +20,7 @@ <latest_2x_beta>Latest beta 2.X (Long Term Support version)</latest_2x_beta> </availableValues> <description /> - <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=https://matomo.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.matomo.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp> + <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=https://matomo.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Matomo.<br/>If Matomo is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.matomo.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp> <templateFile /> <introduction>Release channel</introduction> <condition /> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html index 806cd18d62..cdd66f1ffe 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_month.original.html @@ -4,7 +4,7 @@ <head> <meta charset="utf-8"> <meta name="robots" content="noindex,nofollow"> - <meta name="generator" content="Piwik Analytics"> + <meta name="generator" content="Matomo Analytics"> </head> <body style="color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; line-height: 24px; margin:0 auto; max-width:1000px; background-color:rgb(255, 255, 255);box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.75);"> @@ -60,7 +60,7 @@ <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif; text-align:center;font-size:13px; color:#666; padding:30px'> Powered by - <a style="color:#439fe0; " href="https://matomo.org/" title="Piwik Analytics">Piwik Analytics</a> + <a style="color:#439fe0; " href="https://matomo.org/" title="Matomo Analytics">Matomo Analytics</a> <br /> The leading open analytics platform that respects your privacy. </p> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html index 7c19110eeb..fe210e63af 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html @@ -4,7 +4,7 @@ <head> <meta charset="utf-8"> <meta name="robots" content="noindex,nofollow"> - <meta name="generator" content="Piwik Analytics"> + <meta name="generator" content="Matomo Analytics"> </head> <body style="color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; line-height: 24px; margin:0 auto; max-width:1000px; background-color:rgb(255, 255, 255);box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.75);"> @@ -5627,7 +5627,7 @@ <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif; text-align:center;font-size:13px; color:#666; padding:30px'> Powered by - <a style="color:#439fe0; " href="https://matomo.org/" title="Piwik Analytics">Piwik Analytics</a> + <a style="color:#439fe0; " href="https://matomo.org/" title="Matomo Analytics">Matomo Analytics</a> <br /> The leading open analytics platform that respects your privacy. </p> 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 5ce1b71226..0d14f85779 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 @@ -4,7 +4,7 @@ <head> <meta charset="utf-8"> <meta name="robots" content="noindex,nofollow"> - <meta name="generator" content="Piwik Analytics"> + <meta name="generator" content="Matomo Analytics"> </head> <body style="color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; line-height: 24px; margin:0 auto; max-width:1000px; background-color:rgb(255, 255, 255);box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.75);"> @@ -5347,7 +5347,7 @@ <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif; text-align:center;font-size:13px; color:#666; padding:30px'> Powered by - <a style="color:#439fe0; " href="https://matomo.org/" title="Piwik Analytics">Piwik Analytics</a> + <a style="color:#439fe0; " href="https://matomo.org/" title="Matomo Analytics">Matomo Analytics</a> <br /> The leading open analytics platform that respects your privacy. </p> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml index 0509ff030c..5be62716bf 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml @@ -1452,7 +1452,7 @@ <module>Actions</module> <action>getDownloads</action> <dimension>Download URL</dimension> - <documentation>In this report, you can see which files your visitors have downloaded. <br /> What Piwik counts as a download is the click on a download link. Whether the download was completed or not isn't known to Piwik.</documentation> + <documentation>In this report, you can see which files your visitors have downloaded. <br /> What Matomo counts as a download is the click on a download link. Whether the download was completed or not isn't known to Matomo.</documentation> <metrics> <nb_visits>Unique Downloads</nb_visits> <nb_hits>Downloads</nb_hits> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml index 6c8629bcf7..5a5a0088d6 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_year__SitesManager.getJavascriptTag.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" ?> -<result><!-- Piwik --> +<result><!-- Matomo --> <script type="text/javascript"> var _paq = _paq || []; /* tracker methods like "setCustomDimension" should be called before "trackPageView" */ @@ -13,5 +13,5 @@ g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s); })(); </script> -<!-- End Piwik Code --> +<!-- End Matomo Code --> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html index 1d3cdbb1c7..ddb3f14ef6 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html @@ -4,7 +4,7 @@ <head> <meta charset="utf-8"> <meta name="robots" content="noindex,nofollow"> - <meta name="generator" content="Piwik Analytics"> + <meta name="generator" content="Matomo Analytics"> </head> <body style="color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; line-height: 24px; margin:0 auto; max-width:1000px; background-color:rgb(255, 255, 255);box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.75);"> @@ -60,7 +60,7 @@ <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif; text-align:center;font-size:13px; color:#666; padding:30px'> Powered by - <a style="color:#439fe0; " href="https://matomo.org/" title="Piwik Analytics">Piwik Analytics</a> + <a style="color:#439fe0; " href="https://matomo.org/" title="Matomo Analytics">Matomo Analytics</a> <br /> The leading open analytics platform that respects your privacy. </p> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html index 74334d0e47..2d0c4961a9 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html @@ -4,7 +4,7 @@ <head> <meta charset="utf-8"> <meta name="robots" content="noindex,nofollow"> - <meta name="generator" content="Piwik Analytics"> + <meta name="generator" content="Matomo Analytics"> </head> <body style="color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; line-height: 24px; margin:0 auto; max-width:1000px; background-color:rgb(255, 255, 255);box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.75);"> @@ -7114,7 +7114,7 @@ <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif; text-align:center;font-size:13px; color:#666; padding:30px'> Powered by - <a style="color:#439fe0; " href="https://matomo.org/" title="Piwik Analytics">Piwik Analytics</a> + <a style="color:#439fe0; " href="https://matomo.org/" title="Matomo Analytics">Matomo Analytics</a> <br /> The leading open analytics platform that respects your privacy. </p> 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 1893834e50..a44a863aa6 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 @@ -4,7 +4,7 @@ <head> <meta charset="utf-8"> <meta name="robots" content="noindex,nofollow"> - <meta name="generator" content="Piwik Analytics"> + <meta name="generator" content="Matomo Analytics"> </head> <body style="color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Cantarell, 'Helvetica Neue', sans-serif; line-height: 24px; margin:0 auto; max-width:1000px; background-color:rgb(255, 255, 255);box-shadow: 0px 0px 5px 1px rgba(0,0,0,0.75);"> @@ -6750,7 +6750,7 @@ <p style='font-size:15px;line-height:24px;margin:0 0 16px;color:#0d0d0d;font-family:-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Cantarell, "Helvetica Neue", sans-serif; text-align:center;font-size:13px; color:#666; padding:30px'> Powered by - <a style="color:#439fe0; " href="https://matomo.org/" title="Piwik Analytics">Piwik Analytics</a> + <a style="color:#439fe0; " href="https://matomo.org/" title="Matomo Analytics">Matomo Analytics</a> <br /> The leading open analytics platform that respects your privacy. </p> diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml index 4edaf88364..5aba36c049 100644 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__CorePluginsAdmin.getSystemSettings.xml @@ -20,7 +20,7 @@ <latest_2x_beta>Latest beta 2.X (Long Term Support version)</latest_2x_beta> </availableValues> <description /> - <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=https://matomo.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.matomo.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp> + <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=https://matomo.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Matomo.<br/>If Matomo is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.matomo.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp> <templateFile /> <introduction>Release channel</introduction> <condition /> diff --git a/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml b/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml index 4edaf88364..5aba36c049 100644 --- a/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml +++ b/tests/PHPUnit/System/expected/test_noVisit__CorePluginsAdmin.getSystemSettings.xml @@ -20,7 +20,7 @@ <latest_2x_beta>Latest beta 2.X (Long Term Support version)</latest_2x_beta> </availableValues> <description /> - <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=https://matomo.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Piwik.<br/>If Piwik is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.matomo.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp> + <inlineHelp>While our <a href='?module=Proxy&action=redirect&url=https://matomo.org/participate/development-process/' target='_blank'>development process</a> includes thousands of automated tests, Beta Testers play a key role in achieving the "No bug policy" in Matomo.<br/>If Matomo is a critical part of your business, we recommend you use the latest stable release. If you use the latest beta and you find a bug or have a suggestion, please <a href='?module=Proxy&action=redirect&url=https%3A%2F%2Fdeveloper.matomo.org%2Fguides%2Fcore-team-workflow%23influencing-piwik-development' target='_blank'>see here</a>.<br />LTS (Long Term Support) versions receive only security and bug fixes.</inlineHelp> <templateFile /> <introduction>Release channel</introduction> <condition /> diff --git a/tests/UI/expected-screenshots/Morpheus_load.png b/tests/UI/expected-screenshots/Morpheus_load.png index 7b89abb94b..8464dca52e 100644 --- a/tests/UI/expected-screenshots/Morpheus_load.png +++ b/tests/UI/expected-screenshots/Morpheus_load.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f73d01d6126c9a15ae6726812f454ce7b19dbde220cfb4af9dbd9fbee86d4d70 -size 1230261 +oid sha256:e3dcc8139ee246d6961f1343d72e1760645e08adda5659a01adfc1c8c07852bf +size 1231490 |