Merge remote-tracking branch 'upstream/master'

thingsboard · Nov 22, 2024 · 14406ab · 14406ab
2 parents 0ea2094 + 72c6a37
commit 14406ab
Show file tree

Hide file tree

Showing 897 changed files with 31,338 additions and 4,527 deletions.
diff --git a/application/src/main/data/json/demo/dashboards/firmware.json b/application/src/main/data/json/demo/dashboards/firmware.json
@@ -2600,6 +2600,6 @@
       "showUpdateDashboardImage": false
     }
   },
-  "externalId": null,
-  "name": "Firmware"
+  "name": "Firmware",
+  "resources": []
 }
diff --git a/application/src/main/data/json/demo/dashboards/rule_engine_statistics.json b/application/src/main/data/json/demo/dashboards/rule_engine_statistics.json
@@ -1139,5 +1139,6 @@
     },
     "filters": {}
   },
-  "name": "Rule Engine Statistics"
+  "name": "Rule Engine Statistics",
+  "resources": []
 }
diff --git a/application/src/main/data/json/demo/dashboards/software.json b/application/src/main/data/json/demo/dashboards/software.json
@@ -2600,6 +2600,6 @@
       "showUpdateDashboardImage": false
     }
   },
-  "externalId": null,
-  "name": "Software"
+  "name": "Software",
+  "resources": []
 }
diff --git a/application/src/main/data/json/demo/dashboards/thermostats.json b/application/src/main/data/json/demo/dashboards/thermostats.json
diff --git a/...ion/src/main/data/json/system/scada_symbols/bottom-right-elbow-connector-hp.svg b/...ion/src/main/data/json/system/scada_symbols/bottom-right-elbow-connector-hp.svg
diff --git a/application/src/main/data/json/system/scada_symbols/bottom-tee-connector-hp.svg b/application/src/main/data/json/system/scada_symbols/bottom-tee-connector-hp.svg