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

1356 Commits

Author SHA1 Message Date
ViacheslavKlimov
684ef4a658 Add ability to update notification request 2022-11-11 14:06:09 +02:00
Yuriy Lytvynchuk
f49b349396 refactor code 2022-11-11 12:50:55 +02:00
Yuriy Lytvynchuk
a00d68f477 delete cases: TENANT, DASHBOARD, CUSTOMER 2022-11-11 10:06:02 +02:00
Volodymyr Babak
d8a6093442 Added TbSendRPCReplyNodeTest 2022-11-10 11:36:46 +02:00
Volodymyr Babak
15b26f4317 Remove Nullable annotation 2022-11-10 10:37:14 +02:00
Volodymyr Babak
0a56f065f7 Merge RPC request/response actions 2022-11-10 09:35:06 +02:00
Volodymyr Babak
8b46b30747 Merge remote-tracking branch 'upstream/master' into feature/edge-rpc-call-from-device 2022-11-09 18:34:01 +02:00
Volodymyr Babak
5ff8144f8d Code cleanup 2022-11-09 18:31:08 +02:00
Sergey Matvienko
d9774ccfda http client returns headers as array is there is more than one, put headers to metadata for failure response 2022-11-09 13:06:28 +02:00
Volodymyr Babak
d1312cb917 Added serviceId and sessionId to deviceRpcCallmsg 2022-11-09 12:54:17 +02:00
Volodymyr Babak
22118af4db Added Edge RPC response/request support 2022-11-08 13:13:58 +02:00
ShvaykaD
a02a276cf9 Fix code formatting issue in TenantIdLoaderTest 2022-11-08 10:59:38 +02:00
ViacheslavKlimov
48023495a8 Notification api refactoring 2022-11-07 13:50:16 +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
12ae902cfc Notification rules initial implementation 2022-11-06 18:13:02 +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
a5691f9347 Fix for the attributes mapper 2022-11-03 15:58:22 +02:00
Andrii Shvaika
da76bdb52a Merge branch 'feature/node_originator_attributes_fetch_to_msg_data' of github.com:YuriyLytvynchuk/thingsboard 2022-11-03 15:55:26 +02:00
Andrii Shvaika
778d637f47 Merge branch 'master' of github.com:thingsboard/thingsboard into feature/check_tenant_entity_for_nodes 2022-11-03 15:51:24 +02:00
Andrii Shvaika
646504ac50 Tenant Id Loader fixes 2022-11-03 15:51:18 +02:00
Igor Kulikov
bd9daee746 Update rule nodes UI 2022-11-03 15:44:02 +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
ShvaykaD
e94d305f61 added JacksonUtilTest for ALLOW_UNQUOTED_FIELD_NAMES_MAPPER and updated getAttributes tests 2022-11-03 12:31:31 +02:00
Igor Kulikov
323a47a744 Improve logging of TbMsgGeneratorNode 2022-11-03 10:34:45 +02:00
Yuriy Lytvynchuk
15683504fd refactor & update logic 2022-11-02 15:22:33 +02:00
ShvaykaD
02ca2b0235 added ALLOW_UNQUOTED_FIELD_NAMES_MAPPER to JacksonUtil 2022-11-02 11:44:46 +02:00
Yuriy Lytvynchuk
1d77a1c027 add JsonParseException 2022-11-01 17:03:01 +02:00
Andrii Shvaika
c10e491de7 Merge branch 'master' of github.com:thingsboard/thingsboard 2022-11-01 16:56:55 +02:00
Andrii Shvaika
08b226c18f Bump Cassandra versions 2022-11-01 16:56:47 +02:00
Yuriy Lytvynchuk
b74e5dfc45 change public to prv 2022-11-01 16:56:08 +02:00
Yuriy Lytvynchuk
1d8733e55a return mapper 2022-11-01 16:54:25 +02:00
Andrew Shvayka
3d01511524
Merge pull request #7494 from YuriyLytvynchuk/feature/node_math_tests 
[3.4.2] Feature: Math node - add tests
 2022-11-01 11:53:01 +02:00
Igor Kulikov
76eeebb9d6 Update rule nodes UI 2022-11-01 11:09:25 +02:00
Yuriy Lytvynchuk
4744f93cda Merge remote-tracking branch 'upstream/master' into feature/check_tenant_entity_for_nodes 2022-11-01 10:31:05 +02:00
ViacheslavKlimov
4d34c328d6 New TbNotificationNode; refactoring 2022-10-31 17:44:21 +02:00
Andrii Shvaika
3acddcfcfa Merge PR #7425 2022-10-31 17:02:41 +02:00
Yuriy Lytvynchuk
db596f63bd add line 2022-10-31 16:41:30 +02:00
Andrii Shvaika
a4fc8fef5d Merge PR #7394 2022-10-31 16:33:00 +02:00
Yuriy Lytvynchuk
597012c1b9 move to rule.engine 2022-10-31 16:28:39 +02:00
Yuriy Lytvynchuk
e51da5db9c check addToBodyAndMeta 2022-10-31 16:26:11 +02:00
Yuriy Lytvynchuk
d39f705887 refactor code 2022-10-31 16:20:39 +02:00
Andrii Shvaika
18678cae49 Improved user search in the relation rule node 2022-10-31 16:13:06 +02:00
Yuriy Lytvynchuk
691339c5c5 update JacksonUtil method 2022-10-31 16:03:27 +02:00
Andrew Shvayka
d0179c4cd3
Merge pull request #7370 from devaskim/relation_to_user 
[3.4.2] Rule Engine: Added support of creating relation to USER entity.
 2022-10-31 15:25:23 +02:00
Yuriy Lytvynchuk
513d0f3075 refactor code review 2022-10-31 14:10:23 +02:00
Yuriy Lytvynchuk
dae3e4a858 Merge remote-tracking branch 'upstream/master' into feature/node_originator_attributes_fetch_to_msg_data 
# Conflicts:
#	common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java
 2022-10-31 14:09:46 +02:00
Andrew Shvayka
ef7693babc
Merge pull request #7367 from devaskim/details_node_id 
[3.4.2] Rule Engine: Details rule node returns entity's ID as well.
 2022-10-31 13:59:27 +02:00
Andrew Shvayka
8005b1c1dc
Merge pull request #7455 from thingsboard/feature/mvel-executor 
[3.4.2] MVEL executor
 2022-10-31 12:39:58 +02:00