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

5346 Commits

Author SHA1 Message Date
Andrew Shvayka
516da1dac7
Merge pull request #7541 from ViacheslavKlimov/fix/ts-sort-nulls-last 
[3.4.2] Use default SQL null ordering for ts_kv
 2022-11-09 12:52:17 +02:00
Andrii Landiak
7e8f7a02ca Refactoring code 2022-11-09 12:13:19 +02:00
Andrii Landiak
a50fa91728 Refactoring code 2022-11-09 11:32:31 +02:00
YevhenBondarenko
d84fd92f57 refactored 2022-11-09 09:58:15 +01:00
Andrew Shvayka
cf73981081
Merge pull request #7549 from thingsboard/feature/check_tenant_entity_for_nodes 
[3.4.2] Feature/check tenant entity for nodes
 2022-11-09 10:36:13 +02:00
Volodymyr Babak
545790fc5b Do not register timeout for edge processor on cloud 2022-11-09 10:18:20 +02:00
YevhenBondarenko
71d26ba18b asset profile upgrade improvements 2022-11-09 01:18:01 +01:00
YevhenBondarenko
0849aa722f delete assets with a non-existent tenant and set default asset profile to the assets with xss 2022-11-08 17:34:44 +01:00
Andrii Landiak
ff3f0234a9 Refactoring the code according to the comments after the review 2022-11-08 17:46:11 +02:00
Igor Kulikov
1ed5e5b115
Merge pull request #7554 from dmytro-landiak/alarm-subscriptions 
[3.4.2] Fix alarm subscriptions on rest api
 2022-11-08 16:18:45 +02:00
YevhenBondarenko
2d2d78ae6b fetch attribute types for upgrade improvements 2022-11-08 15:08:22 +01:00
ViacheslavKlimov
165e86c82b Notification rules processing; refactoring 2022-11-08 16:04:50 +02:00
Volodymyr Babak
22118af4db Added Edge RPC response/request support 2022-11-08 13:13:58 +02:00
ViacheslavKlimov
b73e89d691 Merge remote-tracking branch 'dmytro-landiak/alarm-subscriptions' into feature/notification-system 2022-11-08 12:33:05 +02:00
Andrii Shvaika
7ce3af709b Fix broken test logic 2022-11-08 11:56:14 +02:00
Andrii Shvaika
660b9bdf85 Merge PR #7453 2022-11-07 18:37:45 +02:00
Andrii Landiak
ebb29ca200 Refactoring code and optimize import 2022-11-07 18:17:12 +02:00
Andrii Landiak
fba0cd031b Refactoring code and optimize import 2022-11-07 18:13:16 +02:00
Andrii Shvaika
0873b9e158 Improvements to #7434 2022-11-07 18:12:28 +02:00
Andrii Landiak
d0090f8b7a Removed unnecessary unused case for DataUpdateService 2022-11-07 17:52:44 +02:00
Andrii Landiak
a098e33d8d Set up to 3.4.2 version instead of 3.5.0 2022-11-07 17:32:04 +02:00
Andrii Shvaika
6e33b09205 Merge branch 'feature/jwt-token-outdate-on-logout' of github.com:CooL16/thingsboard 2022-11-07 17:30:23 +02:00
Andrii Landiak
5b3eb26a3b Remove unnecessary changes in audit-log schema_update.sql 2022-11-07 14:45:46 +02:00
Andrii Landiak
11ee41bf34 Adding partition to edge_event table 2022-11-07 14:42:49 +02:00
ViacheslavKlimov
48023495a8 Notification api refactoring 2022-11-07 13:50:16 +02:00
YevhenBondarenko
a9dabe14ca refactored 2022-11-07 11:51:09 +01:00
YevhenBondarenko
9b54f009e6 upgrade asset-profiles using ExecutorService 2022-11-07 11:29:27 +01:00
ViacheslavKlimov
c4d8354fa7 Notification request scheduling 2022-11-07 11:42:58 +02:00
ViacheslavKlimov
e391459343 Merge remote-tracking branch 'origin/master' into feature/notification-system 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/telemetry/DefaultAlarmSubscriptionService.java
#	application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java
#	dao/src/main/java/org/thingsboard/server/dao/user/UserDao.java
#	rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java
 2022-11-06 18:55:41 +02:00
ViacheslavKlimov
a545ace4ec Add logging for notification services 2022-11-06 18:51:49 +02:00
ViacheslavKlimov
12ae902cfc Notification rules initial implementation 2022-11-06 18:13:02 +02:00
dlandiak
bce6249eeb fix alarm subscriptions on rest api 2022-11-04 17:28:09 +02:00
ShvaykaD
74f12faa72 removed unused import 2022-11-04 17:18:28 +02:00
Andrew Shvayka
a6a992f0dc
Merge pull request #7548 from thingsboard/feature/findRelationsRecursively 
Improvement to the recursive relations query.
 2022-11-04 15:36:29 +02:00
ViacheslavKlimov
3734a0da49 Notifications api permission checks, WS improvements, new target configs 2022-11-04 15:29:15 +02:00
ShvaykaD
ee98f203ef added findAlarmById method to AlarmService 2022-11-04 15:14:43 +02:00
ShvaykaD
2f83810fe4 fix compilation error in alarm service & code cleanup 2022-11-04 14:54:56 +02:00
ShvaykaD
82440e4d53 Merge branch 'master' into feature/check_tenant_entity_for_nodes 2022-11-04 13:41:15 +02:00
Andrii Shvaika
7d73c40885 Major improvement to the relation query 2022-11-04 13:30:01 +02:00
dlandiak
52d7da7afd inactivity timeout fix - get from attr when persist to telemetry and default found 2022-11-04 10:33:08 +02:00
oyurov
4fad587940 Refactoring 2022-11-03 16:52:15 +01:00
ViacheslavKlimov
d9023d7017 Fix comment for hibernate.order_by.default_null_ordering property 2022-11-03 17:21:54 +02:00
ViacheslavKlimov
4954de2022 Avoid using 'nulls first' or 'nulls last' for ts_kv 2022-11-03 16:48:37 +02:00
Andrew Shvayka
dc102fe683
Merge pull request #7529 from ShvaykaD/feature/6169 
[3.4.2][WIP] Added DynamicProtoUtils
 2022-11-03 16:47:19 +02:00
Andrii Shvaika
646504ac50 Tenant Id Loader fixes 2022-11-03 15:51:18 +02:00
Yuriy Lytvynchuk
b5f11f1bd0 Merge remote-tracking branch 'upstream/master' into feature/check_tenant_entity_for_nodes 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/apiusage/TbApiUsageStateService.java
#	rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java
 2022-11-03 14:10:48 +02:00
Yuriy Lytvynchuk
8b9eb43322 refactor code 2022-11-03 14:06:42 +02:00
Yuriy Lytvynchuk
15683504fd refactor & update logic 2022-11-02 15:22:33 +02:00
oyurov
3ab1f34594 Clean code 2022-11-02 14:07:49 +01:00
oyurov
6d34aa237c Refactoring 2022-11-02 13:03:17 +01:00