From a0f0eb8fa0cc86e14afeabde80d2a21a7e0122d9 Mon Sep 17 00:00:00 2001 From: Matthieu Aubry Date: Tue, 28 Mar 2017 19:38:53 +0200 Subject: All icons in own repo and included as a submodule (#11548) * add icons submodule * replace path * change submodule url * fix JSONTest * fix integration tests * update icon submodules * fix preg_match * fix remaining system tests * better match for non dist icon files * fix .gitmodules * update icon submodule * Fixed custom dimension test * Do not completely fail when GD not enabled * Fix http test + refactor checklist * Refactored the code into a method * Changed icon path refs https://github.com/piwik/piwik/pull/11383 * System tests * Update valid UI tests * Fix integration test --- ...nt_noOptions__Live.getLastVisitsDetails_day.xml | 36 +-- ...t_noOptions__Live.getLastVisitsDetails_year.xml | 44 +-- ...estAPITest__Live.getLastVisitsDetails_range.xml | 282 +++++++++--------- ...y1XTest__DevicesDetection.getOsVersions_day.xml | 2 +- ...CustomEvents__Live.getLastVisitsDetails_day.xml | 70 ++--- ...stomEvents__Live.getLastVisitsDetails_month.xml | 70 ++--- ...t_ImportLogs__DevicePlugins.getPlugin_month.xml | 20 +- ...__DevicesDetection.getBrowserFamilies_month.xml | 16 +- ...__DevicesDetection.getBrowserVersions_month.xml | 34 +-- ...ortLogs__DevicesDetection.getBrowsers_month.xml | 16 +- ...tLogs__DevicesDetection.getOsFamilies_month.xml | 14 +- ...tLogs__DevicesDetection.getOsVersions_month.xml | 26 +- ...ImportLogs__Live.getLastVisitsDetails_range.xml | 316 ++++++++++----------- ...ixedSiteId__Live.getLastVisitsDetails_range.xml | 172 +++++------ ...AndLimit_1__Live.getLastVisitsDetails_month.xml | 24 +- ...AndLimit_2__Live.getLastVisitsDetails_month.xml | 24 +- ...ls_sortAsc__Live.getLastVisitsDetails_month.xml | 28 +- ...IdVisitAsc__Live.getLastVisitsDetails_month.xml | 56 ++-- ...tByIdVisit__Live.getLastVisitsDetails_month.xml | 58 ++-- ...VisitCount__Live.getLastVisitsDetails_month.xml | 58 ++-- ...s_sortDesc__Live.getLastVisitsDetails_month.xml | 58 ++-- ...ebsiteTest__Live.getLastVisitsDetails_month.xml | 82 +++--- ...sitorTwoVisits__DevicePlugins.getPlugin_day.xml | 20 +- ...ts__DevicesDetection.getBrowserFamilies_day.xml | 2 +- ...ts__DevicesDetection.getBrowserVersions_day.xml | 2 +- ...TwoVisits__DevicesDetection.getBrowsers_day.xml | 2 +- ...oVisits__DevicesDetection.getOsFamilies_day.xml | 2 +- ...oVisits__DevicesDetection.getOsVersions_day.xml | 2 +- ...orTwoVisits__Referrers.getSearchEngines_day.xml | 2 +- ...hCookieSupport__DevicePlugins.getPlugin_day.xml | 20 +- ...rt__DevicesDetection.getBrowserFamilies_day.xml | 2 +- ...rt__DevicesDetection.getBrowserVersions_day.xml | 2 +- ...ieSupport__DevicesDetection.getBrowsers_day.xml | 2 +- ...Support__DevicesDetection.getOsFamilies_day.xml | 2 +- ...Support__DevicesDetection.getOsVersions_day.xml | 2 +- ...ookieSupport__Live.getLastVisitsDetails_day.xml | 18 +- ...okieSupport__Referrers.getSearchEngines_day.xml | 2 +- ...gUrlsTruncated__DevicePlugins.getPlugin_day.xml | 4 +- ...ordSpecified__Live.getLastVisitsDetails_day.xml | 20 +- ...fThreeDays__Live.getLastVisitsDetails_month.xml | 12 +- ...actersHierarchical__API.getRowEvolution_day.xml | 2 +- ...atFilters__Referrers.getSearchEngines_month.xml | 6 +- ..._processedRowLabel__API.getRowEvolution_day.xml | 4 +- ...imezonesTest__Live.getLastVisitsDetails_day.xml | 8 +- ...duledReports.generateReport_month.original.html | 44 +-- ...duledReports.generateReport_month.original.html | 40 +-- ...eduledReports.generateReport_month.original.pdf | Bin 553712 -> 552121 bytes ...st_csvExport__Live.getLastVisitsDetails_day.csv | Bin 8526 -> 8472 bytes ...tatusOrdered__Live.getLastVisitsDetails_day.xml | 16 +- ...derWithItems__Live.getLastVisitsDetails_day.xml | 24 +- ...eduledReports.generateReport_week.original.html | 32 +-- ...eduledReports.generateReport_week.original.html | 28 +- ...heduledReports.generateReport_week.original.pdf | Bin 570847 -> 569258 bytes ...Range_Flattened__Referrers.getSocials_range.xml | 20 +- ...nge_IndexedByDate__Referrers.getSocials_day.xml | 10 +- ...lDays_DateRange__Referrers.getSocials_range.xml | 16 +- ...tN_MetadataAndNormalAPI__Live.getLastVisits.xml | 26 +- ...dNormalAPI__Live.getLastVisitsDetails_range.xml | 26 +- ...etadataAndNormalAPI__Live.getVisitorProfile.xml | 16 +- ...ndNormalAPI_pagesegment__Live.getLastVisits.xml | 26 +- ...agesegment__Live.getLastVisitsDetails_range.xml | 26 +- ...rmalAPI_pagesegment__Live.getVisitorProfile.xml | 16 +- ...ng__DevicesDetection.getBrowserVersions_day.xml | 6 +- ...imiting__DevicesDetection.getOsVersions_day.xml | 6 +- ...ortLimiting__Referrers.getSearchEngines_day.xml | 6 +- ...ed__DevicesDetection.getBrowserVersions_day.xml | 6 +- ...attened__DevicesDetection.getOsVersions_day.xml | 6 +- ...miting_flattened__Referrers.getKeywords_day.xml | 8 +- ...g_flattened__Referrers.getSearchEngines_day.xml | 10 +- ...ry__DevicesDetection.getBrowserVersions_day.xml | 6 +- ...ngQuery__DevicesDetection.getOsVersions_day.xml | 6 +- ...ankingQuery__Referrers.getSearchEngines_day.xml | 6 +- 72 files changed, 1038 insertions(+), 1038 deletions(-) (limited to 'tests/PHPUnit/System/expected') diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml index 4c118588fa..1767b3b86f 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml @@ -74,14 +74,14 @@ Mac 10.8 Mac - plugins/DevicesDetection/images/os/MAC.png + plugins/Morpheus/icons/dist/os/MAC.png MAC 10.8 WebKit WebKit (Safari, Chrome) Chrome 19.0 Chrome - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png CH 19.0 0 @@ -188,14 +188,14 @@ GNU/Linux GNU/Linux - plugins/DevicesDetection/images/os/LIN.png + plugins/Morpheus/icons/dist/os/LIN.png LIN Gecko Gecko (Firefox) Firefox 6.0 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 6.0 0 @@ -302,14 +302,14 @@ GNU/Linux GNU/Linux - plugins/DevicesDetection/images/os/LIN.png + plugins/Morpheus/icons/dist/os/LIN.png LIN WebKit WebKit (Safari, Chrome) Chrome 19.0 Chrome - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png CH 19.0 0 @@ -416,14 +416,14 @@ GNU/Linux GNU/Linux - plugins/DevicesDetection/images/os/LIN.png + plugins/Morpheus/icons/dist/os/LIN.png LIN WebKit WebKit (Safari, Chrome) Epiphany 2.30 Epiphany - plugins/DevicesDetection/images/browsers/EP.png + plugins/Morpheus/icons/dist/browsers/EP.png EP 2.30 0 @@ -530,14 +530,14 @@ Windows 7 Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN 7 Trident Trident (IE) Internet Explorer 9.0 Internet Explorer - plugins/DevicesDetection/images/browsers/IE.png + plugins/Morpheus/icons/dist/browsers/IE.png IE 9.0 0 @@ -644,14 +644,14 @@ GNU/Linux GNU/Linux - plugins/DevicesDetection/images/os/LIN.png + plugins/Morpheus/icons/dist/os/LIN.png LIN Gecko Gecko (Firefox) Firefox 6.0 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 6.0 0 @@ -758,14 +758,14 @@ GNU/Linux GNU/Linux - plugins/DevicesDetection/images/os/LIN.png + plugins/Morpheus/icons/dist/os/LIN.png LIN WebKit WebKit (Safari, Chrome) Epiphany 2.30 Epiphany - plugins/DevicesDetection/images/browsers/EP.png + plugins/Morpheus/icons/dist/browsers/EP.png EP 2.30 0 @@ -872,14 +872,14 @@ Vision Android 2.3 Android - plugins/DevicesDetection/images/os/AND.png + plugins/Morpheus/icons/dist/os/AND.png AND 2.3 WebKit WebKit (Safari, Chrome) Android Browser Android Browser - plugins/DevicesDetection/images/browsers/AN.png + plugins/Morpheus/icons/dist/browsers/AN.png AN 0 @@ -986,14 +986,14 @@ Mac 10.6 Mac - plugins/DevicesDetection/images/os/MAC.png + plugins/Morpheus/icons/dist/os/MAC.png MAC 10.6 WebKit WebKit (Safari, Chrome) RockMelt 0.9 RockMelt - plugins/DevicesDetection/images/browsers/RM.png + plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 0 diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml index 85550a6dc1..9d70523384 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml @@ -265,14 +265,14 @@ Unknown Unknown - plugins/DevicesDetection/images/os/UNK.png + plugins/Morpheus/icons/dist/os/UNK.png UNK UNK Unknown Unknown Unknown - plugins/DevicesDetection/images/browsers/UNK.png + plugins/Morpheus/icons/dist/browsers/UNK.png UNK 0 @@ -387,14 +387,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Trident Trident (IE) Internet Explorer 6.0 Internet Explorer - plugins/DevicesDetection/images/browsers/IE.png + plugins/Morpheus/icons/dist/browsers/IE.png IE 6.0 0 @@ -420,11 +420,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -514,14 +514,14 @@ Mac 10.6 Mac - plugins/DevicesDetection/images/os/MAC.png + plugins/Morpheus/icons/dist/os/MAC.png MAC 10.6 WebKit WebKit (Safari, Chrome) RockMelt 0.9 RockMelt - plugins/DevicesDetection/images/browsers/RM.png + plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 0 @@ -632,14 +632,14 @@ Mac 10.6 Mac - plugins/DevicesDetection/images/os/MAC.png + plugins/Morpheus/icons/dist/os/MAC.png MAC 10.6 WebKit WebKit (Safari, Chrome) RockMelt 0.9 RockMelt - plugins/DevicesDetection/images/browsers/RM.png + plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 0 @@ -769,14 +769,14 @@ Mac 10.6 Mac - plugins/DevicesDetection/images/os/MAC.png + plugins/Morpheus/icons/dist/os/MAC.png MAC 10.6 WebKit WebKit (Safari, Chrome) RockMelt 0.9 RockMelt - plugins/DevicesDetection/images/browsers/RM.png + plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 0 @@ -914,14 +914,14 @@ Mac 10.6 Mac - plugins/DevicesDetection/images/os/MAC.png + plugins/Morpheus/icons/dist/os/MAC.png MAC 10.6 WebKit WebKit (Safari, Chrome) RockMelt 0.9 RockMelt - plugins/DevicesDetection/images/browsers/RM.png + plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 0 @@ -1032,14 +1032,14 @@ Bot Bot - plugins/DevicesDetection/images/os/UNK.png + plugins/Morpheus/icons/dist/os/UNK.png BOT UNK Unknown Unknown Unknown - plugins/DevicesDetection/images/browsers/UNK.png + plugins/Morpheus/icons/dist/browsers/UNK.png UNK 0 @@ -1150,14 +1150,14 @@ Windows 7 Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN 7 Trident Trident (IE) Internet Explorer 9.0 Internet Explorer - plugins/DevicesDetection/images/browsers/IE.png + plugins/Morpheus/icons/dist/browsers/IE.png IE 9.0 0 @@ -1257,14 +1257,14 @@ Unknown Unknown - plugins/DevicesDetection/images/os/UNK.png + plugins/Morpheus/icons/dist/os/UNK.png UNK UNK Unknown Unknown Unknown - plugins/DevicesDetection/images/browsers/UNK.png + plugins/Morpheus/icons/dist/browsers/UNK.png UNK 0 @@ -1375,14 +1375,14 @@ Vision Android 2.3 Android - plugins/DevicesDetection/images/os/AND.png + plugins/Morpheus/icons/dist/os/AND.png AND 2.3 WebKit WebKit (Safari, Chrome) Android Browser Android Browser - plugins/DevicesDetection/images/browsers/AN.png + plugins/Morpheus/icons/dist/browsers/AN.png AN 0 diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml index 8c9dbbcce2..2569b8da4d 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -59,7 +59,7 @@ http://google.com/?q=Wikileaks FTW http://google.com - plugins/Referrers/images/searchEngines/google.com.png + plugins/Morpheus/icons/dist/searchEngines/google.com.png fr French Desktop @@ -68,14 +68,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP WebKit WebKit (Safari, Chrome) Safari Safari - plugins/DevicesDetection/images/browsers/SF.png + plugins/Morpheus/icons/dist/browsers/SF.png SF 0 @@ -99,11 +99,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -253,14 +253,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -292,11 +292,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -384,14 +384,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -423,11 +423,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -558,14 +558,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -597,11 +597,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -689,14 +689,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -728,11 +728,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -882,14 +882,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -921,11 +921,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -1013,14 +1013,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -1052,11 +1052,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -1187,14 +1187,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -1226,11 +1226,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -1318,14 +1318,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -1357,11 +1357,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -1511,14 +1511,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -1550,11 +1550,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -1642,14 +1642,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -1681,11 +1681,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -1816,14 +1816,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -1855,11 +1855,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -1990,14 +1990,14 @@ Unknown Unknown - plugins/DevicesDetection/images/os/UNK.png + plugins/Morpheus/icons/dist/os/UNK.png UNK UNK Unknown Unknown Unknown - plugins/DevicesDetection/images/browsers/UNK.png + plugins/Morpheus/icons/dist/browsers/UNK.png UNK 1 @@ -2021,11 +2021,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -2113,14 +2113,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -2152,11 +2152,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -2244,14 +2244,14 @@ Xperia Tablet S Android 4.1 Android - plugins/DevicesDetection/images/os/AND.png + plugins/Morpheus/icons/dist/os/AND.png AND 4.1 Blink Blink (Chrome, Opera) Chrome 34.0 Chrome - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png CH 34.0 0 @@ -2283,11 +2283,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -2437,14 +2437,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -2476,11 +2476,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -2630,14 +2630,14 @@ Unknown Unknown - plugins/DevicesDetection/images/os/UNK.png + plugins/Morpheus/icons/dist/os/UNK.png UNK UNK Unknown Unknown Unknown - plugins/DevicesDetection/images/browsers/UNK.png + plugins/Morpheus/icons/dist/browsers/UNK.png UNK 1 @@ -2661,11 +2661,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -2753,14 +2753,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -2792,11 +2792,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -2884,14 +2884,14 @@ Windows 7 Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN 7 Trident Trident (IE) Internet Explorer 11.0 Internet Explorer - plugins/DevicesDetection/images/browsers/IE.png + plugins/Morpheus/icons/dist/browsers/IE.png IE 11.0 0 @@ -2923,11 +2923,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -3058,14 +3058,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -3097,11 +3097,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -3232,14 +3232,14 @@ Desire MildWild 8.0 MildWild - plugins/DevicesDetection/images/os/AND.png + plugins/Morpheus/icons/dist/os/AND.png MLD 8.0 WebKit WebKit (Safari, Chrome) Android Browser Android Browser - plugins/DevicesDetection/images/browsers/AN.png + plugins/Morpheus/icons/dist/browsers/AN.png AN 1 @@ -3271,11 +3271,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -3406,14 +3406,14 @@ Unknown Unknown - plugins/DevicesDetection/images/os/UNK.png + plugins/Morpheus/icons/dist/os/UNK.png UNK UNK Unknown Unknown Unknown - plugins/DevicesDetection/images/browsers/UNK.png + plugins/Morpheus/icons/dist/browsers/UNK.png UNK 1 @@ -3437,11 +3437,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -3572,14 +3572,14 @@ Ubuntu 9.04 Ubuntu - plugins/DevicesDetection/images/os/UBT.png + plugins/Morpheus/icons/dist/os/UBT.png UBT 9.04 Gecko Gecko (Firefox) Firefox 3.0 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.0 1 @@ -3611,11 +3611,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -3703,14 +3703,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -3742,11 +3742,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -3834,14 +3834,14 @@ Desire MildWild 8.0 MildWild - plugins/DevicesDetection/images/os/AND.png + plugins/Morpheus/icons/dist/os/AND.png MLD 8.0 WebKit WebKit (Safari, Chrome) Android Browser Android Browser - plugins/DevicesDetection/images/browsers/AN.png + plugins/Morpheus/icons/dist/browsers/AN.png AN 0 @@ -3873,11 +3873,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -3965,14 +3965,14 @@ Windows Vista Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN Vista Trident Trident (IE) Internet Explorer 8.0 Internet Explorer - plugins/DevicesDetection/images/browsers/IE.png + plugins/Morpheus/icons/dist/browsers/IE.png IE 8.0 0 @@ -4004,11 +4004,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -4096,14 +4096,14 @@ Ubuntu 9.04 Ubuntu - plugins/DevicesDetection/images/os/UBT.png + plugins/Morpheus/icons/dist/os/UBT.png UBT 9.04 Gecko Gecko (Firefox) Firefox 3.0 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.0 0 @@ -4135,11 +4135,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -4289,14 +4289,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -4328,11 +4328,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -4482,14 +4482,14 @@ Nexus 4 Android 4.4 Android - plugins/DevicesDetection/images/os/AND.png + plugins/Morpheus/icons/dist/os/AND.png AND 4.4 Blink Blink (Chrome, Opera) Chrome Mobile 33.0 Chrome Mobile - plugins/DevicesDetection/images/browsers/CM.png + plugins/Morpheus/icons/dist/browsers/CM.png CM 33.0 1 @@ -4521,11 +4521,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -4675,14 +4675,14 @@ Unknown Unknown - plugins/DevicesDetection/images/os/UNK.png + plugins/Morpheus/icons/dist/os/UNK.png UNK UNK Unknown Unknown Unknown - plugins/DevicesDetection/images/browsers/UNK.png + plugins/Morpheus/icons/dist/browsers/UNK.png UNK 1 @@ -4706,11 +4706,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -4860,14 +4860,14 @@ GALAXY Note 3 Android 4.3 Android - plugins/DevicesDetection/images/os/AND.png + plugins/Morpheus/icons/dist/os/AND.png AND 4.3 WebKit WebKit (Safari, Chrome) QQ Browser 5.0 QQ Browser - plugins/DevicesDetection/images/browsers/QQ.png + plugins/Morpheus/icons/dist/browsers/QQ.png QQ 5.0 1 @@ -4899,11 +4899,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -4991,14 +4991,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -5030,11 +5030,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -5122,14 +5122,14 @@ Nexus 4 Android 4.4 Android - plugins/DevicesDetection/images/os/AND.png + plugins/Morpheus/icons/dist/os/AND.png AND 4.4 Blink Blink (Chrome, Opera) Chrome Mobile 33.0 Chrome Mobile - plugins/DevicesDetection/images/browsers/CM.png + plugins/Morpheus/icons/dist/browsers/CM.png CM 33.0 0 @@ -5161,11 +5161,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -5253,14 +5253,14 @@ Windows 8.1 Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN 8.1 Blink Blink (Chrome, Opera) Chrome 32.0 Chrome - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png CH 32.0 0 @@ -5292,11 +5292,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -5384,14 +5384,14 @@ GALAXY Note 3 Android 4.3 Android - plugins/DevicesDetection/images/os/AND.png + plugins/Morpheus/icons/dist/os/AND.png AND 4.3 WebKit WebKit (Safari, Chrome) QQ Browser 5.0 QQ Browser - plugins/DevicesDetection/images/browsers/QQ.png + plugins/Morpheus/icons/dist/browsers/QQ.png QQ 5.0 0 @@ -5423,11 +5423,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml index ec75eaf279..cc96799a61 100644 --- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml @@ -10,6 +10,6 @@ 1 2 operatingSystemCode==WXP;operatingSystemVersion==XP - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml index 8b3a825d75..f1426e40f6 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -58,14 +58,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -93,11 +93,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -171,14 +171,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -206,11 +206,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -362,14 +362,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 6 @@ -397,11 +397,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -475,14 +475,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -510,11 +510,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -879,14 +879,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 14 @@ -914,11 +914,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -992,14 +992,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -1027,7 +1027,7 @@ director - plugins/DevicePlugins/images/plugins/director.png + plugins/Morpheus/icons/dist/plugins/director.png director @@ -1101,14 +1101,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -1136,7 +1136,7 @@ director - plugins/DevicePlugins/images/plugins/director.png + plugins/Morpheus/icons/dist/plugins/director.png director @@ -1288,14 +1288,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 6 @@ -1323,7 +1323,7 @@ director - plugins/DevicePlugins/images/plugins/director.png + plugins/Morpheus/icons/dist/plugins/director.png director @@ -1397,14 +1397,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -1432,7 +1432,7 @@ director - plugins/DevicePlugins/images/plugins/director.png + plugins/Morpheus/icons/dist/plugins/director.png director @@ -1746,14 +1746,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 13 @@ -1781,7 +1781,7 @@ director - plugins/DevicePlugins/images/plugins/director.png + plugins/Morpheus/icons/dist/plugins/director.png director diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml index 2a30c29c88..3327e3002e 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -58,14 +58,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -93,7 +93,7 @@ director - plugins/DevicePlugins/images/plugins/director.png + plugins/Morpheus/icons/dist/plugins/director.png director @@ -167,14 +167,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -202,7 +202,7 @@ director - plugins/DevicePlugins/images/plugins/director.png + plugins/Morpheus/icons/dist/plugins/director.png director @@ -354,14 +354,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 6 @@ -389,7 +389,7 @@ director - plugins/DevicePlugins/images/plugins/director.png + plugins/Morpheus/icons/dist/plugins/director.png director @@ -463,14 +463,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -498,7 +498,7 @@ director - plugins/DevicePlugins/images/plugins/director.png + plugins/Morpheus/icons/dist/plugins/director.png director @@ -812,14 +812,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 13 @@ -847,7 +847,7 @@ director - plugins/DevicePlugins/images/plugins/director.png + plugins/Morpheus/icons/dist/plugins/director.png director @@ -921,14 +921,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -956,11 +956,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -1034,14 +1034,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -1069,11 +1069,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -1225,14 +1225,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 6 @@ -1260,11 +1260,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -1338,14 +1338,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -1373,11 +1373,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -1742,14 +1742,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 14 @@ -1777,11 +1777,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml index ede776e224..94a694cef6 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml @@ -4,60 +4,60 @@ 2 6% - plugins/DevicePlugins/images/plugins/cookie.png + plugins/Morpheus/icons/dist/plugins/cookie.png 2 6% - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png 2 6% - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png 1 3% - plugins/DevicePlugins/images/plugins/director.png + plugins/Morpheus/icons/dist/plugins/director.png 1 3% - plugins/DevicePlugins/images/plugins/gears.png + plugins/Morpheus/icons/dist/plugins/gears.png 1 3% - plugins/DevicePlugins/images/plugins/pdf.png + plugins/Morpheus/icons/dist/plugins/pdf.png 1 3% - plugins/DevicePlugins/images/plugins/windowsmedia.png + plugins/Morpheus/icons/dist/plugins/windowsmedia.png 0 0% - plugins/DevicePlugins/images/plugins/quicktime.png + plugins/Morpheus/icons/dist/plugins/quicktime.png 0 0% - plugins/DevicePlugins/images/plugins/realplayer.png + plugins/Morpheus/icons/dist/plugins/realplayer.png 0 0% - plugins/DevicePlugins/images/plugins/silverlight.png + plugins/Morpheus/icons/dist/plugins/silverlight.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml index 9abb2c8121..e053d47f03 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml @@ -10,7 +10,7 @@ 10 8 2 - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png @@ -22,7 +22,7 @@ 8 8 0 - plugins/DevicesDetection/images/browsers/IE.png + plugins/Morpheus/icons/dist/browsers/IE.png @@ -34,7 +34,7 @@ 5 6 0 - plugins/DevicesDetection/images/browsers/RM.png + plugins/Morpheus/icons/dist/browsers/RM.png @@ -46,7 +46,7 @@ 5 5 0 - plugins/DevicesDetection/images/browsers/EP.png + plugins/Morpheus/icons/dist/browsers/EP.png @@ -58,7 +58,7 @@ 2 5 0 - plugins/DevicesDetection/images/browsers/UNK.png + plugins/Morpheus/icons/dist/browsers/UNK.png @@ -70,7 +70,7 @@ 2 2 0 - plugins/DevicesDetection/images/browsers/AN.png + plugins/Morpheus/icons/dist/browsers/AN.png @@ -82,7 +82,7 @@ 2 2 0 - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png @@ -94,6 +94,6 @@ 1 1 1 - plugins/DevicesDetection/images/browsers/CM.png + plugins/Morpheus/icons/dist/browsers/CM.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml index c0c93c6084..08c57eeae0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml @@ -11,7 +11,7 @@ 6 0 browserCode==RM;browserVersion==0.9 - plugins/DevicesDetection/images/browsers/RM.png + plugins/Morpheus/icons/dist/browsers/RM.png @@ -24,7 +24,7 @@ 5 0 browserCode==EP;browserVersion==2.30 - plugins/DevicesDetection/images/browsers/EP.png + plugins/Morpheus/icons/dist/browsers/EP.png @@ -37,7 +37,7 @@ 5 0 browserCode==IE;browserVersion==9.0 - plugins/DevicesDetection/images/browsers/IE.png + plugins/Morpheus/icons/dist/browsers/IE.png @@ -50,7 +50,7 @@ 4 0 browserCode==UNK;browserVersion== - plugins/DevicesDetection/images/browsers/UNK.png + plugins/Morpheus/icons/dist/browsers/UNK.png @@ -63,7 +63,7 @@ 1 1 browserCode==CH;browserVersion==37.0 - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png @@ -76,7 +76,7 @@ 2 0 browserCode==AN;browserVersion== - plugins/DevicesDetection/images/browsers/AN.png + plugins/Morpheus/icons/dist/browsers/AN.png @@ -89,7 +89,7 @@ 2 0 browserCode==CH;browserVersion==19.0 - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png @@ -102,7 +102,7 @@ 2 1 browserCode==CH;browserVersion==20.0 - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png @@ -115,7 +115,7 @@ 2 0 browserCode==FF;browserVersion==6.0 - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png @@ -128,7 +128,7 @@ 1 0 browserCode==CH;browserVersion==11.0 - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png @@ -141,7 +141,7 @@ 1 0 browserCode==CH;browserVersion==39.0 - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png @@ -154,7 +154,7 @@ 1 0 browserCode==CH;browserVersion==41.0 - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png @@ -167,7 +167,7 @@ 1 1 browserCode==CM;browserVersion==39.0 - plugins/DevicesDetection/images/browsers/CM.png + plugins/Morpheus/icons/dist/browsers/CM.png @@ -180,7 +180,7 @@ 1 0 browserCode==IE;browserVersion==5.0 - plugins/DevicesDetection/images/browsers/IE.png + plugins/Morpheus/icons/dist/browsers/IE.png @@ -193,7 +193,7 @@ 1 0 browserCode==IE;browserVersion==6.0 - plugins/DevicesDetection/images/browsers/IE.png + plugins/Morpheus/icons/dist/browsers/IE.png @@ -206,7 +206,7 @@ 1 0 browserCode==IE;browserVersion==8.0 - plugins/DevicesDetection/images/browsers/IE.png + plugins/Morpheus/icons/dist/browsers/IE.png @@ -219,6 +219,6 @@ 1 0 browserCode==UNK;browserVersion==1.0 - plugins/DevicesDetection/images/browsers/UNK.png + plugins/Morpheus/icons/dist/browsers/UNK.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml index 69929893e9..912ac1bc8b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml @@ -10,7 +10,7 @@ 10 8 2 - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png browserCode==CH @@ -23,7 +23,7 @@ 8 8 0 - plugins/DevicesDetection/images/browsers/IE.png + plugins/Morpheus/icons/dist/browsers/IE.png browserCode==IE @@ -36,7 +36,7 @@ 5 6 0 - plugins/DevicesDetection/images/browsers/RM.png + plugins/Morpheus/icons/dist/browsers/RM.png browserCode==RM @@ -49,7 +49,7 @@ 5 5 0 - plugins/DevicesDetection/images/browsers/EP.png + plugins/Morpheus/icons/dist/browsers/EP.png browserCode==EP @@ -62,7 +62,7 @@ 2 5 0 - plugins/DevicesDetection/images/browsers/UNK.png + plugins/Morpheus/icons/dist/browsers/UNK.png browserCode==UNK @@ -75,7 +75,7 @@ 2 2 0 - plugins/DevicesDetection/images/browsers/AN.png + plugins/Morpheus/icons/dist/browsers/AN.png browserCode==AN @@ -88,7 +88,7 @@ 2 2 0 - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png browserCode==FF @@ -101,7 +101,7 @@ 1 1 1 - plugins/DevicesDetection/images/browsers/CM.png + plugins/Morpheus/icons/dist/browsers/CM.png browserCode==CM \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml index a605a1c734..10b83b8800 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml @@ -10,7 +10,7 @@ 11 10 1 - plugins/DevicesDetection/images/os/MAC.png + plugins/Morpheus/icons/dist/os/MAC.png @@ -22,7 +22,7 @@ 11 11 1 - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png @@ -34,7 +34,7 @@ 8 8 0 - plugins/DevicesDetection/images/os/LIN.png + plugins/Morpheus/icons/dist/os/LIN.png @@ -46,7 +46,7 @@ 3 3 1 - plugins/DevicesDetection/images/os/AND.png + plugins/Morpheus/icons/dist/os/AND.png @@ -58,7 +58,7 @@ 0 3 0 - plugins/DevicesDetection/images/os/UNK.png + plugins/Morpheus/icons/dist/os/UNK.png @@ -70,7 +70,7 @@ 1 1 0 - plugins/DevicesDetection/images/os/UNK.png + plugins/Morpheus/icons/dist/os/UNK.png @@ -82,6 +82,6 @@ 1 1 0 - plugins/DevicesDetection/images/os/IOS.png + plugins/Morpheus/icons/dist/os/IOS.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml index a648a6436a..d0f8f30c53 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml @@ -11,7 +11,7 @@ 8 0 operatingSystemCode==LIN;operatingSystemVersion== - plugins/DevicesDetection/images/os/LIN.png + plugins/Morpheus/icons/dist/os/LIN.png @@ -24,7 +24,7 @@ 7 1 operatingSystemCode==WIN;operatingSystemVersion==7 - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png @@ -37,7 +37,7 @@ 6 0 operatingSystemCode==MAC;operatingSystemVersion==10.6 - plugins/DevicesDetection/images/os/MAC.png + plugins/Morpheus/icons/dist/os/MAC.png @@ -50,7 +50,7 @@ 2 1 operatingSystemCode==MAC;operatingSystemVersion==10.10 - plugins/DevicesDetection/images/os/MAC.png + plugins/Morpheus/icons/dist/os/MAC.png @@ -63,7 +63,7 @@ 3 0 operatingSystemCode==UNK;operatingSystemVersion==UNK - plugins/DevicesDetection/images/os/UNK.png + plugins/Morpheus/icons/dist/os/UNK.png @@ -76,7 +76,7 @@ 3 0 operatingSystemCode==WIN;operatingSystemVersion==XP - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png @@ -89,7 +89,7 @@ 2 0 operatingSystemCode==AND;operatingSystemVersion==2.3 - plugins/DevicesDetection/images/os/AND.png + plugins/Morpheus/icons/dist/os/AND.png @@ -102,7 +102,7 @@ 1 1 operatingSystemCode==AND;operatingSystemVersion==4.4 - plugins/DevicesDetection/images/os/AND.png + plugins/Morpheus/icons/dist/os/AND.png @@ -115,7 +115,7 @@ 1 0 operatingSystemCode==BOT;operatingSystemVersion==UNK - plugins/DevicesDetection/images/os/UNK.png + plugins/Morpheus/icons/dist/os/UNK.png @@ -128,7 +128,7 @@ 1 0 operatingSystemCode==IOS;operatingSystemVersion==7.1 - plugins/DevicesDetection/images/os/IOS.png + plugins/Morpheus/icons/dist/os/IOS.png @@ -141,7 +141,7 @@ 1 0 operatingSystemCode==MAC;operatingSystemVersion== - plugins/DevicesDetection/images/os/MAC.png + plugins/Morpheus/icons/dist/os/MAC.png @@ -154,7 +154,7 @@ 1 0 operatingSystemCode==MAC;operatingSystemVersion==10.8 - plugins/DevicesDetection/images/os/MAC.png + plugins/Morpheus/icons/dist/os/MAC.png @@ -167,6 +167,6 @@ 1 0 operatingSystemCode==WIN;operatingSystemVersion== - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png \ No newline at end of file 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 8b4b94a0fd..a41bee8bd7 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -76,14 +76,14 @@ Windows 8.1 Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN 8.1 Blink Blink (Chrome, Opera) Chrome 33.0 Chrome - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png CH 33.0 0 @@ -111,15 +111,15 @@ pdf, flash, java - plugins/DevicePlugins/images/plugins/pdf.png + plugins/Morpheus/icons/dist/plugins/pdf.png pdf - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -228,14 +228,14 @@ Windows 7 Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN 7 Trident Trident (IE) Internet Explorer 8.0 Internet Explorer - plugins/DevicesDetection/images/browsers/IE.png + plugins/Morpheus/icons/dist/browsers/IE.png IE 8.0 0 @@ -350,14 +350,14 @@ Windows 7 Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN 7 Blink Blink (Chrome, Opera) Chrome 34.0 Chrome - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png CH 34.0 0 @@ -389,23 +389,23 @@ pdf, flash, java, quicktime, silverlight - plugins/DevicePlugins/images/plugins/pdf.png + plugins/Morpheus/icons/dist/plugins/pdf.png pdf - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java - plugins/DevicePlugins/images/plugins/quicktime.png + plugins/Morpheus/icons/dist/plugins/quicktime.png quicktime - plugins/DevicePlugins/images/plugins/silverlight.png + plugins/Morpheus/icons/dist/plugins/silverlight.png silverlight @@ -505,7 +505,7 @@ 1 http://piwik.org/faq/general/#faq_144 http://google.com - plugins/Referrers/images/searchEngines/google.com.png + plugins/Morpheus/icons/dist/searchEngines/google.com.png Unknown Desktop @@ -514,14 +514,14 @@ Mac 10.9 Mac - plugins/DevicesDetection/images/os/MAC.png + plugins/Morpheus/icons/dist/os/MAC.png MAC 10.9 WebKit WebKit (Safari, Chrome) Safari 7.0 Safari - plugins/DevicesDetection/images/browsers/SF.png + plugins/Morpheus/icons/dist/browsers/SF.png SF 7.0 0 @@ -549,19 +549,19 @@ pdf, flash, java, quicktime - plugins/DevicePlugins/images/plugins/pdf.png + plugins/Morpheus/icons/dist/plugins/pdf.png pdf - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java - plugins/DevicePlugins/images/plugins/quicktime.png + plugins/Morpheus/icons/dist/plugins/quicktime.png quicktime @@ -640,14 +640,14 @@ Windows 7 Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN 7 Blink Blink (Chrome, Opera) Chrome 33.0 Chrome - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png CH 33.0 0 @@ -675,19 +675,19 @@ pdf, flash, java, silverlight - plugins/DevicePlugins/images/plugins/pdf.png + plugins/Morpheus/icons/dist/plugins/pdf.png pdf - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java - plugins/DevicePlugins/images/plugins/silverlight.png + plugins/Morpheus/icons/dist/plugins/silverlight.png silverlight @@ -770,7 +770,7 @@ http://piwik.org/faq/general/#faq_144 http://google.com - plugins/Referrers/images/searchEngines/google.com.png + plugins/Morpheus/icons/dist/searchEngines/google.com.png Unknown Desktop @@ -779,14 +779,14 @@ Mac 10.9 Mac - plugins/DevicesDetection/images/os/MAC.png + plugins/Morpheus/icons/dist/os/MAC.png MAC 10.9 Blink Blink (Chrome, Opera) Chrome 33.0 Chrome - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png CH 33.0 0 @@ -814,27 +814,27 @@ pdf, flash, java, quicktime, windowsmedia, silverlight - plugins/DevicePlugins/images/plugins/pdf.png + plugins/Morpheus/icons/dist/plugins/pdf.png pdf - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java - plugins/DevicePlugins/images/plugins/quicktime.png + plugins/Morpheus/icons/dist/plugins/quicktime.png quicktime - plugins/DevicePlugins/images/plugins/windowsmedia.png + plugins/Morpheus/icons/dist/plugins/windowsmedia.png windowsmedia - plugins/DevicePlugins/images/plugins/silverlight.png + plugins/Morpheus/icons/dist/plugins/silverlight.png silverlight @@ -915,7 +915,7 @@ 2 http://piwik.org/faq/general/#faq_144 http://google.com - plugins/Referrers/images/searchEngines/google.com.png + plugins/Morpheus/icons/dist/searchEngines/google.com.png Unknown Desktop @@ -924,14 +924,14 @@ Mac 10.9 Mac - plugins/DevicesDetection/images/os/MAC.png + plugins/Morpheus/icons/dist/os/MAC.png MAC 10.9 WebKit WebKit (Safari, Chrome) Safari 7.0 Safari - plugins/DevicesDetection/images/browsers/SF.png + plugins/Morpheus/icons/dist/browsers/SF.png SF 7.0 0 @@ -959,15 +959,15 @@ pdf, java, quicktime - plugins/DevicePlugins/images/plugins/pdf.png + plugins/Morpheus/icons/dist/plugins/pdf.png pdf - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java - plugins/DevicePlugins/images/plugins/quicktime.png + plugins/Morpheus/icons/dist/plugins/quicktime.png quicktime @@ -1059,14 +1059,14 @@ Android Android - plugins/DevicesDetection/images/os/AND.png + plugins/Morpheus/icons/dist/os/AND.png AND Gecko Gecko (Firefox) Firefox 27.0 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 27.0 0 @@ -1094,7 +1094,7 @@ flash - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash @@ -1186,14 +1186,14 @@ Windows 7 Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN 7 Gecko Gecko (Firefox) Firefox 27.0 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 27.0 0 @@ -1221,27 +1221,27 @@ pdf, flash, java, quicktime, windowsmedia, silverlight - plugins/DevicePlugins/images/plugins/pdf.png + plugins/Morpheus/icons/dist/plugins/pdf.png pdf - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java - plugins/DevicePlugins/images/plugins/quicktime.png + plugins/Morpheus/icons/dist/plugins/quicktime.png quicktime - plugins/DevicePlugins/images/plugins/windowsmedia.png + plugins/Morpheus/icons/dist/plugins/windowsmedia.png windowsmedia - plugins/DevicePlugins/images/plugins/silverlight.png + plugins/Morpheus/icons/dist/plugins/silverlight.png silverlight @@ -1364,7 +1364,7 @@ 1 http://piwik.org/faq/general/#faq_144 http://google.com - plugins/Referrers/images/searchEngines/google.com.png + plugins/Morpheus/icons/dist/searchEngines/google.com.png Unknown Desktop @@ -1373,14 +1373,14 @@ Windows 8 Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN 8 Gecko Gecko (Firefox) Firefox 27.0 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 27.0 0 @@ -1408,11 +1408,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -1504,14 +1504,14 @@ Windows 7 Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN 7 Blink Blink (Chrome, Opera) Chrome 33.0 Chrome - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png CH 33.0 0 @@ -1539,19 +1539,19 @@ pdf, flash, java, silverlight - plugins/DevicePlugins/images/plugins/pdf.png + plugins/Morpheus/icons/dist/plugins/pdf.png pdf - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java - plugins/DevicePlugins/images/plugins/silverlight.png + plugins/Morpheus/icons/dist/plugins/silverlight.png silverlight @@ -1643,14 +1643,14 @@ Windows 7 Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN 7 Blink Blink (Chrome, Opera) Chrome 33.0 Chrome - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png CH 33.0 0 @@ -1678,19 +1678,19 @@ pdf, flash, java, silverlight - plugins/DevicePlugins/images/plugins/pdf.png + plugins/Morpheus/icons/dist/plugins/pdf.png pdf - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java - plugins/DevicePlugins/images/plugins/silverlight.png + plugins/Morpheus/icons/dist/plugins/silverlight.png silverlight @@ -1971,14 +1971,14 @@ Unknown Unknown - plugins/DevicesDetection/images/os/UNK.png + plugins/Morpheus/icons/dist/os/UNK.png UNK UNK Unknown Unknown Unknown - plugins/DevicesDetection/images/browsers/UNK.png + plugins/Morpheus/icons/dist/browsers/UNK.png UNK 0 @@ -2089,14 +2089,14 @@ Mac Mac - plugins/DevicesDetection/images/os/MAC.png + plugins/Morpheus/icons/dist/os/MAC.png MAC Trident Trident (IE) Internet Explorer 5.0 Internet Explorer - plugins/DevicesDetection/images/browsers/IE.png + plugins/Morpheus/icons/dist/browsers/IE.png IE 5.0 0 @@ -2224,14 +2224,14 @@ Windows Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN Trident Trident (IE) Internet Explorer 8.0 Internet Explorer - plugins/DevicesDetection/images/browsers/IE.png + plugins/Morpheus/icons/dist/browsers/IE.png IE 8.0 0 @@ -2350,14 +2350,14 @@ Mac 10.10 Mac - plugins/DevicesDetection/images/os/MAC.png + plugins/Morpheus/icons/dist/os/MAC.png MAC 10.10 Blink Blink (Chrome, Opera) Chrome 37.0 Chrome - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png CH 37.0 0 @@ -2520,14 +2520,14 @@ GALAXY S5 Android 4.4 Android - plugins/DevicesDetection/images/os/AND.png + plugins/Morpheus/icons/dist/os/AND.png AND 4.4 Blink Blink (Chrome, Opera) Chrome Mobile 39.0 Chrome Mobile - plugins/DevicesDetection/images/browsers/CM.png + plugins/Morpheus/icons/dist/browsers/CM.png CM 39.0 0 @@ -2642,14 +2642,14 @@ Mac 10.10 Mac - plugins/DevicesDetection/images/os/MAC.png + plugins/Morpheus/icons/dist/os/MAC.png MAC 10.10 Blink Blink (Chrome, Opera) Chrome 37.0 Chrome - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png CH 37.0 0 @@ -2789,14 +2789,14 @@ Mac 10.10 Mac - plugins/DevicesDetection/images/os/MAC.png + plugins/Morpheus/icons/dist/os/MAC.png MAC 10.10 Blink Blink (Chrome, Opera) Chrome 37.0 Chrome - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png CH 37.0 0 @@ -2913,14 +2913,14 @@ Mac 10.10 Mac - plugins/DevicesDetection/images/os/MAC.png + plugins/Morpheus/icons/dist/os/MAC.png MAC 10.10 Blink Blink (Chrome, Opera) Chrome 41.0 Chrome - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png CH 41.0 0 @@ -3041,14 +3041,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Trident Trident (IE) Internet Explorer 6.0 Internet Explorer - plugins/DevicesDetection/images/browsers/IE.png + plugins/Morpheus/icons/dist/browsers/IE.png IE 6.0 0 @@ -3076,11 +3076,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -3170,14 +3170,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP WebKit WebKit (Safari, Chrome) Chrome 11.0 Chrome - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png CH 11.0 0 @@ -3205,27 +3205,27 @@ pdf, flash, java, director, windowsmedia, gears - plugins/DevicePlugins/images/plugins/pdf.png + plugins/Morpheus/icons/dist/plugins/pdf.png pdf - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java - plugins/DevicePlugins/images/plugins/director.png + plugins/Morpheus/icons/dist/plugins/director.png director - plugins/DevicePlugins/images/plugins/windowsmedia.png + plugins/Morpheus/icons/dist/plugins/windowsmedia.png windowsmedia - plugins/DevicePlugins/images/plugins/gears.png + plugins/Morpheus/icons/dist/plugins/gears.png gears @@ -3317,14 +3317,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Blink Blink (Chrome, Opera) Chrome 39.0 Chrome - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png CH 39.0 0 @@ -3435,14 +3435,14 @@ iPhone iOS 7.1 iOS - plugins/DevicesDetection/images/os/IOS.png + plugins/Morpheus/icons/dist/os/IOS.png IOS 7.1 Unknown Unknown Unknown - plugins/DevicesDetection/images/browsers/UNK.png + plugins/Morpheus/icons/dist/browsers/UNK.png UNK 1.0 0 @@ -3542,14 +3542,14 @@ Unknown Unknown - plugins/DevicesDetection/images/os/UNK.png + plugins/Morpheus/icons/dist/os/UNK.png UNK UNK Unknown Unknown Unknown - plugins/DevicesDetection/images/browsers/UNK.png + plugins/Morpheus/icons/dist/browsers/UNK.png UNK 1 @@ -3648,14 +3648,14 @@ Unknown Unknown - plugins/DevicesDetection/images/os/UNK.png + plugins/Morpheus/icons/dist/os/UNK.png UNK UNK Unknown Unknown Unknown - plugins/DevicesDetection/images/browsers/UNK.png + plugins/Morpheus/icons/dist/browsers/UNK.png UNK 1 @@ -3764,14 +3764,14 @@ Mac 10.6 Mac - plugins/DevicesDetection/images/os/MAC.png + plugins/Morpheus/icons/dist/os/MAC.png MAC 10.6 WebKit WebKit (Safari, Chrome) RockMelt 0.9 RockMelt - plugins/DevicesDetection/images/browsers/RM.png + plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 0 @@ -3884,14 +3884,14 @@ Mac 10.6 Mac - plugins/DevicesDetection/images/os/MAC.png + plugins/Morpheus/icons/dist/os/MAC.png MAC 10.6 WebKit WebKit (Safari, Chrome) RockMelt 0.9 RockMelt - plugins/DevicesDetection/images/browsers/RM.png + plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 0 @@ -4023,14 +4023,14 @@ Mac 10.6 Mac - plugins/DevicesDetection/images/os/MAC.png + plugins/Morpheus/icons/dist/os/MAC.png MAC 10.6 WebKit WebKit (Safari, Chrome) RockMelt 0.9 RockMelt - plugins/DevicesDetection/images/browsers/RM.png + plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 0 @@ -4170,14 +4170,14 @@ Mac 10.6 Mac - plugins/DevicesDetection/images/os/MAC.png + plugins/Morpheus/icons/dist/os/MAC.png MAC 10.6 WebKit WebKit (Safari, Chrome) RockMelt 0.9 RockMelt - plugins/DevicesDetection/images/browsers/RM.png + plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 0 @@ -4290,14 +4290,14 @@ Bot Bot - plugins/DevicesDetection/images/os/UNK.png + plugins/Morpheus/icons/dist/os/UNK.png BOT UNK Unknown Unknown Unknown - plugins/DevicesDetection/images/browsers/UNK.png + plugins/Morpheus/icons/dist/browsers/UNK.png UNK 0 @@ -4410,14 +4410,14 @@ Windows 7 Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN 7 Trident Trident (IE) Internet Explorer 9.0 Internet Explorer - plugins/DevicesDetection/images/browsers/IE.png + plugins/Morpheus/icons/dist/browsers/IE.png IE 9.0 0 @@ -4519,14 +4519,14 @@ Unknown Unknown - plugins/DevicesDetection/images/os/UNK.png + plugins/Morpheus/icons/dist/os/UNK.png UNK UNK Unknown Unknown Unknown - plugins/DevicesDetection/images/browsers/UNK.png + plugins/Morpheus/icons/dist/browsers/UNK.png UNK 0 @@ -4639,14 +4639,14 @@ Vision Android 2.3 Android - plugins/DevicesDetection/images/os/AND.png + plugins/Morpheus/icons/dist/os/AND.png AND 2.3 WebKit WebKit (Safari, Chrome) Android Browser Android Browser - plugins/DevicesDetection/images/browsers/AN.png + plugins/Morpheus/icons/dist/browsers/AN.png AN 0 @@ -4759,14 +4759,14 @@ Mac 10.6 Mac - plugins/DevicesDetection/images/os/MAC.png + plugins/Morpheus/icons/dist/os/MAC.png MAC 10.6 WebKit WebKit (Safari, Chrome) RockMelt 0.9 RockMelt - plugins/DevicesDetection/images/browsers/RM.png + plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 0 @@ -4879,14 +4879,14 @@ Windows 7 Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN 7 WebKit WebKit (Safari, Chrome) Chrome 20.0 Chrome - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png CH 20.0 0 @@ -4995,14 +4995,14 @@ GNU/Linux GNU/Linux - plugins/DevicesDetection/images/os/LIN.png + plugins/Morpheus/icons/dist/os/LIN.png LIN WebKit WebKit (Safari, Chrome) Epiphany 2.30 Epiphany - plugins/DevicesDetection/images/browsers/EP.png + plugins/Morpheus/icons/dist/browsers/EP.png EP 2.30 0 @@ -5111,14 +5111,14 @@ Windows 7 Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN 7 WebKit WebKit (Safari, Chrome) Chrome 20.0 Chrome - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png CH 20.0 0 @@ -5227,14 +5227,14 @@ GNU/Linux GNU/Linux - plugins/DevicesDetection/images/os/LIN.png + plugins/Morpheus/icons/dist/os/LIN.png LIN WebKit WebKit (Safari, Chrome) Epiphany 2.30 Epiphany - plugins/DevicesDetection/images/browsers/EP.png + plugins/Morpheus/icons/dist/browsers/EP.png EP 2.30 0 @@ -5343,14 +5343,14 @@ Windows 7 Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN 7 Trident Trident (IE) Internet Explorer 9.0 Internet Explorer - plugins/DevicesDetection/images/browsers/IE.png + plugins/Morpheus/icons/dist/browsers/IE.png IE 9.0 0 @@ -5459,14 +5459,14 @@ GNU/Linux GNU/Linux - plugins/DevicesDetection/images/os/LIN.png + plugins/Morpheus/icons/dist/os/LIN.png LIN WebKit WebKit (Safari, Chrome) Epiphany 2.30 Epiphany - plugins/DevicesDetection/images/browsers/EP.png + plugins/Morpheus/icons/dist/browsers/EP.png EP 2.30 0 @@ -5575,14 +5575,14 @@ Windows 7 Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN 7 Trident Trident (IE) Internet Explorer 9.0 Internet Explorer - plugins/DevicesDetection/images/browsers/IE.png + plugins/Morpheus/icons/dist/browsers/IE.png IE 9.0 0 @@ -5691,14 +5691,14 @@ Windows 7 Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN 7 Trident Trident (IE) Internet Explorer 9.0 Internet Explorer - plugins/DevicesDetection/images/browsers/IE.png + plugins/Morpheus/icons/dist/browsers/IE.png IE 9.0 0 @@ -5807,14 +5807,14 @@ Mac 10.8 Mac - plugins/DevicesDetection/images/os/MAC.png + plugins/Morpheus/icons/dist/os/MAC.png MAC 10.8 WebKit WebKit (Safari, Chrome) Chrome 19.0 Chrome - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png CH 19.0 0 @@ -5923,14 +5923,14 @@ GNU/Linux GNU/Linux - plugins/DevicesDetection/images/os/LIN.png + plugins/Morpheus/icons/dist/os/LIN.png LIN Gecko Gecko (Firefox) Firefox 6.0 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 6.0 0 @@ -6039,14 +6039,14 @@ GNU/Linux GNU/Linux - plugins/DevicesDetection/images/os/LIN.png + plugins/Morpheus/icons/dist/os/LIN.png LIN WebKit WebKit (Safari, Chrome) Chrome 19.0 Chrome - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png CH 19.0 0 @@ -6155,14 +6155,14 @@ GNU/Linux GNU/Linux - plugins/DevicesDetection/images/os/LIN.png + plugins/Morpheus/icons/dist/os/LIN.png LIN WebKit WebKit (Safari, Chrome) Epiphany 2.30 Epiphany - plugins/DevicesDetection/images/browsers/EP.png + plugins/Morpheus/icons/dist/browsers/EP.png EP 2.30 0 @@ -6271,14 +6271,14 @@ Windows 7 Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN 7 Trident Trident (IE) Internet Explorer 9.0 Internet Explorer - plugins/DevicesDetection/images/browsers/IE.png + plugins/Morpheus/icons/dist/browsers/IE.png IE 9.0 0 @@ -6387,14 +6387,14 @@ GNU/Linux GNU/Linux - plugins/DevicesDetection/images/os/LIN.png + plugins/Morpheus/icons/dist/os/LIN.png LIN Gecko Gecko (Firefox) Firefox 6.0 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 6.0 0 @@ -6503,14 +6503,14 @@ GNU/Linux GNU/Linux - plugins/DevicesDetection/images/os/LIN.png + plugins/Morpheus/icons/dist/os/LIN.png LIN WebKit WebKit (Safari, Chrome) Epiphany 2.30 Epiphany - plugins/DevicesDetection/images/browsers/EP.png + plugins/Morpheus/icons/dist/browsers/EP.png EP 2.30 0 @@ -6619,14 +6619,14 @@ Vision Android 2.3 Android - plugins/DevicesDetection/images/os/AND.png + plugins/Morpheus/icons/dist/os/AND.png AND 2.3 WebKit WebKit (Safari, Chrome) Android Browser Android Browser - plugins/DevicesDetection/images/browsers/AN.png + plugins/Morpheus/icons/dist/browsers/AN.png AN 0 @@ -6735,14 +6735,14 @@ Mac 10.6 Mac - plugins/DevicesDetection/images/os/MAC.png + plugins/Morpheus/icons/dist/os/MAC.png MAC 10.6 WebKit WebKit (Safari, Chrome) RockMelt 0.9 RockMelt - plugins/DevicesDetection/images/browsers/RM.png + plugins/Morpheus/icons/dist/browsers/RM.png RM 0.9 0 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml index 072b65b52a..6e91c71915 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml @@ -65,14 +65,14 @@ Windows 8.1 Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN 8.1 Blink Blink (Chrome, Opera) Chrome 33.0 Chrome - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png CH 33.0 0 @@ -100,15 +100,15 @@ pdf, flash, java - plugins/DevicePlugins/images/plugins/pdf.png + plugins/Morpheus/icons/dist/plugins/pdf.png pdf - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -206,14 +206,14 @@ Windows 7 Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN 7 Trident Trident (IE) Internet Explorer 8.0 Internet Explorer - plugins/DevicesDetection/images/browsers/IE.png + plugins/Morpheus/icons/dist/browsers/IE.png IE 8.0 0 @@ -317,14 +317,14 @@ Windows 7 Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN 7 Blink Blink (Chrome, Opera) Chrome 34.0 Chrome - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png CH 34.0 0 @@ -356,23 +356,23 @@ pdf, flash, java, quicktime, silverlight - plugins/DevicePlugins/images/plugins/pdf.png + plugins/Morpheus/icons/dist/plugins/pdf.png pdf - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java - plugins/DevicePlugins/images/plugins/quicktime.png + plugins/Morpheus/icons/dist/plugins/quicktime.png quicktime - plugins/DevicePlugins/images/plugins/silverlight.png + plugins/Morpheus/icons/dist/plugins/silverlight.png silverlight @@ -461,7 +461,7 @@ 1 http://piwik.org/faq/general/#faq_144 http://google.com - plugins/Referrers/images/searchEngines/google.com.png + plugins/Morpheus/icons/dist/searchEngines/google.com.png Unknown Desktop @@ -470,14 +470,14 @@ Mac 10.9 Mac - plugins/DevicesDetection/images/os/MAC.png + plugins/Morpheus/icons/dist/os/MAC.png MAC 10.9 WebKit WebKit (Safari, Chrome) Safari 7.0 Safari - plugins/DevicesDetection/images/browsers/SF.png + plugins/Morpheus/icons/dist/browsers/SF.png SF 7.0 0 @@ -505,19 +505,19 @@ pdf, flash, java, quicktime - plugins/DevicePlugins/images/plugins/pdf.png + plugins/Morpheus/icons/dist/plugins/pdf.png pdf - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java - plugins/DevicePlugins/images/plugins/quicktime.png + plugins/Morpheus/icons/dist/plugins/quicktime.png quicktime @@ -596,14 +596,14 @@ Windows 7 Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN 7 Blink Blink (Chrome, Opera) Chrome 33.0 Chrome - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png CH 33.0 0 @@ -631,19 +631,19 @@ pdf, flash, java, silverlight - plugins/DevicePlugins/images/plugins/pdf.png + plugins/Morpheus/icons/dist/plugins/pdf.png pdf - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java - plugins/DevicePlugins/images/plugins/silverlight.png + plugins/Morpheus/icons/dist/plugins/silverlight.png silverlight @@ -715,7 +715,7 @@ http://piwik.org/faq/general/#faq_144 http://google.com - plugins/Referrers/images/searchEngines/google.com.png + plugins/Morpheus/icons/dist/searchEngines/google.com.png Unknown Desktop @@ -724,14 +724,14 @@ Mac 10.9 Mac - plugins/DevicesDetection/images/os/MAC.png + plugins/Morpheus/icons/dist/os/MAC.png MAC 10.9 Blink Blink (Chrome, Opera) Chrome 33.0 Chrome - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png CH 33.0 0 @@ -759,27 +759,27 @@ pdf, flash, java, quicktime, windowsmedia, silverlight - plugins/DevicePlugins/images/plugins/pdf.png + plugins/Morpheus/icons/dist/plugins/pdf.png pdf - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java - plugins/DevicePlugins/images/plugins/quicktime.png + plugins/Morpheus/icons/dist/plugins/quicktime.png quicktime - plugins/DevicePlugins/images/plugins/windowsmedia.png + plugins/Morpheus/icons/dist/plugins/windowsmedia.png windowsmedia - plugins/DevicePlugins/images/plugins/silverlight.png + plugins/Morpheus/icons/dist/plugins/silverlight.png silverlight @@ -849,7 +849,7 @@ 2 http://piwik.org/faq/general/#faq_144 http://google.com - plugins/Referrers/images/searchEngines/google.com.png + plugins/Morpheus/icons/dist/searchEngines/google.com.png Unknown Desktop @@ -858,14 +858,14 @@ Mac 10.9 Mac - plugins/DevicesDetection/images/os/MAC.png + plugins/Morpheus/icons/dist/os/MAC.png MAC 10.9 WebKit WebKit (Safari, Chrome) Safari 7.0 Safari - plugins/DevicesDetection/images/browsers/SF.png + plugins/Morpheus/icons/dist/browsers/SF.png SF 7.0 0 @@ -893,15 +893,15 @@ pdf, java, quicktime - plugins/DevicePlugins/images/plugins/pdf.png + plugins/Morpheus/icons/dist/plugins/pdf.png pdf - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java - plugins/DevicePlugins/images/plugins/quicktime.png + plugins/Morpheus/icons/dist/plugins/quicktime.png quicktime @@ -982,14 +982,14 @@ Android Android - plugins/DevicesDetection/images/os/AND.png + plugins/Morpheus/icons/dist/os/AND.png AND Gecko Gecko (Firefox) Firefox 27.0 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 27.0 0 @@ -1017,7 +1017,7 @@ flash - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash @@ -1098,14 +1098,14 @@ Windows 7 Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN 7 Gecko Gecko (Firefox) Firefox 27.0 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 27.0 0 @@ -1133,27 +1133,27 @@ pdf, flash, java, quicktime, windowsmedia, silverlight - plugins/DevicePlugins/images/plugins/pdf.png + plugins/Morpheus/icons/dist/plugins/pdf.png pdf - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java - plugins/DevicePlugins/images/plugins/quicktime.png + plugins/Morpheus/icons/dist/plugins/quicktime.png quicktime - plugins/DevicePlugins/images/plugins/windowsmedia.png + plugins/Morpheus/icons/dist/plugins/windowsmedia.png windowsmedia - plugins/DevicePlugins/images/plugins/silverlight.png + plugins/Morpheus/icons/dist/plugins/silverlight.png silverlight @@ -1265,7 +1265,7 @@ 1 http://piwik.org/faq/general/#faq_144 http://google.com - plugins/Referrers/images/searchEngines/google.com.png + plugins/Morpheus/icons/dist/searchEngines/google.com.png Unknown Desktop @@ -1274,14 +1274,14 @@ Windows 8 Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN 8 Gecko Gecko (Firefox) Firefox 27.0 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 27.0 0 @@ -1309,11 +1309,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -1394,14 +1394,14 @@ Windows 7 Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN 7 Blink Blink (Chrome, Opera) Chrome 33.0 Chrome - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png CH 33.0 0 @@ -1429,19 +1429,19 @@ pdf, flash, java, silverlight - plugins/DevicePlugins/images/plugins/pdf.png + plugins/Morpheus/icons/dist/plugins/pdf.png pdf - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java - plugins/DevicePlugins/images/plugins/silverlight.png + plugins/Morpheus/icons/dist/plugins/silverlight.png silverlight @@ -1522,14 +1522,14 @@ Windows 7 Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN 7 Blink Blink (Chrome, Opera) Chrome 33.0 Chrome - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png CH 33.0 0 @@ -1557,19 +1557,19 @@ pdf, flash, java, silverlight - plugins/DevicePlugins/images/plugins/pdf.png + plugins/Morpheus/icons/dist/plugins/pdf.png pdf - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java - plugins/DevicePlugins/images/plugins/silverlight.png + plugins/Morpheus/icons/dist/plugins/silverlight.png silverlight @@ -1656,14 +1656,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Trident Trident (IE) Internet Explorer 6.0 Internet Explorer - plugins/DevicesDetection/images/browsers/IE.png + plugins/Morpheus/icons/dist/browsers/IE.png IE 6.0 0 @@ -1691,11 +1691,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -1774,14 +1774,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP WebKit WebKit (Safari, Chrome) Chrome 11.0 Chrome - plugins/DevicesDetection/images/browsers/CH.png + plugins/Morpheus/icons/dist/browsers/CH.png CH 11.0 0 @@ -1809,27 +1809,27 @@ pdf, flash, java, director, windowsmedia, gears - plugins/DevicePlugins/images/plugins/pdf.png + plugins/Morpheus/icons/dist/plugins/pdf.png pdf - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java - plugins/DevicePlugins/images/plugins/director.png + plugins/Morpheus/icons/dist/plugins/director.png director - plugins/DevicePlugins/images/plugins/windowsmedia.png + plugins/Morpheus/icons/dist/plugins/windowsmedia.png windowsmedia - plugins/DevicePlugins/images/plugins/gears.png + plugins/Morpheus/icons/dist/plugins/gears.png gears @@ -1950,14 +1950,14 @@ Mac 10.6 Mac - plugins/DevicesDetection/images/os/MAC.png + plugins/Morpheus/icons/dist/os/MAC.png MAC 10.6 WebKit WebKit (Safari, Chrome) Safari 5.0 Safari - plugins/DevicesDetection/images/browsers/SF.png + plugins/Morpheus/icons/dist/browsers/SF.png SF 5.0 0 @@ -1985,11 +1985,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml index 8697efbd17..94f689d62d 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml @@ -140,14 +140,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -179,11 +179,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -277,14 +277,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -316,11 +316,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -457,14 +457,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -496,11 +496,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml index 7ac82f7b43..d454b9c3db 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml @@ -78,14 +78,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -117,11 +117,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -277,14 +277,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -316,11 +316,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -414,14 +414,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -453,11 +453,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml index 9f8bfc5a7e..5a4b100f86 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml @@ -95,11 +95,11 @@ Windows XP WIN - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png Gecko Gecko (Firefox) Firefox 3.6 - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 Desktop @@ -216,11 +216,11 @@ Windows XP WIN - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png Gecko Gecko (Firefox) Firefox 3.6 - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 Desktop @@ -337,11 +337,11 @@ Windows XP WIN - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png Gecko Gecko (Firefox) Firefox 3.6 - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 Desktop @@ -458,11 +458,11 @@ Windows XP WIN - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png Gecko Gecko (Firefox) Firefox 3.6 - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 Desktop @@ -610,11 +610,11 @@ Windows XP WIN - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png Gecko Gecko (Firefox) Firefox 3.6 - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 Desktop @@ -762,11 +762,11 @@ Windows XP WIN - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png Gecko Gecko (Firefox) Firefox 3.6 - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 Desktop @@ -906,11 +906,11 @@ Unknown UNK - plugins/DevicesDetection/images/os/UNK.png + plugins/Morpheus/icons/dist/os/UNK.png unknown Unknown Unknown - plugins/DevicesDetection/images/browsers/UNK.png + plugins/Morpheus/icons/dist/browsers/UNK.png UNK UNK Desktop diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml index d70e0114c0..d7bb4bf39a 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml @@ -74,14 +74,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -101,11 +101,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -236,14 +236,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -263,11 +263,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -364,14 +364,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -391,11 +391,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -526,14 +526,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -553,11 +553,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -654,14 +654,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -681,11 +681,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -816,14 +816,14 @@ Unknown Unknown - plugins/DevicesDetection/images/os/UNK.png + plugins/Morpheus/icons/dist/os/UNK.png UNK UNK Unknown Unknown Unknown - plugins/DevicesDetection/images/browsers/UNK.png + plugins/Morpheus/icons/dist/browsers/UNK.png UNK 1 @@ -843,11 +843,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -936,14 +936,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -963,11 +963,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml index 43833e94bc..6860c259d7 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml @@ -59,7 +59,7 @@ http://google.com/?q=Wikileaks FTW http://google.com - plugins/Referrers/images/searchEngines/google.com.png + plugins/Morpheus/icons/dist/searchEngines/google.com.png fr French Desktop @@ -68,14 +68,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP WebKit WebKit (Safari, Chrome) Safari Safari - plugins/DevicesDetection/images/browsers/SF.png + plugins/Morpheus/icons/dist/browsers/SF.png SF 0 @@ -99,11 +99,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -259,14 +259,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -298,11 +298,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -396,14 +396,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -435,11 +435,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -576,14 +576,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -615,11 +615,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -713,14 +713,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -752,11 +752,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -912,14 +912,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -951,11 +951,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -1049,14 +1049,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -1088,11 +1088,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml index 08eebcd87f..6b0807d712 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml @@ -108,14 +108,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -137,11 +137,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -238,14 +238,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -267,11 +267,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -402,14 +402,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -431,11 +431,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -548,14 +548,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -577,11 +577,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -678,14 +678,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -707,11 +707,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -808,14 +808,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -837,11 +837,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -921,21 +921,21 @@ http://google.com/?q=Wikileaks FTW http://google.com - plugins/Referrers/images/searchEngines/google.com.png + plugins/Morpheus/icons/dist/searchEngines/google.com.png Desktop plugins/DevicesDetection/images/screens/normal.png Unknown Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP WebKit WebKit (Safari, Chrome) Safari Safari - plugins/DevicesDetection/images/browsers/SF.png + plugins/Morpheus/icons/dist/browsers/SF.png SF 0 @@ -957,11 +957,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml index 43833e94bc..6860c259d7 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml @@ -59,7 +59,7 @@ http://google.com/?q=Wikileaks FTW http://google.com - plugins/Referrers/images/searchEngines/google.com.png + plugins/Morpheus/icons/dist/searchEngines/google.com.png fr French Desktop @@ -68,14 +68,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP WebKit WebKit (Safari, Chrome) Safari Safari - plugins/DevicesDetection/images/browsers/SF.png + plugins/Morpheus/icons/dist/browsers/SF.png SF 0 @@ -99,11 +99,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -259,14 +259,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -298,11 +298,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -396,14 +396,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -435,11 +435,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -576,14 +576,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -615,11 +615,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -713,14 +713,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -752,11 +752,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -912,14 +912,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -951,11 +951,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -1049,14 +1049,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -1088,11 +1088,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml index f558426ca7..29a0f0d4fb 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -59,7 +59,7 @@ http://google.com/?q=Wikileaks FTW http://google.com - plugins/Referrers/images/searchEngines/google.com.png + plugins/Morpheus/icons/dist/searchEngines/google.com.png fr French Desktop @@ -68,14 +68,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP WebKit WebKit (Safari, Chrome) Safari Safari - plugins/DevicesDetection/images/browsers/SF.png + plugins/Morpheus/icons/dist/browsers/SF.png SF 0 @@ -99,11 +99,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -259,14 +259,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -298,11 +298,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -396,14 +396,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -435,11 +435,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -576,14 +576,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -615,11 +615,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -713,14 +713,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -752,11 +752,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -912,14 +912,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -951,11 +951,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -1049,14 +1049,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -1088,11 +1088,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -1229,14 +1229,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -1268,11 +1268,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -1366,14 +1366,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -1405,11 +1405,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -1565,14 +1565,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 1 @@ -1604,11 +1604,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicePlugins.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicePlugins.getPlugin_day.xml index 5fb88fd638..6dd8447a8b 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicePlugins.getPlugin_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicePlugins.getPlugin_day.xml @@ -4,60 +4,60 @@ 2 100% - plugins/DevicePlugins/images/plugins/cookie.png + plugins/Morpheus/icons/dist/plugins/cookie.png 2 100% - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png 2 100% - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png 0 0% - plugins/DevicePlugins/images/plugins/director.png + plugins/Morpheus/icons/dist/plugins/director.png 0 0% - plugins/DevicePlugins/images/plugins/gears.png + plugins/Morpheus/icons/dist/plugins/gears.png 0 0% - plugins/DevicePlugins/images/plugins/pdf.png + plugins/Morpheus/icons/dist/plugins/pdf.png 0 0% - plugins/DevicePlugins/images/plugins/quicktime.png + plugins/Morpheus/icons/dist/plugins/quicktime.png 0 0% - plugins/DevicePlugins/images/plugins/realplayer.png + plugins/Morpheus/icons/dist/plugins/realplayer.png 0 0% - plugins/DevicePlugins/images/plugins/silverlight.png + plugins/Morpheus/icons/dist/plugins/silverlight.png 0 0% - plugins/DevicePlugins/images/plugins/windowsmedia.png + plugins/Morpheus/icons/dist/plugins/windowsmedia.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml index f9671f4619..fdae1ac533 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml @@ -9,6 +9,6 @@ 1621 1 2 - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml index 2603420cd3..dc67261f58 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml @@ -10,6 +10,6 @@ 1 2 browserCode==FF;browserVersion==3.6 - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml index 9d976b6ea3..3c5c78e32f 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml @@ -9,7 +9,7 @@ 1621 1 2 - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png browserCode==FF \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml index 07e1a01b33..e97badfc7a 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml @@ -9,6 +9,6 @@ 1621 1 2 - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml index 3086cf37f6..24cf680d07 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml @@ -10,6 +10,6 @@ 1 2 operatingSystemCode==WIN;operatingSystemVersion==XP - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getSearchEngines_day.xml index 9c7860d9da..822ff82c39 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getSearchEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Referrers.getSearchEngines_day.xml @@ -19,7 +19,7 @@ 1 referrerType==search;referrerName==Yahoo%21 http://search.yahoo.com - plugins/Referrers/images/searchEngines/search.yahoo.com.png + plugins/Morpheus/icons/dist/searchEngines/search.yahoo.com.png diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicePlugins.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicePlugins.getPlugin_day.xml index 5fb88fd638..6dd8447a8b 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicePlugins.getPlugin_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicePlugins.getPlugin_day.xml @@ -4,60 +4,60 @@ 2 100% - plugins/DevicePlugins/images/plugins/cookie.png + plugins/Morpheus/icons/dist/plugins/cookie.png 2 100% - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png 2 100% - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png 0 0% - plugins/DevicePlugins/images/plugins/director.png + plugins/Morpheus/icons/dist/plugins/director.png 0 0% - plugins/DevicePlugins/images/plugins/gears.png + plugins/Morpheus/icons/dist/plugins/gears.png 0 0% - plugins/DevicePlugins/images/plugins/pdf.png + plugins/Morpheus/icons/dist/plugins/pdf.png 0 0% - plugins/DevicePlugins/images/plugins/quicktime.png + plugins/Morpheus/icons/dist/plugins/quicktime.png 0 0% - plugins/DevicePlugins/images/plugins/realplayer.png + plugins/Morpheus/icons/dist/plugins/realplayer.png 0 0% - plugins/DevicePlugins/images/plugins/silverlight.png + plugins/Morpheus/icons/dist/plugins/silverlight.png 0 0% - plugins/DevicePlugins/images/plugins/windowsmedia.png + plugins/Morpheus/icons/dist/plugins/windowsmedia.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml index 5d97f32abd..70be909782 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml @@ -10,6 +10,6 @@ 1621 1 2 - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml index 4aadf7058b..741d8d0537 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml @@ -11,6 +11,6 @@ 1 2 browserCode==FF;browserVersion==3.6 - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml index 8a48a353ab..743078e026 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml @@ -10,7 +10,7 @@ 1621 1 2 - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png browserCode==FF \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml index 7948d87923..55011bb7df 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml @@ -10,6 +10,6 @@ 1621 1 2 - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml index 1f8831dbca..c80d98672c 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml @@ -11,6 +11,6 @@ 1 2 operatingSystemCode==WIN;operatingSystemVersion==XP - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml index 625255ec8c..ef0c6d4fcf 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml @@ -61,7 +61,7 @@ http://search.yahoo.com/search?p=purchase http://search.yahoo.com - plugins/Referrers/images/searchEngines/search.yahoo.com.png + plugins/Morpheus/icons/dist/searchEngines/search.yahoo.com.png fr French Desktop @@ -70,14 +70,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -101,11 +101,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -288,14 +288,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -319,11 +319,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml index 35b195308e..db56768738 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Referrers.getSearchEngines_day.xml @@ -20,7 +20,7 @@ 1 referrerType==search;referrerName==Yahoo%21 http://search.yahoo.com - plugins/Referrers/images/searchEngines/search.yahoo.com.png + plugins/Morpheus/icons/dist/searchEngines/search.yahoo.com.png diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__DevicePlugins.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__DevicePlugins.getPlugin_day.xml index a9110fd732..e576c4ad5c 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__DevicePlugins.getPlugin_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__DevicePlugins.getPlugin_day.xml @@ -4,13 +4,13 @@ 7 100% - plugins/DevicePlugins/images/plugins/cookie.png + plugins/Morpheus/icons/dist/plugins/cookie.png 7 100% - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml index e566232c1c..c75da162ca 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml @@ -48,7 +48,7 @@ 4 http://www.google.com.vn/search?q=%3C%3E%26%5C%22the+pdo+extension+is+required+for+this+adapter+but+the+extension+is+not+loaded http://google.com - plugins/Referrers/images/searchEngines/google.com.png + plugins/Morpheus/icons/dist/searchEngines/google.com.png fr Français Inconnu @@ -57,14 +57,14 @@ Bot Bot - plugins/DevicesDetection/images/os/UNK.png + plugins/Morpheus/icons/dist/os/UNK.png BOT UNK Inconnu Inconnu Inconnu - plugins/DevicesDetection/images/browsers/UNK.png + plugins/Morpheus/icons/dist/browsers/UNK.png UNK 0 @@ -88,11 +88,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -169,7 +169,7 @@ 1 http://piwik.org/faq/general/#faq_144 http://google.com - plugins/Referrers/images/searchEngines/google.com.png + plugins/Morpheus/icons/dist/searchEngines/google.com.png fr Français Inconnu @@ -178,14 +178,14 @@ Bot Bot - plugins/DevicesDetection/images/os/UNK.png + plugins/Morpheus/icons/dist/os/UNK.png BOT UNK Inconnu Inconnu Inconnu - plugins/DevicesDetection/images/browsers/UNK.png + plugins/Morpheus/icons/dist/browsers/UNK.png UNK 0 @@ -209,11 +209,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml index 4d38ab8282..00e9c1cdba 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml @@ -62,14 +62,14 @@ Windows Vista Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN Vista Trident Trident (IE) Internet Explorer 7.0 Internet Explorer - plugins/DevicesDetection/images/browsers/IE.png + plugins/Morpheus/icons/dist/browsers/IE.png IE 7.0 0 @@ -166,14 +166,14 @@ Windows Vista Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN Vista Trident Trident (IE) Internet Explorer 7.0 Internet Explorer - plugins/DevicesDetection/images/browsers/IE.png + plugins/Morpheus/icons/dist/browsers/IE.png IE 7.0 0 @@ -270,14 +270,14 @@ Windows Vista Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN Vista Trident Trident (IE) Internet Explorer 7.0 Internet Explorer - plugins/DevicesDetection/images/browsers/IE.png + plugins/Morpheus/icons/dist/browsers/IE.png IE 7.0 0 diff --git a/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml index 3354c1df29..579575d2a0 100644 --- a/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml +++ b/tests/PHPUnit/System/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml @@ -255,7 +255,7 @@ Google (Visits) - plugins/Referrers/images/searchEngines/google.com.png + plugins/Morpheus/icons/dist/searchEngines/google.com.png 1 1 0% diff --git a/tests/PHPUnit/System/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml b/tests/PHPUnit/System/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml index 8a1dc9d833..9e96e35b46 100644 --- a/tests/PHPUnit/System/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml +++ b/tests/PHPUnit/System/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml @@ -11,7 +11,7 @@ 9 0 http://google.com/search?q=free+%3E+proprietary - plugins/Referrers/images/searchEngines/google.com.png + plugins/Morpheus/icons/dist/searchEngines/google.com.png @@ -24,7 +24,7 @@ 8 0 http://google.com/search?q=justice+%29%28%26%5E%23%25%24+not+%27%22+corruption%21 - plugins/Referrers/images/searchEngines/google.com.png + plugins/Morpheus/icons/dist/searchEngines/google.com.png @@ -37,6 +37,6 @@ 8 0 http://google.com/search?q=peace+%22%2C%22+not+war - plugins/Referrers/images/searchEngines/google.com.png + plugins/Morpheus/icons/dist/searchEngines/google.com.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml index 2f815adae7..bf05786f61 100644 --- a/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml +++ b/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml @@ -49,7 +49,7 @@ Firefox (Visits) - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png 0 1 @@ -58,7 +58,7 @@ Opera (Visits) - plugins/DevicesDetection/images/browsers/OP.png + plugins/Morpheus/icons/dist/browsers/OP.png 0 1 -100% diff --git a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml index 5f57be7817..0fba801755 100644 --- a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml @@ -57,14 +57,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -88,11 +88,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java 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 cc5191aea4..95b5726131 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 @@ -923,7 +923,7 @@ - +   Unknown @@ -948,7 +948,7 @@ - +   Windows XP @@ -982,7 +982,7 @@ @@ -1018,7 +1018,7 @@ - +   Unknown @@ -1043,7 +1043,7 @@ - +   Firefox @@ -1068,7 +1068,7 @@ - +   Opera @@ -1102,7 +1102,7 @@ @@ -1138,7 +1138,7 @@ - +   Unknown @@ -1163,7 +1163,7 @@ - +   Firefox 3.6 @@ -1188,7 +1188,7 @@ - +   Opera 9.63 @@ -1372,7 +1372,7 @@ - +   Unknown @@ -1397,7 +1397,7 @@ - +   Windows @@ -1569,7 +1569,7 @@ - +   Cookie @@ -1582,7 +1582,7 @@ - +   Flash @@ -1595,7 +1595,7 @@ - +   Java @@ -1608,7 +1608,7 @@ - +   Director @@ -1621,7 +1621,7 @@ - +   Gears @@ -1634,7 +1634,7 @@ - +   Pdf @@ -1647,7 +1647,7 @@ - +   Quicktime @@ -1660,7 +1660,7 @@ - +   Realplayer @@ -1673,7 +1673,7 @@ - +   Silverlight @@ -1686,7 +1686,7 @@ - +   Windowsmedia 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 be472ece87..6369647644 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 @@ -874,7 +874,7 @@ - +   Unknown @@ -899,7 +899,7 @@ - +   Windows XP @@ -962,7 +962,7 @@ - +   Unknown @@ -987,7 +987,7 @@ - +   Firefox @@ -1012,7 +1012,7 @@ - +   Opera @@ -1075,7 +1075,7 @@ - +   Unknown @@ -1100,7 +1100,7 @@ - +   Firefox 3.6 @@ -1125,7 +1125,7 @@ - +   Opera 9.63 @@ -1295,7 +1295,7 @@ - +   Unknown @@ -1320,7 +1320,7 @@ - +   Windows @@ -1478,7 +1478,7 @@ - +   Cookie @@ -1491,7 +1491,7 @@ - +   Flash @@ -1504,7 +1504,7 @@ - +   Java @@ -1517,7 +1517,7 @@ - +   Director @@ -1530,7 +1530,7 @@ - +   Gears @@ -1543,7 +1543,7 @@ - +   Pdf @@ -1556,7 +1556,7 @@ - +   Quicktime @@ -1569,7 +1569,7 @@ - +   Realplayer @@ -1582,7 +1582,7 @@ - +   Silverlight @@ -1595,7 +1595,7 @@ - +   Windowsmedia diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf index 1aa153ef88..adda5aaba5 100644 Binary files a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf and b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_month.original.pdf differ diff --git a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv index 98507835ad..a6d50f68e5 100644 Binary files a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv and b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv differ diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml index 77544ebc9f..d931369c63 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml @@ -83,14 +83,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -126,11 +126,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -312,14 +312,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -355,11 +355,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml index 6e082082a8..8504c298e6 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -166,14 +166,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -209,11 +209,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -522,14 +522,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -565,11 +565,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -760,14 +760,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -799,11 +799,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java 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 25d7949eb9..d0e86d01ac 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 @@ -1043,7 +1043,7 @@ - +   Windows XP @@ -1077,7 +1077,7 @@ @@ -1113,7 +1113,7 @@ - +   Firefox @@ -1147,7 +1147,7 @@ @@ -1183,7 +1183,7 @@ - +   Firefox 3.6 @@ -1321,7 +1321,7 @@ - +   Windows @@ -1447,7 +1447,7 @@ - +   Cookie @@ -1460,7 +1460,7 @@ - +   Flash @@ -1473,7 +1473,7 @@ - +   Java @@ -1486,7 +1486,7 @@ - +   Director @@ -1499,7 +1499,7 @@ - +   Gears @@ -1512,7 +1512,7 @@ - +   Pdf @@ -1525,7 +1525,7 @@ - +   Quicktime @@ -1538,7 +1538,7 @@ - +   Realplayer @@ -1551,7 +1551,7 @@ - +   Silverlight @@ -1564,7 +1564,7 @@ - +   Windowsmedia 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 6b3d2cc819..e4e55f4bc1 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 @@ -987,7 +987,7 @@ - +   Windows XP @@ -1050,7 +1050,7 @@ - +   Firefox @@ -1113,7 +1113,7 @@ - +   Firefox 3.6 @@ -1237,7 +1237,7 @@ - +   Windows @@ -1349,7 +1349,7 @@ - +   Cookie @@ -1362,7 +1362,7 @@ - +   Flash @@ -1375,7 +1375,7 @@ - +   Java @@ -1388,7 +1388,7 @@ - +   Director @@ -1401,7 +1401,7 @@ - +   Gears @@ -1414,7 +1414,7 @@ - +   Pdf @@ -1427,7 +1427,7 @@ - +   Quicktime @@ -1440,7 +1440,7 @@ - +   Realplayer @@ -1453,7 +1453,7 @@ - +   Silverlight @@ -1466,7 +1466,7 @@ - +   Windowsmedia diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf index 83194fbbe9..8bf8259f0d 100644 Binary files a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf and b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf differ diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_Flattened__Referrers.getSocials_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_Flattened__Referrers.getSocials_range.xml index 1bf3f656ab..aba4cd467c 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_Flattened__Referrers.getSocials_range.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_Flattened__Referrers.getSocials_range.xml @@ -11,7 +11,7 @@ 1 0 http://facebook.com/whatever - plugins/Referrers/images/socials/facebook.com.png + plugins/Morpheus/icons/dist/socials/facebook.com.png @@ -24,7 +24,7 @@ 1 0 http://fb.me/?q=sdlfjs&n=slfjsd - plugins/Referrers/images/socials/facebook.com.png + plugins/Morpheus/icons/dist/socials/facebook.com.png @@ -37,7 +37,7 @@ 1 0 http://www.facebook.com/another/path - plugins/Referrers/images/socials/facebook.com.png + plugins/Morpheus/icons/dist/socials/facebook.com.png @@ -50,7 +50,7 @@ 1 0 http://www.flickr.com - plugins/Referrers/images/socials/flickr.com.png + plugins/Morpheus/icons/dist/socials/flickr.com.png @@ -63,7 +63,7 @@ 1 0 http://mixi.jp - plugins/Referrers/images/socials/mixi.jp.png + plugins/Morpheus/icons/dist/socials/mixi.jp.png @@ -76,7 +76,7 @@ 1 0 http://skyrock.com - plugins/Referrers/images/socials/skyrock.com.png + plugins/Morpheus/icons/dist/socials/skyrock.com.png @@ -89,7 +89,7 @@ 1 0 http://t.co/id/?y=dsfs - plugins/Referrers/images/socials/twitter.com.png + plugins/Morpheus/icons/dist/socials/twitter.com.png @@ -102,7 +102,7 @@ 1 0 http://twitter.com/whatever2 - plugins/Referrers/images/socials/twitter.com.png + plugins/Morpheus/icons/dist/socials/twitter.com.png @@ -115,7 +115,7 @@ 1 0 http://www.twitter.com/index?a=2334 - plugins/Referrers/images/socials/twitter.com.png + plugins/Morpheus/icons/dist/socials/twitter.com.png @@ -128,6 +128,6 @@ 1 0 http://xanga.com - plugins/Referrers/images/socials/xanga.com.png + plugins/Morpheus/icons/dist/socials/xanga.com.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__Referrers.getSocials_day.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__Referrers.getSocials_day.xml index 1ffd258f3c..622686427b 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__Referrers.getSocials_day.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__Referrers.getSocials_day.xml @@ -17,7 +17,7 @@ 1 0 facebook.com - plugins/Referrers/images/socials/facebook.com.png + plugins/Morpheus/icons/dist/socials/facebook.com.png @@ -32,7 +32,7 @@ 0 0 facebook.com - plugins/Referrers/images/socials/facebook.com.png + plugins/Morpheus/icons/dist/socials/facebook.com.png @@ -45,7 +45,7 @@ 1 0 twitter.com - plugins/Referrers/images/socials/twitter.com.png + plugins/Morpheus/icons/dist/socials/twitter.com.png @@ -67,7 +67,7 @@ 1 0 facebook.com - plugins/Referrers/images/socials/facebook.com.png + plugins/Morpheus/icons/dist/socials/facebook.com.png @@ -82,7 +82,7 @@ 1 0 twitter.com - plugins/Referrers/images/socials/twitter.com.png + plugins/Morpheus/icons/dist/socials/twitter.com.png diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getSocials_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getSocials_range.xml index fc306b3b48..0ea3f3ea86 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getSocials_range.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getSocials_range.xml @@ -12,7 +12,7 @@ 3 0 facebook.com - plugins/Referrers/images/socials/facebook.com.png + plugins/Morpheus/icons/dist/socials/facebook.com.png @@ -25,7 +25,7 @@ 3 0 twitter.com - plugins/Referrers/images/socials/twitter.com.png + plugins/Morpheus/icons/dist/socials/twitter.com.png @@ -38,7 +38,7 @@ 1 0 flickr.com - plugins/Referrers/images/socials/flickr.com.png + plugins/Morpheus/icons/dist/socials/flickr.com.png @@ -51,7 +51,7 @@ 1 0 mixi.jp - plugins/Referrers/images/socials/mixi.jp.png + plugins/Morpheus/icons/dist/socials/mixi.jp.png @@ -64,7 +64,7 @@ 1 0 skyrock.com - plugins/Referrers/images/socials/skyrock.com.png + plugins/Morpheus/icons/dist/socials/skyrock.com.png @@ -77,7 +77,7 @@ 1 0 xanga.com - plugins/Referrers/images/socials/xanga.com.png + plugins/Morpheus/icons/dist/socials/xanga.com.png @@ -92,7 +92,7 @@ 2 0 twitter.com - plugins/Referrers/images/socials/twitter.com.png + plugins/Morpheus/icons/dist/socials/twitter.com.png @@ -105,7 +105,7 @@ 1 0 facebook.com - plugins/Referrers/images/socials/facebook.com.png + plugins/Morpheus/icons/dist/socials/facebook.com.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml index 6ea02a4d85..de354fdde7 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml @@ -57,14 +57,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.0 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.0 0 @@ -96,11 +96,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -184,14 +184,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.0 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.0 0 @@ -223,11 +223,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -363,7 +363,7 @@ 1 http://www.google.com/search?q=this+keyword+should+be+ranked http://google.com - plugins/Referrers/images/searchEngines/google.com.png + plugins/Morpheus/icons/dist/searchEngines/google.com.png fr French Desktop @@ -372,14 +372,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -415,11 +415,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml index 6ea02a4d85..de354fdde7 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml @@ -57,14 +57,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.0 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.0 0 @@ -96,11 +96,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -184,14 +184,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.0 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.0 0 @@ -223,11 +223,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -363,7 +363,7 @@ 1 http://www.google.com/search?q=this+keyword+should+be+ranked http://google.com - plugins/Referrers/images/searchEngines/google.com.png + plugins/Morpheus/icons/dist/searchEngines/google.com.png fr French Desktop @@ -372,14 +372,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -415,11 +415,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml index 3733797b27..d9f537271f 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml @@ -108,14 +108,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.0 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.0 0 @@ -147,11 +147,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -235,14 +235,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.0 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.0 0 @@ -274,11 +274,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml index 6ea02a4d85..de354fdde7 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml @@ -57,14 +57,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.0 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.0 0 @@ -96,11 +96,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -184,14 +184,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.0 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.0 0 @@ -223,11 +223,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -363,7 +363,7 @@ 1 http://www.google.com/search?q=this+keyword+should+be+ranked http://google.com - plugins/Referrers/images/searchEngines/google.com.png + plugins/Morpheus/icons/dist/searchEngines/google.com.png fr French Desktop @@ -372,14 +372,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -415,11 +415,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml index 6ea02a4d85..de354fdde7 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml @@ -57,14 +57,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.0 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.0 0 @@ -96,11 +96,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -184,14 +184,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.0 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.0 0 @@ -223,11 +223,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -363,7 +363,7 @@ 1 http://www.google.com/search?q=this+keyword+should+be+ranked http://google.com - plugins/Referrers/images/searchEngines/google.com.png + plugins/Morpheus/icons/dist/searchEngines/google.com.png fr French Desktop @@ -372,14 +372,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.6 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.6 0 @@ -415,11 +415,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml index 3733797b27..d9f537271f 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml @@ -108,14 +108,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.0 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.0 0 @@ -147,11 +147,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java @@ -235,14 +235,14 @@ Windows XP Windows - plugins/DevicesDetection/images/os/WIN.png + plugins/Morpheus/icons/dist/os/WIN.png WIN XP Gecko Gecko (Firefox) Firefox 3.0 Firefox - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png FF 3.0 0 @@ -274,11 +274,11 @@ flash, java - plugins/DevicePlugins/images/plugins/flash.png + plugins/Morpheus/icons/dist/plugins/flash.png flash - plugins/DevicePlugins/images/plugins/java.png + plugins/Morpheus/icons/dist/plugins/java.png java diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml index a8c967db5e..945c55b1ac 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml @@ -11,7 +11,7 @@ 15 0 browserCode==FF;browserVersion==6.0 - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png @@ -24,7 +24,7 @@ 15 0 browserCode==IE;browserVersion==9.0 - plugins/DevicesDetection/images/browsers/IE.png + plugins/Morpheus/icons/dist/browsers/IE.png @@ -36,6 +36,6 @@ 0 45 0 - plugins/DevicesDetection/images/browsers/UNK.png + plugins/Morpheus/icons/dist/browsers/UNK.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml index ae73047a6d..0d5db7195b 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml @@ -11,7 +11,7 @@ 20 0 operatingSystemCode==LIN;operatingSystemVersion== - plugins/DevicesDetection/images/os/LIN.png + plugins/Morpheus/icons/dist/os/LIN.png @@ -24,7 +24,7 @@ 15 0 operatingSystemCode==AND;operatingSystemVersion==4.0 - plugins/DevicesDetection/images/os/AND.png + plugins/Morpheus/icons/dist/os/AND.png @@ -36,6 +36,6 @@ 0 40 0 - plugins/DevicesDetection/images/os/UNK.png + plugins/Morpheus/icons/dist/os/UNK.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml index fbd996bbe3..4e00626c24 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__Referrers.getSearchEngines_day.xml @@ -12,7 +12,7 @@ 0 referrerType==search;referrerName==Google http://google.com - plugins/Referrers/images/searchEngines/google.com.png + plugins/Morpheus/icons/dist/searchEngines/google.com.png @@ -50,7 +50,7 @@ 0 referrerType==search;referrerName==Yahoo%21 http://search.yahoo.com - plugins/Referrers/images/searchEngines/search.yahoo.com.png + plugins/Morpheus/icons/dist/searchEngines/search.yahoo.com.png @@ -87,6 +87,6 @@ 6 0 URL unknown! - plugins/Referrers/images/searchEngines/xx.png + plugins/Morpheus/icons/dist/searchEngines/xx.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml index 80480a92da..f001add435 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml @@ -10,7 +10,7 @@ 0 45 0 - plugins/DevicesDetection/images/browsers/UNK.png + plugins/Morpheus/icons/dist/browsers/UNK.png @@ -23,7 +23,7 @@ 15 0 browserCode==FF;browserVersion==6.0 - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png @@ -36,6 +36,6 @@ 15 0 browserCode==IE;browserVersion==9.0 - plugins/DevicesDetection/images/browsers/IE.png + plugins/Morpheus/icons/dist/browsers/IE.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml index a3444c4edf..e89d340a58 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml @@ -10,7 +10,7 @@ 0 40 0 - plugins/DevicesDetection/images/os/UNK.png + plugins/Morpheus/icons/dist/os/UNK.png @@ -23,7 +23,7 @@ 20 0 operatingSystemCode==LIN;operatingSystemVersion== - plugins/DevicesDetection/images/os/LIN.png + plugins/Morpheus/icons/dist/os/LIN.png @@ -36,6 +36,6 @@ 15 0 operatingSystemCode==AND;operatingSystemVersion==4.0 - plugins/DevicesDetection/images/os/AND.png + plugins/Morpheus/icons/dist/os/AND.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml index 7bcbbd88ce..7ab79eb874 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml @@ -21,7 +21,7 @@ 0 2 0 - plugins/Referrers/images/searchEngines/xx.png + plugins/Morpheus/icons/dist/searchEngines/xx.png @@ -34,7 +34,7 @@ 1 0 http://alexa.com/search?q=search+term+2 - plugins/Referrers/images/searchEngines/alexa.com.png + plugins/Morpheus/icons/dist/searchEngines/alexa.com.png @@ -47,7 +47,7 @@ 1 0 http://search.babylon.com/?q=search+term+2 - plugins/Referrers/images/searchEngines/search.babylon.com.png + plugins/Morpheus/icons/dist/searchEngines/search.babylon.com.png @@ -60,6 +60,6 @@ 1 0 http://ask.com/web?q=this+search+term - plugins/Referrers/images/searchEngines/ask.com.png + plugins/Morpheus/icons/dist/searchEngines/ask.com.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml index 17ab7cc1e9..9d53c575a0 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml @@ -11,7 +11,7 @@ 6 0 URL unknown! - plugins/Referrers/images/searchEngines/xx.png + plugins/Morpheus/icons/dist/searchEngines/xx.png @@ -23,7 +23,7 @@ 0 2 0 - plugins/Referrers/images/searchEngines/google.com.png + plugins/Morpheus/icons/dist/searchEngines/google.com.png @@ -35,7 +35,7 @@ 0 2 0 - plugins/Referrers/images/searchEngines/search.yahoo.com.png + plugins/Morpheus/icons/dist/searchEngines/search.yahoo.com.png @@ -48,7 +48,7 @@ 1 0 http://google.com/search?q=search+term+3 - plugins/Referrers/images/searchEngines/google.com.png + plugins/Morpheus/icons/dist/searchEngines/google.com.png @@ -61,6 +61,6 @@ 1 0 http://search.yahoo.com/search?p=search+term+4 - plugins/Referrers/images/searchEngines/search.yahoo.com.png + plugins/Morpheus/icons/dist/searchEngines/search.yahoo.com.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml index a8c967db5e..945c55b1ac 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml @@ -11,7 +11,7 @@ 15 0 browserCode==FF;browserVersion==6.0 - plugins/DevicesDetection/images/browsers/FF.png + plugins/Morpheus/icons/dist/browsers/FF.png @@ -24,7 +24,7 @@ 15 0 browserCode==IE;browserVersion==9.0 - plugins/DevicesDetection/images/browsers/IE.png + plugins/Morpheus/icons/dist/browsers/IE.png @@ -36,6 +36,6 @@ 0 45 0 - plugins/DevicesDetection/images/browsers/UNK.png + plugins/Morpheus/icons/dist/browsers/UNK.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml index ae73047a6d..0d5db7195b 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml @@ -11,7 +11,7 @@ 20 0 operatingSystemCode==LIN;operatingSystemVersion== - plugins/DevicesDetection/images/os/LIN.png + plugins/Morpheus/icons/dist/os/LIN.png @@ -24,7 +24,7 @@ 15 0 operatingSystemCode==AND;operatingSystemVersion==4.0 - plugins/DevicesDetection/images/os/AND.png + plugins/Morpheus/icons/dist/os/AND.png @@ -36,6 +36,6 @@ 0 40 0 - plugins/DevicesDetection/images/os/UNK.png + plugins/Morpheus/icons/dist/os/UNK.png \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml index fbd996bbe3..4e00626c24 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__Referrers.getSearchEngines_day.xml @@ -12,7 +12,7 @@ 0 referrerType==search;referrerName==Google http://google.com - plugins/Referrers/images/searchEngines/google.com.png + plugins/Morpheus/icons/dist/searchEngines/google.com.png @@ -50,7 +50,7 @@ 0 referrerType==search;referrerName==Yahoo%21 http://search.yahoo.com - plugins/Referrers/images/searchEngines/search.yahoo.com.png + plugins/Morpheus/icons/dist/searchEngines/search.yahoo.com.png @@ -87,6 +87,6 @@ 6 0 URL unknown! - plugins/Referrers/images/searchEngines/xx.png + plugins/Morpheus/icons/dist/searchEngines/xx.png \ No newline at end of file -- cgit v1.2.3