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

3588 Commits

Author SHA1 Message Date
Volodymyr Babak
cfc900c52c Added check if dashboard or rule chain is assigned to edge for edges older 3.6.0 2023-09-07 18:05:31 +03:00
ViacheslavKlimov
1aaa017d92 Add ports configs for SNMP transport to Docker scripts 2023-09-07 13:28:32 +03:00
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
Andrew Shvayka
78d47a99b0
Merge pull request #8788 from dashevchenko/new_efento_messages 
Added new messages handling for efento
 2023-09-05 15:43:38 +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
Volodymyr Babak
f4241fec85 Merge remote-tracking branch 'upstream/develop/3.5.2' into edge-misc-fixes-3.5.2 2023-09-05 11:07:50 +03:00
dashevchenko
e1a79cc594 compilation error fix 2023-09-05 11:00:59 +03:00
Andrii Landiak
e2520ae0f5 Provide edgeId for EdgeEventSourcingListener to handle cloud entities updated on Edge and process to other Edges 2023-09-05 09:38:48 +03:00
YevhenBondarenko
c4377f514f merge with develop/3.5.2 2023-09-04 20:00:39 +02:00
YevhenBondarenko
15d53a95cc added ON DELETE CASCADE and improvements 2023-09-04 19:45:57 +02:00
dashevchenko
95b1f5fc95 moved efento protos to proto/efento 2023-09-04 19:38:32 +03:00
Andrew Shvayka
436f140d8b
Merge pull request #8873 from smatvienko-tb/hotfix/tbdate_toisoformat_sync 
[3.5.2] TbDate toISOString sync as SimpleDateFormat required
 2023-09-04 18:59:24 +03: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
c783e44ac6 UI: Add widget panel: implement all widgets mode. 2023-09-04 18:04:20 +03:00
dashevchenko
550b67b451 renamed proto directory to efento-proto 2023-09-04 17:10:42 +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
dashevchenko
b3f78e3e56 added support for new measurement type (PULSE_CNT) 2023-08-30 12:12:41 +03:00
Volodymyr Babak
bc7ef38ee6 Edge dashboard msg - added isMobileHide and mobileOrder 2023-08-29 16:45:18 +03:00
ViacheslavKlimov
724300c076 Fix tenant profile Java serialization; add test 2023-08-29 15:41:35 +03:00
Volodymyr Babak
ef29f52abd Added image for edge dashboard msg 2023-08-29 13:40:06 +03:00
Volodymyr Babak
c408eb611a Added deprecated and alias fields to widget type rpc msg 2023-08-29 13:22:25 +03:00
Sergey Matvienko
cfe79cc445 AbstractScriptInvokeService: tenantId added to the log on script invocation blocked 2023-08-28 19:12:33 +02:00
Igor Kulikov
acdf5ad48c Implement ability to move widget types between widget bundles. Ability to deprecate widget type. 2023-08-28 18:54:12 +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
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
imbeacon
c4d12c6ba9 Refactored DefaultTbAlarmService, added improvements for alarm unassignment on user removing, updated namings and tests. 2023-08-18 12:03:27 +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
80f80496df Merge with master 2023-08-17 14:14:13 +03:00
Andrew Shvayka
b36d7c1bcd
Merge pull request #9089 from thingsboard/improvements/version-control 
Fixes for Version Control
 2023-08-17 13:54:34 +03:00
Andrii Shvaika
ca6095402f Merge with master 2023-08-17 12:19:02 +03:00
Andrew Shvayka
a7eae9dbac
Merge pull request #8988 from thingsboard/feature/update-tenant-profile-isolation 
Isolated processing improvements
 2023-08-16 18:32:58 +03:00
ViacheslavKlimov
8a023e9655 Merge with develop/3.5.2 2023-08-16 18:11:45 +03:00