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

1577 Commits

Author SHA1 Message Date
dashevchenko
e779c06ec1 changed AttributeService interface to accept AttributeScope instead of String 2023-12-18 14:20:29 +02:00
dashevchenko
b30bbf9d80 attribute_kv optimization: deleted entity_type column, updated attribute_type and attribute_key columns 2023-12-14 19:05:54 +02:00
Andrii Shvaika
0360e655ae Merge with master 2023-10-03 18:49:57 +03:00
Igor Kulikov
215fddc957 Fix conflicts 2023-09-28 18:19:40 +03:00
Igor Kulikov
91fc161c4f Implement widget types / bundles pagination and full text search. Add widget types tags. UI: Implement scroll grid component. 2023-09-28 18:16:20 +03:00
YevhenBondarenko
a61e9d94c5 merge improvements 2023-09-28 12:55:36 +02:00
Andrii Shvaika
e768afc948 Merge 3.6 -> 3.7 2023-09-28 12:20:06 +03:00
Andrii Shvaika
dd4b874b5f Version set to 3.6.1-SNAPSHOT 2023-09-27 17:38:27 +03:00
Andrew Shvayka
8ead949102
Merge pull request #9306 from dashevchenko/tbel_api_limits 
Added api rate limits for tbel
 2023-09-25 16:15:26 +03:00
Igor Kulikov
8cefca23ac Version set to 3.6.1-SNAPSHOT 2023-09-25 11:27:00 +03:00
dashevchenko
7d438e7952 Merge remote-tracking branch 'upstream/develop/3.6' into tbel_api_limits 2023-09-21 17:18:00 +03:00
dashevchenko
8f1c13b335 added api rate limits tbel 2023-09-21 17:03:04 +03:00
Igor Kulikov
7310f438eb Increase widget type and widgets bundle description field size to 1024. 2023-09-20 16:11:42 +03:00
Andrew Shvayka
a06ac7675d
Merge pull request #9295 from YevhenBondarenko/fix/widget-type-vc 
fixed widget-bundle import and added widget type VC support
 2023-09-20 13:06:20 +03:00
YevhenBondarenko
9b4e6eaa85 fixed templatec VC 2023-09-20 10:53:56 +02:00
YevhenBondarenko
4e42a3efe2 fixed widget-bundle import and added widget type VC support 2023-09-20 09:50:12 +02:00
Andrew Shvayka
68b6be536d
Merge pull request #9245 from AndriiLandiak/feature/improve-edge-instruction 
Edge instructions for ubuntu, centos
 2023-09-14 15:49:58 +03:00
YevhenBondarenko
902a7a07b4 fixed alarm severity change 2023-09-12 17:10:48 +02:00
Andrii Landiak
4007526155 Add init edge instructions for ubuntu and centos 2023-09-12 15:39:57 +03:00
Andrew Shvayka
96efdb3e20
Merge pull request #8337 from MrKartoshka/gateway-list 
Gateway list dashboard and widgets
 2023-09-08 16:18:05 +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
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
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