diff options
21 files changed, 40 insertions, 40 deletions
diff --git a/misc/log-analytics b/misc/log-analytics -Subproject 85b9e5d4d28b93c0d5d1b463b203fe03622dd01 +Subproject a12e27f8ac35e9e409274332e42ea059f5d638b diff --git a/plugins/CustomVariables b/plugins/CustomVariables -Subproject ceb058de28952be0909ecec3c4c286e12deb271 +Subproject a3c86e82e335be8e7390fc450d816b7db4bc379 diff --git a/plugins/LoginLdap b/plugins/LoginLdap -Subproject d7eaf98e29764875226005d0b7f4f71ea3ff8fb +Subproject b66583b06d8c2a2aa6b2f394f286d001d569271 diff --git a/plugins/MarketingCampaignsReporting b/plugins/MarketingCampaignsReporting -Subproject f08bd4c55ff7d47cf330545589d907c6223dea5 +Subproject e050571d8662bd9d0342945ca61e3acac692cc4 diff --git a/plugins/Morpheus/icons b/plugins/Morpheus/icons -Subproject e96ef33bf490794829831cbb795fd4ea6725969 +Subproject 1439b5db6c4c440599e39f24e22f0c12f08371d diff --git a/plugins/Provider b/plugins/Provider -Subproject ae361620f70d5c18e137d273429900b1de0a250 +Subproject 95e448b091bcd5ac9877fdd474788f18ad77f1f diff --git a/plugins/QueuedTracking b/plugins/QueuedTracking -Subproject 1d2fb8dbfda3dbc01439b54ee1f36bd18b6e8e9 +Subproject 69cc21c6908fc8175c3355230a1f1b459836074 diff --git a/plugins/TagManager b/plugins/TagManager -Subproject 706aacfc7741fd32b0b64bfe94791db03e1fded +Subproject ea8cc30d63c2799aa866a70cf13ad31a339dbdf diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_flat__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_flat__Actions.getPageUrls_month.xml index 7afec2fc9f..f74ab791e0 100644 --- a/tests/PHPUnit/System/expected/test_DataComparisonTest_flat__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_flat__Actions.getPageUrls_month.xml @@ -5246,7 +5246,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> - <url>http://piwik.net/view/my/file.html</url> + <url>http://d111111abcdef8.cloudfront.net/view/my/file.html</url> <Actions_PageUrl>/view/my/file.html</Actions_PageUrl> <comparisons> <row> @@ -5281,7 +5281,7 @@ <comparePeriodPretty>August 2012</comparePeriodPretty> <compareSeriesPretty>(August 2012) (All visits)</compareSeriesPretty> <idsubdatatable>-1</idsubdatatable> - <segment>pageUrl==http%253A%252F%252Fpiwik.net%252Fview%252Fmy%252Ffile.html</segment> + <segment>pageUrl==http%253A%252F%252Fd111111abcdef8.cloudfront.net%252Fview%252Fmy%252Ffile.html</segment> </row> <row> <nb_visits>0</nb_visits> @@ -5316,7 +5316,7 @@ <comparePeriodPretty>August 2012</comparePeriodPretty> <compareSeriesPretty>(August 2012) (operatingSystemCode==WIN)</compareSeriesPretty> <idsubdatatable>-1</idsubdatatable> - <segment>pageUrl==http%253A%252F%252Fpiwik.net%252Fview%252Fmy%252Ffile.html</segment> + <segment>pageUrl==http%253A%252F%252Fd111111abcdef8.cloudfront.net%252Fview%252Fmy%252Ffile.html</segment> </row> <row> <nb_visits>0</nb_visits> @@ -5401,7 +5401,7 @@ <comparePeriodPretty>Week August 13 – 19, 2012</comparePeriodPretty> <compareSeriesPretty>(Week August 13 – 19, 2012) (All visits)</compareSeriesPretty> <idsubdatatable>-1</idsubdatatable> - <segment>pageUrl==http%253A%252F%252Fpiwik.net%252Fview%252Fmy%252Ffile.html</segment> + <segment>pageUrl==http%253A%252F%252Fd111111abcdef8.cloudfront.net%252Fview%252Fmy%252Ffile.html</segment> </row> <row> <nb_visits>0</nb_visits> @@ -5486,9 +5486,9 @@ <comparePeriodPretty>Week August 13 – 19, 2012</comparePeriodPretty> <compareSeriesPretty>(Week August 13 – 19, 2012) (operatingSystemCode==WIN)</compareSeriesPretty> <idsubdatatable>-1</idsubdatatable> - <segment>pageUrl==http%253A%252F%252Fpiwik.net%252Fview%252Fmy%252Ffile.html</segment> + <segment>pageUrl==http%253A%252F%252Fd111111abcdef8.cloudfront.net%252Fview%252Fmy%252Ffile.html</segment> </row> </comparisons> - <segment>pageUrl==http%253A%252F%252Fpiwik.net%252Fview%252Fmy%252Ffile.html</segment> + <segment>pageUrl==http%253A%252F%252Fd111111abcdef8.cloudfront.net%252Fview%252Fmy%252Ffile.html</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_invertCompare__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_invertCompare__Actions.getPageUrls_month.xml index 72427a7025..6c672dc502 100644 --- a/tests/PHPUnit/System/expected/test_DataComparisonTest_invertCompare__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_invertCompare__Actions.getPageUrls_month.xml @@ -8106,7 +8106,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> - <url>http://piwik.net/view/my/file.html</url> + <url>http://d111111abcdef8.cloudfront.net/view/my/file.html</url> <comparisons> <row> <nb_visits>1</nb_visits> @@ -8133,7 +8133,7 @@ <comparePeriodPretty>August 2012</comparePeriodPretty> <compareSeriesPretty>(August 2012) (All visits)</compareSeriesPretty> <idsubdatatable>-1</idsubdatatable> - <segment>pageUrl==http%253A%252F%252Fpiwik.net%252Fview%252Fmy%252Ffile.html</segment> + <segment>pageUrl==http%253A%252F%252Fd111111abcdef8.cloudfront.net%252Fview%252Fmy%252Ffile.html</segment> </row> <row> <nb_visits>1</nb_visits> @@ -8160,10 +8160,10 @@ <comparePeriodPretty>August 2012</comparePeriodPretty> <compareSeriesPretty>(August 2012) (browserCode==ie)</compareSeriesPretty> <idsubdatatable>-1</idsubdatatable> - <segment>pageUrl==http%253A%252F%252Fpiwik.net%252Fview%252Fmy%252Ffile.html</segment> + <segment>pageUrl==http%253A%252F%252Fd111111abcdef8.cloudfront.net%252Fview%252Fmy%252Ffile.html</segment> </row> </comparisons> - <segment>pageUrl==http%253A%252F%252Fpiwik.net%252Fview%252Fmy%252Ffile.html</segment> + <segment>pageUrl==http%253A%252F%252Fd111111abcdef8.cloudfront.net%252Fview%252Fmy%252Ffile.html</segment> </row> </subtable> </row> diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleSites_multipleCompare__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleSites_multipleCompare__Actions.getPageUrls_month.xml index 8ac36fad69..693c628137 100644 --- a/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleSites_multipleCompare__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_multipleSites_multipleCompare__Actions.getPageUrls_month.xml @@ -11672,7 +11672,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> - <url>http://piwik.net/view/my/file.html</url> + <url>http://d111111abcdef8.cloudfront.net/view/my/file.html</url> <comparisons> <row> <nb_visits>1</nb_visits> @@ -11699,7 +11699,7 @@ <comparePeriodPretty>August 2012</comparePeriodPretty> <compareSeriesPretty>(August 2012) (All visits)</compareSeriesPretty> <idsubdatatable>-1</idsubdatatable> - <segment>pageUrl==http%253A%252F%252Fpiwik.net%252Fview%252Fmy%252Ffile.html</segment> + <segment>pageUrl==http%253A%252F%252Fd111111abcdef8.cloudfront.net%252Fview%252Fmy%252Ffile.html</segment> </row> <row> <nb_visits>1</nb_visits> @@ -11726,10 +11726,10 @@ <comparePeriodPretty>August 2012</comparePeriodPretty> <compareSeriesPretty>(August 2012) (browserCode==ie)</compareSeriesPretty> <idsubdatatable>-1</idsubdatatable> - <segment>pageUrl==http%253A%252F%252Fpiwik.net%252Fview%252Fmy%252Ffile.html</segment> + <segment>pageUrl==http%253A%252F%252Fd111111abcdef8.cloudfront.net%252Fview%252Fmy%252Ffile.html</segment> </row> </comparisons> - <segment>pageUrl==http%253A%252F%252Fpiwik.net%252Fview%252Fmy%252Ffile.html</segment> + <segment>pageUrl==http%253A%252F%252Fd111111abcdef8.cloudfront.net%252Fview%252Fmy%252Ffile.html</segment> </row> </subtable> </row> diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_periods__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_periods__Actions.getPageUrls_month.xml index 228b837a52..358fb2de73 100644 --- a/tests/PHPUnit/System/expected/test_DataComparisonTest_periods__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_periods__Actions.getPageUrls_month.xml @@ -5514,7 +5514,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> - <url>http://piwik.net/view/my/file.html</url> + <url>http://d111111abcdef8.cloudfront.net/view/my/file.html</url> <comparisons> <row> <nb_visits>1</nb_visits> @@ -5541,10 +5541,10 @@ <comparePeriodPretty>August 2012</comparePeriodPretty> <compareSeriesPretty>(August 2012) (All visits)</compareSeriesPretty> <idsubdatatable>-1</idsubdatatable> - <segment>pageUrl==http%253A%252F%252Fpiwik.net%252Fview%252Fmy%252Ffile.html</segment> + <segment>pageUrl==http%253A%252F%252Fd111111abcdef8.cloudfront.net%252Fview%252Fmy%252Ffile.html</segment> </row> </comparisons> - <segment>pageUrl==http%253A%252F%252Fpiwik.net%252Fview%252Fmy%252Ffile.html</segment> + <segment>pageUrl==http%253A%252F%252Fd111111abcdef8.cloudfront.net%252Fview%252Fmy%252Ffile.html</segment> </row> </subtable> </row> diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_segmentsAndPeriods__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_segmentsAndPeriods__Actions.getPageUrls_month.xml index 40bff083c8..7337bf7003 100644 --- a/tests/PHPUnit/System/expected/test_DataComparisonTest_segmentsAndPeriods__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_segmentsAndPeriods__Actions.getPageUrls_month.xml @@ -11671,7 +11671,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> - <url>http://piwik.net/view/my/file.html</url> + <url>http://d111111abcdef8.cloudfront.net/view/my/file.html</url> <comparisons> <row> <nb_visits>1</nb_visits> @@ -11698,7 +11698,7 @@ <comparePeriodPretty>August 2012</comparePeriodPretty> <compareSeriesPretty>(August 2012) (All visits)</compareSeriesPretty> <idsubdatatable>-1</idsubdatatable> - <segment>pageUrl==http%253A%252F%252Fpiwik.net%252Fview%252Fmy%252Ffile.html</segment> + <segment>pageUrl==http%253A%252F%252Fd111111abcdef8.cloudfront.net%252Fview%252Fmy%252Ffile.html</segment> </row> <row> <nb_visits>1</nb_visits> @@ -11725,10 +11725,10 @@ <comparePeriodPretty>August 2012</comparePeriodPretty> <compareSeriesPretty>(August 2012) (browserCode==ie)</compareSeriesPretty> <idsubdatatable>-1</idsubdatatable> - <segment>pageUrl==http%253A%252F%252Fpiwik.net%252Fview%252Fmy%252Ffile.html</segment> + <segment>pageUrl==http%253A%252F%252Fd111111abcdef8.cloudfront.net%252Fview%252Fmy%252Ffile.html</segment> </row> </comparisons> - <segment>pageUrl==http%253A%252F%252Fpiwik.net%252Fview%252Fmy%252Ffile.html</segment> + <segment>pageUrl==http%253A%252F%252Fd111111abcdef8.cloudfront.net%252Fview%252Fmy%252Ffile.html</segment> </row> </subtable> </row> diff --git a/tests/PHPUnit/System/expected/test_DataComparisonTest_segments__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_DataComparisonTest_segments__Actions.getPageUrls_month.xml index 426d6badc5..8577f93b3d 100644 --- a/tests/PHPUnit/System/expected/test_DataComparisonTest_segments__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_DataComparisonTest_segments__Actions.getPageUrls_month.xml @@ -4051,7 +4051,7 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> - <url>http://piwik.net/view/my/file.html</url> + <url>http://d111111abcdef8.cloudfront.net/view/my/file.html</url> <comparisons> <row> <nb_visits>1</nb_visits> @@ -4078,7 +4078,7 @@ <comparePeriodPretty>August 2012</comparePeriodPretty> <compareSeriesPretty>(August 2012) (All visits)</compareSeriesPretty> <idsubdatatable>-1</idsubdatatable> - <segment>pageUrl==http%253A%252F%252Fpiwik.net%252Fview%252Fmy%252Ffile.html</segment> + <segment>pageUrl==http%253A%252F%252Fd111111abcdef8.cloudfront.net%252Fview%252Fmy%252Ffile.html</segment> </row> <row> <nb_visits>1</nb_visits> @@ -4105,10 +4105,10 @@ <comparePeriodPretty>August 2012</comparePeriodPretty> <compareSeriesPretty>(August 2012) (browserCode==ie)</compareSeriesPretty> <idsubdatatable>-1</idsubdatatable> - <segment>pageUrl==http%253A%252F%252Fpiwik.net%252Fview%252Fmy%252Ffile.html</segment> + <segment>pageUrl==http%253A%252F%252Fd111111abcdef8.cloudfront.net%252Fview%252Fmy%252Ffile.html</segment> </row> </comparisons> - <segment>pageUrl==http%253A%252F%252Fpiwik.net%252Fview%252Fmy%252Ffile.html</segment> + <segment>pageUrl==http%253A%252F%252Fd111111abcdef8.cloudfront.net%252Fview%252Fmy%252Ffile.html</segment> </row> </subtable> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml index f3e31df366..e00f3321ca 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_month.xml @@ -1759,8 +1759,8 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> - <url>http://piwik.net/view/my/file.html</url> - <segment>entryPageUrl==http%253A%252F%252Fpiwik.net%252Fview%252Fmy%252Ffile.html</segment> + <url>http://d111111abcdef8.cloudfront.net/view/my/file.html</url> + <segment>entryPageUrl==http%253A%252F%252Fd111111abcdef8.cloudfront.net%252Fview%252Fmy%252Ffile.html</segment> </row> </subtable> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml index 0d9d532acc..04e5f4d20b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getEntryPageUrls_range.xml @@ -3473,8 +3473,8 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> - <url>http://piwik.net/view/my/file.html</url> - <segment>entryPageUrl==http%253A%252F%252Fpiwik.net%252Fview%252Fmy%252Ffile.html</segment> + <url>http://d111111abcdef8.cloudfront.net/view/my/file.html</url> + <segment>entryPageUrl==http%253A%252F%252Fd111111abcdef8.cloudfront.net%252Fview%252Fmy%252Ffile.html</segment> </row> </subtable> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml index 35bceeafeb..f6b7df74a8 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_month.xml @@ -1753,8 +1753,8 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> - <url>http://piwik.net/view/my/file.html</url> - <segment>exitPageUrl==http%253A%252F%252Fpiwik.net%252Fview%252Fmy%252Ffile.html</segment> + <url>http://d111111abcdef8.cloudfront.net/view/my/file.html</url> + <segment>exitPageUrl==http%253A%252F%252Fd111111abcdef8.cloudfront.net%252Fview%252Fmy%252Ffile.html</segment> </row> </subtable> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml index d23f0fa227..7974a068d0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getExitPageUrls_range.xml @@ -3497,8 +3497,8 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> - <url>http://piwik.net/view/my/file.html</url> - <segment>exitPageUrl==http%253A%252F%252Fpiwik.net%252Fview%252Fmy%252Ffile.html</segment> + <url>http://d111111abcdef8.cloudfront.net/view/my/file.html</url> + <segment>exitPageUrl==http%253A%252F%252Fd111111abcdef8.cloudfront.net%252Fview%252Fmy%252Ffile.html</segment> </row> </subtable> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml index 915e490787..5d06ab0868 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_month.xml @@ -1804,8 +1804,8 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> - <url>http://piwik.net/view/my/file.html</url> - <segment>pageUrl==http%253A%252F%252Fpiwik.net%252Fview%252Fmy%252Ffile.html</segment> + <url>http://d111111abcdef8.cloudfront.net/view/my/file.html</url> + <segment>pageUrl==http%253A%252F%252Fd111111abcdef8.cloudfront.net%252Fview%252Fmy%252Ffile.html</segment> </row> </subtable> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml index 5465e30c2c..6af60cc8b1 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Actions.getPageUrls_range.xml @@ -3668,8 +3668,8 @@ <avg_time_on_page>0</avg_time_on_page> <bounce_rate>100%</bounce_rate> <exit_rate>100%</exit_rate> - <url>http://piwik.net/view/my/file.html</url> - <segment>pageUrl==http%253A%252F%252Fpiwik.net%252Fview%252Fmy%252Ffile.html</segment> + <url>http://d111111abcdef8.cloudfront.net/view/my/file.html</url> + <segment>pageUrl==http%253A%252F%252Fd111111abcdef8.cloudfront.net%252Fview%252Fmy%252Ffile.html</segment> </row> </subtable> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml index 2700ca1663..2d8954a303 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -2333,7 +2333,7 @@ <actionDetails> <row> <type>action</type> - <url>http://piwik.net/view/my/file.html</url> + <url>http://d111111abcdef8.cloudfront.net/view/my/file.html</url> <pageTitle /> <pageIdAction>69</pageIdAction> @@ -2342,7 +2342,7 @@ <bandwidth>182</bandwidth> <pageviewPosition>1</pageviewPosition> <title /> - <subtitle>http://piwik.net/view/my/file.html</subtitle> + <subtitle>http://d111111abcdef8.cloudfront.net/view/my/file.html</subtitle> <icon /> <iconSVG>plugins/Morpheus/images/action.svg</iconSVG> @@ -2362,7 +2362,7 @@ <revenue>5</revenue> <goalPageId>86</goalPageId> - <url>http://piwik.net/view/my/file.html</url> + <url>http://d111111abcdef8.cloudfront.net/view/my/file.html</url> <icon>plugins/Morpheus/images/goal.png</icon> <iconSVG>plugins/Morpheus/images/goal.svg</iconSVG> <title>Goal conversion</title> |