diff options
12 files changed, 107 insertions, 87 deletions
diff --git a/composer.lock b/composer.lock index 710e23cec7..db3438baa6 100644 --- a/composer.lock +++ b/composer.lock @@ -1038,16 +1038,16 @@ }, { "name": "piwik/device-detector", - "version": "3.10.1", + "version": "3.10.2", "source": { "type": "git", "url": "https://github.com/matomo-org/device-detector.git", - "reference": "76a9e32ac6842239ac66a3877079cbfb84f29789" + "reference": "67e96595cd7649b7967533053fcbfbe02d5c55a3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/matomo-org/device-detector/zipball/76a9e32ac6842239ac66a3877079cbfb84f29789", - "reference": "76a9e32ac6842239ac66a3877079cbfb84f29789", + "url": "https://api.github.com/repos/matomo-org/device-detector/zipball/67e96595cd7649b7967533053fcbfbe02d5c55a3", + "reference": "67e96595cd7649b7967533053fcbfbe02d5c55a3", "shasum": "" }, "require": { @@ -1088,7 +1088,7 @@ "parser", "useragent" ], - "time": "2018-03-23T15:19:45+00:00" + "time": "2018-05-07T19:33:29+00:00" }, { "name": "piwik/ini", diff --git a/js/piwik.min.js b/js/piwik.min.js index 67f62fef09..bb9aea4f2f 100644 --- a/js/piwik.min.js +++ b/js/piwik.min.js @@ -74,4 +74,4 @@ return}if(c5){c5=c5*60*60*1000}this.setConsentGiven();var c4=new Date().getTime( (function(){function b(){if("object"!==typeof _paq){return false}var c=typeof _paq.length;if("undefined"===c){return false}return !!_paq.length}if(window&&"object"===typeof window.piwikPluginAsyncInit&&window.piwikPluginAsyncInit.length){var a=0; for(a;a<window.piwikPluginAsyncInit.length;a++){if(typeof window.piwikPluginAsyncInit[a]==="function"){window.piwikPluginAsyncInit[a]()}}}if(window&&window.piwikAsyncInit){window.piwikAsyncInit()}if(!window.Piwik.getAsyncTrackers().length){if(b()){window.Piwik.addTracker()}else{_paq={push:function(c){var d=typeof console;if(d!=="undefined"&&console&&console.error){console.error("_paq.push() was used but Piwik tracker was not initialized before the piwik.js file was loaded. Make sure to configure the tracker via _paq.push before loading piwik.js. Alternatively, you can create a tracker via Piwik.addTracker() manually and then use _paq.push but it may not fully work as tracker methods may not be executed in the correct order.",c)}}}}}window.Piwik.trigger("PiwikInitialized",[]);window.Piwik.initialized=true}());(function(){var a=(typeof AnalyticsTracker);if(a==="undefined"){AnalyticsTracker=window.Piwik}}());if(typeof piwik_log!=="function"){piwik_log=function(b,f,d,g){function a(h){try{if(window["piwik_"+h]){return window["piwik_"+h] }}catch(i){}return}var c,e=window.Piwik.getTracker(d,f);e.setDocumentTitle(b);e.setCustomData(g);c=a("tracker_pause");if(c){e.setLinkTrackingTimer(c)}c=a("download_extensions");if(c){e.setDownloadExtensions(c)}c=a("hosts_alias");if(c){e.setDomains(c)}c=a("ignore_classes");if(c){e.setIgnoreClasses(c)}e.trackPageView();if(a("install_tracker")){piwik_track=function(i,k,j,h){e.setSiteId(k);e.setTrackerUrl(j);e.trackLink(i,h)};e.enableLinkTracking()}}} -/*!! @license-end */; +/*!! @license-end */;
\ No newline at end of file @@ -74,4 +74,4 @@ return}if(c5){c5=c5*60*60*1000}this.setConsentGiven();var c4=new Date().getTime( (function(){function b(){if("object"!==typeof _paq){return false}var c=typeof _paq.length;if("undefined"===c){return false}return !!_paq.length}if(window&&"object"===typeof window.piwikPluginAsyncInit&&window.piwikPluginAsyncInit.length){var a=0; for(a;a<window.piwikPluginAsyncInit.length;a++){if(typeof window.piwikPluginAsyncInit[a]==="function"){window.piwikPluginAsyncInit[a]()}}}if(window&&window.piwikAsyncInit){window.piwikAsyncInit()}if(!window.Piwik.getAsyncTrackers().length){if(b()){window.Piwik.addTracker()}else{_paq={push:function(c){var d=typeof console;if(d!=="undefined"&&console&&console.error){console.error("_paq.push() was used but Piwik tracker was not initialized before the piwik.js file was loaded. Make sure to configure the tracker via _paq.push before loading piwik.js. Alternatively, you can create a tracker via Piwik.addTracker() manually and then use _paq.push but it may not fully work as tracker methods may not be executed in the correct order.",c)}}}}}window.Piwik.trigger("PiwikInitialized",[]);window.Piwik.initialized=true}());(function(){var a=(typeof AnalyticsTracker);if(a==="undefined"){AnalyticsTracker=window.Piwik}}());if(typeof piwik_log!=="function"){piwik_log=function(b,f,d,g){function a(h){try{if(window["piwik_"+h]){return window["piwik_"+h] }}catch(i){}return}var c,e=window.Piwik.getTracker(d,f);e.setDocumentTitle(b);e.setCustomData(g);c=a("tracker_pause");if(c){e.setLinkTrackingTimer(c)}c=a("download_extensions");if(c){e.setDownloadExtensions(c)}c=a("hosts_alias");if(c){e.setDomains(c)}c=a("ignore_classes");if(c){e.setIgnoreClasses(c)}e.trackPageView();if(a("install_tracker")){piwik_track=function(i,k,j,h){e.setSiteId(k);e.setTrackerUrl(j);e.trackLink(i,h)};e.enableLinkTracking()}}} -/*!! @license-end */; +/*!! @license-end */;
\ No newline at end of file diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions -Subproject 52251a9b5d6e059b22aa9a8a2ec3f7638ded379 +Subproject b144c48c79fa2b5853317b43a77a0e972904364 diff --git a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_confirmation_message.png b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_confirmation_message.png index 780c7fcfc8..49ca76b53d 100644 --- a/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_confirmation_message.png +++ b/plugins/PrivacyManager/tests/UI/expected-screenshots/PrivacyManager_anonymizelogdata_anonymizeip_and_visit_column_confirmation_message.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d8275665a858343b61df24c2bc8cce960c8e13577306b0d54a2f3bbb33f8ce5 -size 26048 +oid sha256:aa2539540b164758e93588845be373848e71c96312a3474a09586c9ab8fa0236 +size 26049 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 5b95a1a3ca..852e5d279a 100755 --- 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 @@ -79,7 +79,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.8</operatingSystem> <operatingSystemName>Mac</operatingSystemName> @@ -1023,7 +1023,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> @@ -1141,7 +1141,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> 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 693a26cd1d..a378a4efa9 100755 --- 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 @@ -415,7 +415,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> @@ -676,7 +676,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> @@ -798,7 +798,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> @@ -942,7 +942,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> @@ -1097,7 +1097,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml index 0c4209d1f6..9b4bd0b0e3 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml @@ -2,27 +2,48 @@ <result> <row> <label>Unknown</label> - <nb_visits>40</nb_visits> - <nb_actions>45</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>549</sum_visit_length> - <bounce_count>36</bounce_count> + <nb_visits>23</nb_visits> + <nb_actions>24</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> + <bounce_count>22</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>36</nb_conversions> - <nb_visits_converted>36</nb_visits_converted> - <revenue>180</revenue> + <nb_conversions>20</nb_conversions> + <nb_visits_converted>20</nb_visits_converted> + <revenue>100</revenue> </row> </goals> - <nb_conversions>36</nb_conversions> - <revenue>180</revenue> - <sum_daily_nb_uniq_visitors>38</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>2</sum_daily_nb_users> + <nb_conversions>20</nb_conversions> + <revenue>100</revenue> + <sum_daily_nb_uniq_visitors>23</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <nb_visits_converted>0</nb_visits_converted> <logo>plugins/Morpheus/icons/dist/brand/unk.png</logo> <segment>deviceBrand==Unknown</segment> </row> <row> + <label>Apple</label> + <nb_visits>18</nb_visits> + <nb_actions>22</nb_actions> + <max_actions>3</max_actions> + <sum_visit_length>307</sum_visit_length> + <bounce_count>15</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>17</nb_conversions> + <nb_visits_converted>17</nb_visits_converted> + <revenue>85</revenue> + </row> + </goals> + <nb_conversions>17</nb_conversions> + <revenue>85</revenue> + <sum_daily_nb_uniq_visitors>16</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> + <logo>plugins/Morpheus/icons/dist/brand/Apple.png</logo> + <segment>deviceBrand==Apple</segment> + </row> + <row> <label>HTC</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> @@ -44,27 +65,6 @@ <segment>deviceBrand==HTC</segment> </row> <row> - <label>Apple</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>1</bounce_count> - <goals> - <row idgoal='1'> - <nb_conversions>1</nb_conversions> - <nb_visits_converted>1</nb_visits_converted> - <revenue>5</revenue> - </row> - </goals> - <nb_conversions>1</nb_conversions> - <revenue>5</revenue> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/Morpheus/icons/dist/brand/Apple.png</logo> - <segment>deviceBrand==Apple</segment> - </row> - <row> <label>Samsung</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml index 6dd1e6a37c..5b4bccdd97 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getModel_month.xml @@ -2,26 +2,46 @@ <result> <row> <label>Unknown</label> - <nb_visits>40</nb_visits> - <nb_actions>45</nb_actions> - <max_actions>3</max_actions> - <sum_visit_length>549</sum_visit_length> - <bounce_count>36</bounce_count> + <nb_visits>23</nb_visits> + <nb_actions>24</nb_actions> + <max_actions>2</max_actions> + <sum_visit_length>242</sum_visit_length> + <bounce_count>22</bounce_count> <goals> <row idgoal='1'> - <nb_conversions>36</nb_conversions> - <nb_visits_converted>36</nb_visits_converted> - <revenue>180</revenue> + <nb_conversions>20</nb_conversions> + <nb_visits_converted>20</nb_visits_converted> + <revenue>100</revenue> </row> </goals> - <nb_conversions>36</nb_conversions> - <revenue>180</revenue> - <sum_daily_nb_uniq_visitors>38</sum_daily_nb_uniq_visitors> - <sum_daily_nb_users>2</sum_daily_nb_users> + <nb_conversions>20</nb_conversions> + <revenue>100</revenue> + <sum_daily_nb_uniq_visitors>23</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <nb_visits_converted>0</nb_visits_converted> <segment>deviceBrand==Unknown;deviceModel==</segment> </row> <row> + <label>Apple - Unknown</label> + <nb_visits>17</nb_visits> + <nb_actions>21</nb_actions> + <max_actions>3</max_actions> + <sum_visit_length>307</sum_visit_length> + <bounce_count>14</bounce_count> + <goals> + <row idgoal='1'> + <nb_conversions>16</nb_conversions> + <nb_visits_converted>16</nb_visits_converted> + <revenue>80</revenue> + </row> + </goals> + <nb_conversions>16</nb_conversions> + <revenue>80</revenue> + <sum_daily_nb_uniq_visitors>15</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> + <segment>deviceBrand==Apple;deviceModel==</segment> + </row> + <row> <label>HTC - Vision</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> 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 b9adba753c..d3a1321f4b 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -545,7 +545,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.9</operatingSystem> <operatingSystemName>Mac</operatingSystemName> @@ -826,7 +826,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.9</operatingSystem> <operatingSystemName>Mac</operatingSystemName> @@ -979,7 +979,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.9</operatingSystem> <operatingSystemName>Mac</operatingSystemName> @@ -2229,7 +2229,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac</operatingSystem> <operatingSystemName>Mac</operatingSystemName> @@ -2349,7 +2349,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> @@ -2621,7 +2621,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.10</operatingSystem> <operatingSystemName>Mac</operatingSystemName> @@ -2927,7 +2927,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.10</operatingSystem> <operatingSystemName>Mac</operatingSystemName> @@ -3081,7 +3081,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.10</operatingSystem> <operatingSystemName>Mac</operatingSystemName> @@ -3209,7 +3209,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.10</operatingSystem> <operatingSystemName>Mac</operatingSystemName> @@ -4096,7 +4096,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> @@ -4220,7 +4220,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> @@ -4366,7 +4366,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> @@ -4523,7 +4523,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> @@ -5132,7 +5132,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> @@ -6216,7 +6216,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> @@ -6336,7 +6336,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> @@ -6456,7 +6456,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.8</operatingSystem> <operatingSystemName>Mac</operatingSystemName> @@ -7416,7 +7416,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> @@ -7536,7 +7536,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> @@ -7656,7 +7656,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> 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 cf6dc6b582..27892ad791 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 @@ -501,7 +501,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.9</operatingSystem> <operatingSystemName>Mac</operatingSystemName> @@ -771,7 +771,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.9</operatingSystem> <operatingSystemName>Mac</operatingSystemName> @@ -913,7 +913,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.9</operatingSystem> <operatingSystemName>Mac</operatingSystemName> @@ -2081,7 +2081,7 @@ <language>Unknown</language> <deviceType>Desktop</deviceType> <deviceTypeIcon>plugins/Morpheus/icons/dist/devices/desktop.png</deviceTypeIcon> - <deviceBrand>Unknown</deviceBrand> + <deviceBrand>Apple</deviceBrand> <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml index 414125203f..e82d588140 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml @@ -99,7 +99,7 @@ <category>Visitors</category> <name>Device brand</name> <segment>deviceBrand</segment> - <acceptedValues>3Q, 4Good, Acer, Ainol, Airness, Airties, Alcatel, Allview, Altech UEC, Amazon, Amoi, Apple, Archos, Arnova, ARRIS, Asus, Audiovox, Avvio, Axxion, Azumi Mobile, BangOlufsen, Barnes & Noble, BBK, Becker, Beetel, BenQ, BenQ-Siemens, BGH, Bird, Bitel, Blackview, Blaupunkt, Blu, Bmobile, Boway, bq, Bravis, Brondi, Bush, Capitel, Captiva, Carrefour, Casio, Cat, Celkon, Changhong, Cherry Mobile, China Mobile, CnM, Coby Kyros, Compal, Compaq, ConCorde, Condor, Coolpad, Cowon, CreNova, Cricket, Crius Mea, Crosscall, Cube, CUBOT, Cyrus, Danew, Datang, Dbtel, Dell, Denver, Desay, DEXP, Dicam, Digma, DMM, DNS, DoCoMo, Doogee, Doov, Dopod, Doro, Dune HD, E-Boda, Easypix, EBEST, ECS, EKO, Elephone, Energy Sistem, Ericsson, Ericy, Eton, eTouch, Evertek, Evolveo, Explay, Ezio, Ezze, Fairphone, Fly, Foxconn, Freetel, Fujitsu, Garmin-Asus, Gateway, Gemini, Gigabyte, Gigaset, Gionee, GOCLEVER, Goly, Google, Gradiente, Grundig, Haier, Hasee, Hi-Level, Hisense, Homtom, Hosin, HP, HTC, Huawei, Humax, Hyrican, Hyundai, i-Joy, i-mate, i-mobile, iBall, iBerry, IconBIT, Ikea, iKoMo, iNew, Infinix, Inkti, Innostream, INQ, Intek, Intex, Inverto, iOcean, iTel, JAY-Tech, Jiayu, Jolla, K-Touch, Karbonn, Kazam, KDDI, Kiano, Kingsun, Komu, Konka, Konrow, Koobee, KOPO, Koridy, KT-Tech, Kumai, Kyocera, Landvo, Lanix, Lava, LCT, LeEco, Lenco, Lenovo, Le Pan, Lexand, Lexibook, LG, Lingwin, Loewe, Logicom, LYF, M.T.T., Majestic, Manta Multimedia, Mecer, Mediacom, MediaTek, Medion, MEEG, Meizu, Memup, Metz, MEU, MicroMax, Microsoft, Mio, Mitsubishi, MIXC, MLLED, Mobistel, Modecom, Mofut, Motorola, Mpman, MSI, MyPhone, NEC, Neffos, Netgear, Newgen, Nexian, NextBook, NGM, Nikon, Nintendo, Noain, Noblex, Nokia, Nomi, Nous, Nvidia, O2, Odys, Onda, OnePlus, OPPO, Opsson, Orange, Ouki, OUYA, Overmax, Oysters, Palm, Panasonic, Pantech, PEAQ, Pentagram, Philips, phoneOne, Pioneer, Ployer, Point of View, Polaroid, PolyPad, Pomp, Positivo, PPTV, Prestigio, ProScan, PULID, Qilive, QMobile, Qtek, Quechua, Ramos, RCA Tablets, Readboy, Rikomagic, RIM, Roku, Rover, Sagem, Samsung, Sanyo, Sega, Selevision, Sencor, Sendo, Senseit, SFR, Sharp, Siemens, Skyworth, Smart, Smartfren, Smartisan, Softbank, Sony, Sony Ericsson, Spice, Star, STK, Stonex, Storex, Sumvision, SunVan, SuperSonic, Supra, Symphony, T-Mobile, TB Touch, TCL, TechniSat, TechnoTrend, Teclast, Tecno Mobile, Telefunken, Telenor, Telit, Tesco, Tesla, teXet, ThL, Thomson, TIANYU, TiPhone, Tolino, Toplux, Toshiba, TrekStor, Trevi, Tunisie Telecom, Turbo-X, TVC, Ulefone, UMIDIGI, Uniscope, Unknown, Unowhy, UTStarcom, Vastking, Vertu, Verykool, Vestel, Videocon, Videoweb, ViewSonic, Vitelcom, Vivo, Vizio, VK Mobile, Vodafone, Voto, Voxtel, Walton, Web TV, WellcoM, Wexler, Wiko, Wileyfox, Wolder, Wolfgang, Wonu, Woxter, Xiaomi, Xolo, Yarvik, Ytone, Yuandao, Yusun, Zeemi, Zen, Zonda, Zopo, ZTE</acceptedValues> + <acceptedValues>3Q, 4Good, Acer, Ainol, Airness, Airties, Alcatel, Allview, Altech UEC, Amazon, Amoi, Apple, Archos, Arnova, ARRIS, Asus, Audiovox, Avvio, Axxion, Azumi Mobile, BangOlufsen, Barnes & Noble, BBK, Becker, Beetel, BenQ, BenQ-Siemens, BGH, Bird, Bitel, Blackview, Blaupunkt, Blu, Bmobile, Boway, bq, Bravis, Brondi, Bush, Capitel, Captiva, Carrefour, Casio, Cat, Celkon, Changhong, Cherry Mobile, China Mobile, CnM, Coby Kyros, Compal, Compaq, ConCorde, Condor, Coolpad, Cowon, CreNova, Cricket, Crius Mea, Crosscall, Cube, CUBOT, Cyrus, Danew, Datang, Dbtel, Dell, Denver, Desay, DEXP, Dicam, Digma, DMM, DNS, DoCoMo, Doogee, Doov, Dopod, Doro, Dune HD, E-Boda, Easypix, EBEST, ECS, EKO, Elephone, Energy Sistem, Ericsson, Ericy, Eton, eTouch, Evertek, Evolveo, Explay, Ezio, Ezze, Fairphone, Fly, Foxconn, Freetel, Fujitsu, Garmin-Asus, Gateway, Gemini, Gigabyte, Gigaset, Gionee, GOCLEVER, Goly, Google, Gradiente, Grundig, Haier, HannSpree, Hasee, Hi-Level, Hisense, Homtom, Hosin, HP, HTC, Huawei, Humax, Hyrican, Hyundai, i-Joy, i-mate, i-mobile, iBall, iBerry, IconBIT, Ikea, iKoMo, iNew, Infinix, Inkti, Innostream, INQ, Intek, Intex, Inverto, iOcean, iTel, JAY-Tech, Jiayu, Jolla, K-Touch, Karbonn, Kazam, KDDI, Kiano, Kingsun, Komu, Konka, Konrow, Koobee, KOPO, Koridy, KT-Tech, Kumai, Kyocera, Landvo, Lanix, Lava, LCT, LeEco, Lenco, Lenovo, Le Pan, Lexand, Lexibook, LG, Lingwin, Loewe, Logicom, LYF, M.T.T., Majestic, Manta Multimedia, Mecer, Mediacom, MediaTek, Medion, MEEG, Meizu, Memup, Metz, MEU, MicroMax, Microsoft, Mio, Mitsubishi, MIXC, MLLED, Mobistel, Modecom, Mofut, Motorola, Mpman, MSI, MyPhone, NEC, Neffos, Netgear, Newgen, Nexian, NextBook, NGM, Nikon, Nintendo, Noain, Noblex, Nokia, Nomi, Nous, Nvidia, O2, Obi, Odys, Onda, OnePlus, OPPO, Opsson, Orange, Ouki, OUYA, Overmax, Oysters, Palm, Panasonic, Pantech, PEAQ, Pentagram, Philips, phoneOne, Pioneer, Ployer, Point of View, Polaroid, PolyPad, Pomp, Positivo, PPTV, Prestigio, ProScan, PULID, Qilive, QMobile, Qtek, Quechua, Ramos, RCA Tablets, Readboy, Rikomagic, RIM, Roku, Rover, Sagem, Samsung, Sanyo, Sega, Selevision, Sencor, Sendo, Senseit, SFR, Sharp, Siemens, Skyworth, Smart, Smartfren, Smartisan, Softbank, Sony, Sony Ericsson, Spice, Star, STK, Stonex, Storex, Sumvision, SunVan, SuperSonic, Supra, Symphony, T-Mobile, TB Touch, TCL, TechniSat, TechnoTrend, Teclast, Tecno Mobile, Telefunken, Telenor, Telit, Tesco, Tesla, teXet, ThL, Thomson, TIANYU, TiPhone, Tolino, Toplux, Toshiba, TrekStor, Trevi, Tunisie Telecom, Turbo-X, TVC, Ulefone, UMIDIGI, Uniscope, Unknown, Unowhy, UTStarcom, Vastking, Vertu, Verykool, Vestel, Videocon, Videoweb, ViewSonic, Vitelcom, Vivo, Vizio, VK Mobile, Vodafone, Voto, Voxtel, Walton, Web TV, WellcoM, Wexler, Wiko, Wileyfox, Wolder, Wolfgang, Wonu, Woxter, Xiaomi, Xolo, Yarvik, Ytone, Yuandao, Yusun, Zeemi, Zen, Zonda, Zopo, ZTE</acceptedValues> </row> <row> <type>dimension</type> |
