Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Giehl <stefan@matomo.org>2020-12-07 18:21:20 +0300
committerGitHub <noreply@github.com>2020-12-07 18:21:20 +0300
commit28efeafae6c9540060f39a5e1f76b4da3ad6c8bc (patch)
tree150650e4ffd9c1a0d015f8446a903ade478da112 /plugins
parent2ff0bf2194dea0a62474a60f7209f420dc5cda07 (diff)
updates device detector to 4.0.2 (#16900)
* updates device detector to 4.0.2 * Adds missing device type peripheral and update tests * submodule update * updates icon submodule * update expected ui files
Diffstat (limited to 'plugins')
-rw-r--r--plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml4
-rw-r--r--plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserName__API.getSuggestedValuesForSegment.xml16
-rw-r--r--plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceModel__API.getSuggestedValuesForSegment.xml2
-rw-r--r--plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceType__API.getSuggestedValuesForSegment.xml1
-rw-r--r--plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemName__API.getSuggestedValuesForSegment.xml2
-rw-r--r--plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_range_archive__DevicesDetection.getType_range.xml6
m---------plugins/CustomVariables0
-rw-r--r--plugins/DevicesDetection/functions.php1
-rw-r--r--plugins/DevicesDetection/lang/en.json1
-rw-r--r--plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getModel_day.xml4
-rw-r--r--plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml6
m---------plugins/Morpheus/icons0
12 files changed, 38 insertions, 5 deletions
diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
index e4a75f4309..2a27148849 100644
--- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml
@@ -6337,7 +6337,7 @@
<deviceType>Phablet</deviceType>
<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/phablet.png</deviceTypeIcon>
<deviceBrand>Samsung</deviceBrand>
- <deviceModel>GALAXY Note 3</deviceModel>
+ <deviceModel>Galaxy Note 3</deviceModel>
<operatingSystem>Android 4.3</operatingSystem>
<operatingSystemName>Android</operatingSystemName>
<operatingSystemIcon>plugins/Morpheus/icons/dist/os/AND.png</operatingSystemIcon>
@@ -6969,7 +6969,7 @@
<deviceType>Phablet</deviceType>
<deviceTypeIcon>plugins/Morpheus/icons/dist/devices/phablet.png</deviceTypeIcon>
<deviceBrand>Samsung</deviceBrand>
- <deviceModel>GALAXY Note 3</deviceModel>
+ <deviceModel>Galaxy Note 3</deviceModel>
<operatingSystem>Android 4.3</operatingSystem>
<operatingSystemName>Android</operatingSystemName>
<operatingSystemIcon>plugins/Morpheus/icons/dist/os/AND.png</operatingSystemIcon>
diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserName__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserName__API.getSuggestedValuesForSegment.xml
index 3745d78ddd..8b65b68e50 100644
--- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserName__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_browserName__API.getSuggestedValuesForSegment.xml
@@ -34,9 +34,11 @@
<row>Bunjalloo</row>
<row>B-Line</row>
<row>Blue Browser</row>
+ <row>Borealis Navigator</row>
<row>Brave</row>
<row>BriskBard</row>
<row>BrowseX</row>
+ <row>Browzar</row>
<row>Camino</row>
<row>CCleaner</row>
<row>Centaury</row>
@@ -60,6 +62,7 @@
<row>Cyberfox</row>
<row>Cheshire</row>
<row>Crusta</row>
+ <row>Crazy Browser</row>
<row>Cunaguaro</row>
<row>Chrome Webview</row>
<row>dbrowser</row>
@@ -95,6 +98,7 @@
<row>Fireweb Navigator</row>
<row>FreeU</row>
<row>Galeon</row>
+ <row>Ghostery Privacy Browser</row>
<row>Glass Browser</row>
<row>Google Earth</row>
<row>GOG Galaxy</row>
@@ -126,6 +130,7 @@
<row>Kapiko</row>
<row>Kinza</row>
<row>Kiwi</row>
+ <row>Kode Browser</row>
<row>Kylo</row>
<row>Kazehakase</row>
<row>Cheetah Browser</row>
@@ -152,8 +157,11 @@
<row>Minimo</row>
<row>Mint Browser</row>
<row>Maxthon</row>
+ <row>MxNitro</row>
<row>Mypal</row>
<row>Monument Browser</row>
+ <row>MAUI WAP Browser</row>
+ <row>NFS Browser</row>
<row>Nokia Browser</row>
<row>Nokia OSS Browser</row>
<row>Nokia Ovi Browser</row>
@@ -195,8 +203,10 @@
<row>Palm WebPro</row>
<row>Palmscape</row>
<row>Phoenix</row>
+ <row>Phoenix Browser</row>
<row>Polaris</row>
<row>Polarity</row>
+ <row>PrivacyWall</row>
<row>Microsoft Edge</row>
<row>QQ Browser Mini</row>
<row>QQ Browser</row>
@@ -221,6 +231,9 @@
<row>Skyfire</row>
<row>Seraphic Sraf</row>
<row>Sleipnir</row>
+ <row>Slimjet</row>
+ <row>7Star</row>
+ <row>Smart Lenovo Browser</row>
<row>Snowshoe</row>
<row>Sogou Mobile Browser</row>
<row>Splash</row>
@@ -229,6 +242,7 @@
<row>SuperBird</row>
<row>Super Fast Browser</row>
<row>surf</row>
+ <row>Stargon</row>
<row>START Internet Browser</row>
<row>Steam In-Game Overlay</row>
<row>Streamy</row>
@@ -247,6 +261,7 @@
<row>UC Browser</row>
<row>UC Browser Mini</row>
<row>UC Browser Turbo</row>
+ <row>UR Browser</row>
<row>Uzbl</row>
<row>Vivaldi</row>
<row>vivo Browser</row>
@@ -263,6 +278,7 @@
<row>Yandex Browser</row>
<row>Yandex Browser Lite</row>
<row>Yaani Browser</row>
+ <row>Yolo Browser</row>
<row>Xiino</row>
<row>Xvast</row>
<row>Zvu</row>
diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceModel__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceModel__API.getSuggestedValuesForSegment.xml
index 3e7a99414c..ef4f82df12 100644
--- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceModel__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceModel__API.getSuggestedValuesForSegment.xml
@@ -2,7 +2,7 @@
<result>
<row>Generic Desktop</row>
<row>Desire</row>
- <row>GALAXY Note 3</row>
+ <row>Galaxy Note 3</row>
<row>Nexus 4</row>
<row>Xperia Tablet S</row>
</result> \ No newline at end of file
diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceType__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceType__API.getSuggestedValuesForSegment.xml
index 73bbf36546..1d6113ee2b 100644
--- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceType__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_deviceType__API.getSuggestedValuesForSegment.xml
@@ -13,4 +13,5 @@
<row>phablet</row>
<row>smart speaker</row>
<row>wearable</row>
+ <row>peripheral</row>
</result> \ No newline at end of file
diff --git a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemName__API.getSuggestedValuesForSegment.xml b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemName__API.getSuggestedValuesForSegment.xml
index e63237eac3..53610fa22e 100644
--- a/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemName__API.getSuggestedValuesForSegment.xml
+++ b/plugins/API/tests/System/expected/test_AutoSuggestAPITest_operatingSystemName__API.getSuggestedValuesForSegment.xml
@@ -42,6 +42,7 @@
<row>MorphOS</row>
<row>NetBSD</row>
<row>MTK / Nucleus</row>
+ <row>MRE</row>
<row>Nintendo</row>
<row>Nintendo Mobile</row>
<row>OS/2</row>
@@ -52,6 +53,7 @@
<row>PlayStation</row>
<row>Red Hat</row>
<row>RISC OS</row>
+ <row>Rosa</row>
<row>Remix OS</row>
<row>RazoDroiD</row>
<row>Sabayon</row>
diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_range_archive__DevicesDetection.getType_range.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_range_archive__DevicesDetection.getType_range.xml
index 0358d288a6..70f93c6789 100644
--- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_range_archive__DevicesDetection.getType_range.xml
+++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_range_archive__DevicesDetection.getType_range.xml
@@ -90,6 +90,12 @@
<logo>plugins/Morpheus/icons/dist/devices/feature_phone.png</logo>
</row>
<row>
+ <label>Peripheral</label>
+ <nb_visits>0</nb_visits>
+ <segment>deviceType==peripheral</segment>
+ <logo>plugins/Morpheus/icons/dist/devices/peripheral.png</logo>
+ </row>
+ <row>
<label>Phablet</label>
<nb_visits>0</nb_visits>
<segment>deviceType==phablet</segment>
diff --git a/plugins/CustomVariables b/plugins/CustomVariables
-Subproject ab8b1332d4c2a94d3e1c0aefc5b1785db86801a
+Subproject 4b93427ec12b1172c6585533d6f03528e152fbc
diff --git a/plugins/DevicesDetection/functions.php b/plugins/DevicesDetection/functions.php
index e509123721..5bef26bfb7 100644
--- a/plugins/DevicesDetection/functions.php
+++ b/plugins/DevicesDetection/functions.php
@@ -178,6 +178,7 @@ function getDeviceTypeLabel($label)
'portable media player' => 'DevicesDetection_PortableMediaPlayer',
'smart speaker' => 'DevicesDetection_SmartSpeaker',
'wearable' => 'DevicesDetection_Wearable',
+ 'peripheral' => 'DevicesDetection_Peripheral',
);
$deviceTypes = DeviceParser::getAvailableDeviceTypes();
diff --git a/plugins/DevicesDetection/lang/en.json b/plugins/DevicesDetection/lang/en.json
index 466edb59f7..934c11a1fe 100644
--- a/plugins/DevicesDetection/lang/en.json
+++ b/plugins/DevicesDetection/lang/en.json
@@ -46,6 +46,7 @@
"GenericDevice": "Generic %s",
"MobileDevice": "Mobile device",
"Tablet": "Tablet",
+ "Peripheral": "Peripheral",
"Phablet": "Phablet",
"TV": "Tv",
"UserAgent": "User-Agent",
diff --git a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getModel_day.xml b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getModel_day.xml
index 1e4dc2c09c..5b3523672f 100644
--- a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getModel_day.xml
+++ b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getModel_day.xml
@@ -118,7 +118,7 @@
<segment>deviceBrand==Philips;deviceModel==Blu-ray+Player+%28BDP5600%29</segment>
</row>
<row>
- <label>Samsung - GALAXY Tab 3 8.0&quot; WiFi</label>
+ <label>Samsung - Galaxy Tab 3 8.0&quot; WiFi</label>
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_visits>1</nb_visits>
<nb_actions>1</nb_actions>
@@ -127,7 +127,7 @@
<sum_visit_length>0</sum_visit_length>
<bounce_count>1</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
- <segment>deviceBrand==Samsung;deviceModel==GALAXY+Tab+3+8.0%22+WiFi</segment>
+ <segment>deviceBrand==Samsung;deviceModel==Galaxy+Tab+3+8.0%22+WiFi</segment>
</row>
<row>
<label>ViewSonic - ViewPad 7e</label>
diff --git a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml
index 6a22c1926e..6aa976d8f7 100644
--- a/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml
+++ b/plugins/DevicesDetection/tests/System/expected/test___DevicesDetection.getType_day.xml
@@ -125,6 +125,12 @@
<logo>plugins/Morpheus/icons/dist/devices/feature_phone.png</logo>
</row>
<row>
+ <label>Peripheral</label>
+ <nb_visits>0</nb_visits>
+ <segment>deviceType==peripheral</segment>
+ <logo>plugins/Morpheus/icons/dist/devices/peripheral.png</logo>
+ </row>
+ <row>
<label>Phablet</label>
<nb_visits>0</nb_visits>
<segment>deviceType==phablet</segment>
diff --git a/plugins/Morpheus/icons b/plugins/Morpheus/icons
-Subproject 15224df421f2e89084b4f5e81cfd788b251117a
+Subproject e96ef33bf490794829831cbb795fd4ea6725969