dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,883 Commits 106 Branches 71 Tags
Commit Graph

1760 Commits

Author SHA1 Message Date
ViacheslavKlimov
f0c177ebd2 Merge remote-tracking branch 'origin/fix/snmp' into fix/snmp 
# Conflicts:
#	common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
 2023-09-07 13:11:53 +03:00
Viacheslav Klimov
e7b259ce8e
Merge branch 'develop/3.6' into fix/snmp 2023-09-07 13:03:48 +03:00
Maksym Dudnik
a1543f8095 Merge branch 'develop/3.6' of https://github.com/thingsboard/thingsboard into gateway_list 
 Conflicts:
	application/src/main/data/json/system/widget_bundles/gateway_widgets.json
 2023-09-06 15:45:08 +03:00
ShvaykaD
0489e94c1d Merge remote-tracking branch 'upstream/develop/3.6' into feature/rpc-sequential-strategies 2023-09-06 14:43:21 +03:00
Andrew Shvayka
333f41b94a
Merge pull request #9163 from smatvienko-tb/feature/validate_contains0x00 
[3.5.2] Device Asset name - Validate contains0x00 to prevent PSQLException: ERROR: invalid byte sequence for encoding "UTF8": 0x00
 2023-09-06 12:39:51 +03:00
Andrew Shvayka
ce3cbb78b1
Merge pull request #8825 from YevhenBondarenko/feature/alarm-types 
Alarm type auto-complete in the alarm filter
 2023-09-06 12:17:54 +03:00
Igor Kulikov
98c245e293 Switch to version 3.6.0 2023-09-05 18:28:15 +03:00
YevhenBondarenko
ad9fedaded merge with develop/3.5.2 2023-09-05 15:46:40 +02:00
Andrew Shvayka
db663cb5bc
Merge pull request #9035 from imbeacon/customer-removing-alarm-unassign 
Fix for alarm unassign on user or customer removed
 2023-09-05 16:07:53 +03:00
Sergey Matvienko
9b15cd609c StringUtils: contains0x00 implemented to prevent org.postgresql.util.PSQLException: ERROR: invalid byte sequence for encoding "UTF8": 0x00 2023-09-05 13:38:18 +02:00
dashevchenko
08f26bad5b fixed addSystemAlarmComment method 2023-09-05 12:43:38 +03:00
YevhenBondarenko
c4377f514f merge with develop/3.5.2 2023-09-04 20:00:39 +02:00
Andrew Shvayka
09b74dada9
Merge pull request #9157 from thingsboard/fix/tenant-profile-serialization 
Fix tenant profile update msg construction for Edge
 2023-09-04 18:49:51 +03:00
Igor Kulikov
875c8d526b Widget Bundles to Wudget Types Many to Many support for UI 2023-09-01 18:55:29 +03:00
Igor Kulikov
1fb9ba622e Widget -> Widget Bundle Many to Many support. 2023-08-31 12:09:42 +03:00
ViacheslavKlimov
724300c076 Fix tenant profile Java serialization; add test 2023-08-29 15:41:35 +03:00
ViacheslavKlimov
2109d36f7e Merge branch 'develop/3.5.2' into fix/snmp 
# Conflicts:
#	common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/service/DefaultTransportService.java
 2023-08-25 12:37:47 +03:00
YevhenBondarenko
ffa00bd94a refactoring due to comments 2023-08-22 16:59:01 +02:00
Andrii Landiak
85361c609a EntityStateListener: process entity broadcasting service to handle all event 2023-08-21 15:32:19 +03:00
YevhenBondarenko
ada9ff7b4e merge with develop/3.5.2 2023-08-18 16:48:48 +02:00
Igor Kulikov
67f12c0c2c Merge branch 'develop/3.5.2' into feature/widget-bundles 2023-08-18 16:15:17 +03:00
Igor Kulikov
c57cb2b754 Switch to unique widget type FQN. 2023-08-18 16:14:21 +03:00
imbeacon
64e60d43f0 Moved event listener to HouseKeeper service and added method to get representation from AlarmAssignee 2023-08-18 14:06:08 +03:00
Andrew Shvayka
e5658f68df
Merge pull request #9082 from imbeacon/feature/mqtt-topic-in-metadata-for-transport 
Feature/mqtt topic in metadata for transport
 2023-08-18 13:07:38 +03:00
