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

1429 Commits

Author SHA1 Message Date
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
Andrii Shvaika
1e2abbcedf Merge remote-tracking branch 'origin/master' into feature/check_tenant_entity_for_nodes 2022-11-04 15:07:01 +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
Andrew Shvayka
7a8da89862
Merge pull request #7237 from YuriyLytvynchuk/feature/process_exception_extension_http_client 
[3.4.2] Feature: processException extension for tbHttpClient
 2022-10-31 12:37:12 +02:00
Igor Kulikov
6825ab0f35 UI: Introduce tb-script-lang component 2022-10-28 18:03:10 +03:00
Igor Kulikov
7c2897226d Update default rule chains with mvel script. Update rule nodes config UI. 2022-10-28 12:21:50 +03:00
Yuriy Lytvynchuk
36651d231d mvn license:format 2022-10-28 11:06:00 +03:00
Yuriy Lytvynchuk
4c277daadd add test for TbAbstractGetAttributesNode 2022-10-28 11:05:28 +03:00
Yuriy Lytvynchuk
3554f37b0e fix ENTITY_SOURCE 2022-10-27 15:59:49 +03:00
Andrii Shvaika
bfe79780dd MVEL executor improvements 2022-10-27 14:03:48 +03:00
Yuriy Lytvynchuk
dc6eaef037 fix space 2022-10-26 17:02:15 +03:00
Yuriy Lytvynchuk
add63b76d9 add test for mathNode 2022-10-26 12:44:09 +03:00
Andrew Shvayka
05813bc554
Merge pull request #7381 from YuriyLytvynchuk/bugfix/node_copy_to_view_add_inactiviy_event 
[3.4.2] Fix: Node 'copy to view' add INACTIVITY_EVENT
 2022-10-24 13:41:34 +03:00
Andrew Shvayka
73868338c8
Merge pull request #7238 from YuriyLytvynchuk/feature/delete_attributes_node 
[3.4.2] Feature: New RuleNode "delete attributes"
 2022-10-24 13:34:55 +03:00
Igor Kulikov
bfdc4a0801 Minor fixes. Update rule node UI 2022-10-20 12:28:32 +03:00
Igor Kulikov
4ea96fa289 Update rule node config UI 2022-10-19 20:03:24 +03:00