diff --git a/composer.lock b/composer.lock index f437e183e15..528dfe49cbc 100644 --- a/composer.lock +++ b/composer.lock @@ -212,38 +212,41 @@ }, { "name": "matomo/referrer-spam-blacklist", - "version": "1.1.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/matomo-org/referrer-spam-blacklist.git", - "reference": "fdad7e12ad33a98e085c44255f3b208dca3e66ea" + "reference": "aeadc82fa18636f6e578d36cdfb709f2a85f440d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/matomo-org/referrer-spam-blacklist/zipball/fdad7e12ad33a98e085c44255f3b208dca3e66ea", - "reference": "fdad7e12ad33a98e085c44255f3b208dca3e66ea", + "url": "https://api.github.com/repos/matomo-org/referrer-spam-blacklist/zipball/aeadc82fa18636f6e578d36cdfb709f2a85f440d", + "reference": "aeadc82fa18636f6e578d36cdfb709f2a85f440d", "shasum": "" }, + "replace": { + "piwik/referrer-spam-blacklist": "*" + }, "type": "library", "notification-url": "https://packagist.org/downloads/", "license": [ - "Public Domain" + "CC0-1.0" ], "description": "Community-contributed list of referrer spammers", - "time": "2018-01-29T17:33:37+00:00" + "time": "2018-01-29T18:12:41+00:00" }, { "name": "matomo/searchengine-and-social-list", - "version": "1.4.1", + "version": "1.4.2", "source": { "type": "git", "url": "https://github.com/matomo-org/searchengine-and-social-list.git", - "reference": "7f0bd9f27196885544813d5c847142c9f411f9ab" + "reference": "70d35969cbd5812f015db251988080c579327814" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/matomo-org/searchengine-and-social-list/zipball/7f0bd9f27196885544813d5c847142c9f411f9ab", - "reference": "7f0bd9f27196885544813d5c847142c9f411f9ab", + "url": "https://api.github.com/repos/matomo-org/searchengine-and-social-list/zipball/70d35969cbd5812f015db251988080c579327814", + "reference": "70d35969cbd5812f015db251988080c579327814", "shasum": "" }, "replace": { @@ -255,7 +258,7 @@ "CC0-1.0" ], "description": "Search engine and social network definitions used by Matomo (formerly Piwik)", - "time": "2018-01-29T18:13:08+00:00" + "time": "2018-02-20T14:04:26+00:00" }, { "name": "monolog/monolog", @@ -823,16 +826,16 @@ }, { "name": "piwik/device-detector", - "version": "3.9.1", + "version": "3.10.1", "source": { "type": "git", "url": "https://github.com/matomo-org/device-detector.git", - "reference": "caf2d15349caffd94a8cfe46edf4061fbc99f70b" + "reference": "76a9e32ac6842239ac66a3877079cbfb84f29789" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/matomo-org/device-detector/zipball/caf2d15349caffd94a8cfe46edf4061fbc99f70b", - "reference": "caf2d15349caffd94a8cfe46edf4061fbc99f70b", + "url": "https://api.github.com/repos/matomo-org/device-detector/zipball/76a9e32ac6842239ac66a3877079cbfb84f29789", + "reference": "76a9e32ac6842239ac66a3877079cbfb84f29789", "shasum": "" }, "require": { @@ -857,23 +860,23 @@ }, "notification-url": "https://packagist.org/downloads/", "license": [ - "LGPL-3.0+" + "LGPL-3.0-or-later" ], "authors": [ { - "name": "The Piwik Team", - "email": "hello@piwik.org", - "homepage": "http://piwik.org/the-piwik-team/" + "name": "The Matomo Team", + "email": "hello@matomo.org", + "homepage": "https://matomo.org/team/" } ], "description": "The Universal Device Detection library, that parses User Agents and detects devices (desktop, tablet, mobile, tv, cars, console, etc.), clients (browsers, media players, mobile apps, feed readers, libraries, etc), operating systems, devices, brands and models.", - "homepage": "http://piwik.org", + "homepage": "https://matomo.org", "keywords": [ "devicedetection", "parser", "useragent" ], - "time": "2017-12-04T09:56:31+00:00" + "time": "2018-03-23T15:19:45+00:00" }, { "name": "piwik/ini", @@ -967,12 +970,12 @@ ], "authors": [ { - "name": "The Piwik Team", + "name": "The Matomo Team", "email": "hello@piwik.org", "homepage": "http://piwik.org/the-piwik-team/" } ], - "description": "PHP Client for Piwik Analytics Tracking API", + "description": "PHP Client for Matomo Analytics Tracking API", "homepage": "http://piwik.org", "keywords": [ "analytics", @@ -1639,7 +1642,7 @@ "performance", "profiling" ], - "time": "2015-02-26T14:37:51+00:00" + "time": "2015-02-26 14:37:51" }, { "name": "guzzle/guzzle", diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions index 8411af5171d..258f8c3ba16 160000 --- a/plugins/CustomDimensions +++ b/plugins/CustomDimensions @@ -1 +1 @@ -Subproject commit 8411af5171dabd2d192a7a28f628a0df3f77c272 +Subproject commit 258f8c3ba163935f55f045d47e30f7a883a9c4be diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserEngine__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserEngine__API.getSuggestedValuesForSegment.xml index 27415a7b8f2..f056787aae5 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserEngine__API.getSuggestedValuesForSegment.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest_browserEngine__API.getSuggestedValuesForSegment.xml @@ -12,4 +12,5 @@ KHTML NetFront Edge + NetSurf \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml index 17a0e4774ef..3d1b6a74aee 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 @@ Visitors Device brand deviceBrand - 3Q, 4Good, Acer, Ainol, Airness, Airties, Alcatel, Allview, Altech UEC, Amazon, Amoi, Apple, Archos, Arnova, ARRIS, Asus, Audiovox, Avvio, Axxion, BangOlufsen, Barnes & Noble, BBK, Becker, Beetel, BenQ, BenQ-Siemens, Bird, 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, Dune HD, E-Boda, Easypix, EBEST, ECS, 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, 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, Stonex, Storex, Sumvision, SunVan, SuperSonic, Supra, Symphony, T-Mobile, TB Touch, TCL, TechniSat, TechnoTrend, Tecno Mobile, Telefunken, Telenor, Telit, Tesco, Tesla, teXet, ThL, Thomson, TIANYU, TiPhone, Tolino, Toplux, Toshiba, TrekStor, Trevi, Tunisie Telecom, Turbo-X, TVC, UMIDIGI, Uniscope, Unknown, Unowhy, UTStarcom, Vastking, Vertu, 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 + 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 dimension