Vladyslav_Prykhodko
35284eacd6 Merge branch 'feature/alarm-types' of github.com:YevhenBondarenko/thingsboard into YevhenBondarenko-feature/alarm-types 2023-08-18 12:52:21 +03:00
Maksym Dudnik
6fd269063b Merge branch 'develop/3.5.2' of https://github.com/thingsboard/thingsboard into gateway_list 
 Conflicts:
	ui-ngx/src/app/modules/home/components/widget/widget-components.module.ts
 2023-08-18 12:43:29 +03:00
Andrew Shvayka
3186789f3e
Merge pull request #9062 from AndriiLandiak/feature/edge-tenant-sync 
Feature/Edge: tenant and tenant profile sync up
 2023-08-17 17:35:42 +03:00
Andrew Shvayka
d9dee141c1
Merge pull request #8843 from thingsboard/feature/microsoft-teams-notifications 
Notifications via Microsoft Teams
 2023-08-17 17:33:14 +03:00
Andrii Shvaika
ca6095402f Merge with master 2023-08-17 12:19:02 +03:00
ViacheslavKlimov
8a023e9655 Merge with develop/3.5.2 2023-08-16 18:11:45 +03:00
Andrii Landiak
e53ea0f20b Merge remote-tracking branch 'upstream/develop/3.5.2' into feature/edge-tenant-sync 2023-08-16 13:44:45 +03:00
Andrew Shvayka
18a617472a
Merge pull request #8793 from thingsboard/feature/account-notification-settings 
User-level notification settings
 2023-08-15 17:45:49 +03:00
ViacheslavKlimov
d8896fe9dd Minor refactoring for user notification settings 2023-08-15 17:34:10 +03:00
YevhenBondarenko
1c17b00513 added alarm_types table 2023-08-15 16:00:14 +02:00
Andrew Shvayka
111fb0b472
Merge pull request #9065 from ShvaykaD/feature/add-internal-type-to-tb-msg 
Added internalType field to TbMsg to have the ability to use switch-cases instead of if-return blocks.
 2023-08-15 12:30:16 +03:00
imbeacon
fac2e013e2 Moved sending topic to MQTT transport only, parameter renamed to mqttTopic in metadata 2023-08-14 20:19:25 +03:00
ViacheslavKlimov
ce06ea10ca Use user settings api instead of additionalInfo 2023-08-14 17:43:39 +03:00
ViacheslavKlimov
655a2777e2 Merge branch 'develop/3.5.2' into feature/microsoft-teams-notifications 2023-08-14 17:00:01 +03:00
Andrii Shvaika
344ffb2e0b Merge with master 2023-08-14 15:02:17 +03:00
ShvaykaD
e1b18e7bed additional updates after review 2023-08-12 09:17:21 +03:00
ShvaykaD
ea5a855272 renamed custom msg type to NA 2023-08-11 20:34:17 +03:00
ShvaykaD
cebe1040d4 refactoring after review 2023-08-11 20:27:54 +03:00
Andrii Landiak
c164c68e12 Refactoring EdgeUtils to use enum map to match entity type with edge event type 2023-08-11 13:48:13 +03:00
ViacheslavKlimov
ae76f4ebbb Merge branch 'master' into feature/update-tenant-profile-isolation 2023-08-11 13:39:03 +03:00
Andrii Landiak
d56f6484b1 Add EntityType reference to EdgeEventType to match types for edge 2023-08-11 12:56:32 +03:00
imbeacon
355a92588a Added topic to metadata for attributes and telemetry messages 2023-08-11 11:48:24 +03:00
Andrii Landiak
9cae7c918b Improve EdgeUtils and EntityType to match with EdgeEntityType due to refacroting comments 2023-08-11 09:16:03 +03:00
ShvaykaD
3d5cfa0c2e added internal type to TbMsg to replace if-return blocks with switch-case 2023-08-10 15:46:01 +03:00
Andrii Landiak
9e1ab9abae
Feature/tenant profile edge sync 2023-08-10 10:38:38 +03:00
Vladyslav_Prykhodko
6e7869ffbe Merge remote-tracking branch 'upstream/develop/3.5.2' into feature/timeseries-api-improvements 2023-08-09 18:03:48 +03:00