Merge branch 'release.24.10' into release.24.12

# Conflicts:
#	bin/scripts/device_list/generate.js
#	bin/scripts/device_list/supported_devices.csv
#	frontend/express/public/javascripts/countly/countly.device.list.js

Author: ArtursKadikis

bin/scripts/device_list/amazon.json

@@ -79,6 +79,8 @@
     "AFTEU011":"Fire TV (Grundig Vision 6 HD 2019)",
     "AFTEU014":"Fire TV (Grundig Vision 7 4K 2019)",
     "AFTEUFF014":"Fire TV (Grundig OLED 4K 2019)",
+    "AFTDEC012E":"TCL S4/S5/Q5/Q6 Series 4K UHD HDR LED (2024)",
+    "AFTMA475B1":"TCL 4K Smart Fire TV (2024)",
     "AFTLFT962X3":"Stellantis",
     "AFTLBT962E2":"BMW (2022)",
     "AEOHY":"Echo Show 15 (2021)"

bin/scripts/device_list/apple.json

@@ -60,6 +60,7 @@
     "iPhone17,2":"iPhone 16 Pro Max",
     "iPhone17,3":"iPhone 16",
     "iPhone17,4":"iPhone 16 Plus",
+    "iPhone17,5":"iPhone 16e",
     "iPod1,1":"iPod touch 1G",
     "iPod2,1":"iPod touch 2G",
     "iPod3,1":"iPod touch 3G",
@@ -150,14 +151,14 @@
     "iPad14,6":"iPad Pro 12.9 inch 6th Gen",
     "iPad14,8":"iPad Air 6th Gen",
     "iPad14,9":"iPad Air 6th Gen",
-    "iPad16,3-A":"iPad Pro 11 inch 5th Gen",
-    "iPad16,3-B":"iPad Pro 11 inch 5th Gen",
-    "iPad16,4-A":"iPad Pro 11 inch 5th Gen",
-    "iPad16,4-B":"iPad Pro 11 inch 5th Gen",
-    "iPad16,5-A":"iPad Pro 12.9 inch 7th Gen",
-    "iPad16,5-B":"iPad Pro 12.9 inch 7th Gen",
-    "iPad16,6-A":"iPad Pro 12.9 inch 7th Gen",
-    "iPad16,6-B":"iPad Pro 12.9 inch 7th Gen",
+    "iPad14,10":"iPad Air 7th Gen",
+    "iPad14,11":"iPad Air 7th Gen",
+    "iPad16,1":"iPad mini 7th Gen (WiFi)",
+    "iPad16,2":"iPad mini 7th Gen (WiFi+Cellular)",
+    "iPad16,3":"iPad Pro 11 inch 5th Gen",
+    "iPad16,4":"iPad Pro 11 inch 5th Gen",
+    "iPad16,5":"iPad Pro 12.9 inch 7th Gen",
+    "iPad16,6":"iPad Pro 12.9 inch 7th Gen",
     "Watch1,1":"Apple Watch (1st Gen) 38mm",
     "Watch1,2":"Apple Watch (1st Gen) 42mm",
     "Watch2,6":"Apple Watch Series 1 38mm",
@@ -202,6 +203,10 @@
     "Watch7,3":"Apple Watch Series 9 41mm case (GPS+Cellular)",
     "Watch7,4":"Apple Watch Series 9 45mm case (GPS+Cellular)",
     "Watch7,5":"Apple Watch Ultra 2",
+    "Watch7,8":"Apple Watch Series 10 (42mm) GPS",
+    "Watch7,9":"Apple Watch Series 10 (46mm) GPS",
+    "Watch7,10":"Apple Watch Series 10 (42mm) GPS + Cellular",
+    "Watch7,11":"Apple Watch Series 10 (46mm) GPS + Cellular",
     "AppleTV2,1":"Apple TV (2nd generation)",
     "AppleTV3,1":"Apple TV (3rd generation)",
     "AppleTV3,2":"Apple TV (3rd generation) (Rev)",
@@ -340,5 +345,14 @@
     "Mac13,2":"Mac Studio (2022)",
     "Mac13,1":"Mac Studio (2022)",
     "Mac14,14":"Mac Studio (2023) Thunderbolt",
-    "Mac14,13":"Mac Studio (2023) USB-C"
+    "Mac14,13":"Mac Studio (2023) USB-C",
+    "Mac16,3":"iMac (24-inch, 2024, Four ports)",
+    "Mac16,2":"iMac (24-inch, 2024, Two ports)",
+    "Mac16,1":"MacBook Pro (14-inch, 2024)",
+    "Mac16,6":"MacBook Pro (14-inch, 2024)",
+    "Mac16,8":"MacBook Pro (16-inch, 2024)",
+    "Mac16,7":"MacBook Pro (16-inch, 2024)",
+    "Mac16,5":"MacBook Pro (16-inch, 2024)",
+    "Mac16,10":"Mac mini (2024)",
+    "Mac16,11":"Mac mini (2024)"
 }

bin/scripts/device_list/generate.js

@@ -1,8 +1,7 @@
 // run as 
 // node generate.js > ../../../frontend/express/public/javascripts/countly/countly.device.list.js
-// resulting file should be copied to "/frontend/express/public/javascripts/countly"
 
-//https://www.theiphonewiki.com/wiki/Models
+//https://www.theiphonewiki.com/wiki/Models 
 //https://gist.github.com/adamawolf/3048717
 //scrape_mac_devices.txt
 var devices = require("./apple.json");
@@ -23,6 +22,7 @@ for (var i in amazon) {
 process.stderr.write("Starting CSV parsing\n");
 var csv = require('csvtojson');
 csv()
+//Shift + Cmd + P -> Convert Encoding -> Save with encoding -> UTF-8
 //from https://support.google.com/googleplay/answer/1727131?hl=en-GB
     .fromFile("./supported_devices.csv")
     .on('json', (jsonObj)=>{