1601 Commits

Author SHA1 Message Date
ViacheslavKlimov
ba8f27fa76 Notification system refactoring and improvements 2023-03-15 12:32:23 +02:00
Sergey Matvienko
b00f5d26ae log node refactored and tests improved 2023-03-14 13:48:34 +01:00
Andrii Shvaika
ab5769a252 Merge with develop/3.5 2023-03-13 15:52:06 +02:00
Sergey Matvienko
2f207d5a26 Merge remote-tracking branch 'ce/develop/3.5' into fix/logNode-isStandardForTBEL 2023-03-13 13:06:08 +01:00
Andrew Shvayka
e058786956
Merge pull request #8174 from zzzeebra/feature/junit5-migration-exceptions
[3.5] junit5 migration - exception annotation refactoring
2023-03-10 12:51:03 +02:00
ViacheslavKlimov
a56261ac9d Merge with develop/3.5 2023-03-08 13:11:31 +02:00
Andrii Shvaika
aadf7f8295 Merge with develop/3.5 2023-03-06 17:59:37 +02:00
Andrii Shvaika
fefc6df533 Merge with master 2023-03-06 16:33:48 +02:00
Oleksandra Matviienko
7327adf239 junit5: TbGetTelemetryNodeTest annotation exceptions refactoring 2023-03-06 15:17:57 +01:00
Vladyslav_Prykhodko
069ef4de5b Merge remote-tracking branch 'upstream/develop/3.5' into feature/notification-system 2023-03-06 10:21:41 +02:00
Igor Kulikov
639eb3459d Merge branch 'develop/3.5' into feature/angular15 2023-03-03 17:42:42 +02:00
Andrii Landiak
8c2c0d372b Change logic similar to existing on PE 2023-03-02 11:40:46 +02:00
Andrii Landiak
da69adeee1 Delete unused variables 2023-03-01 17:49:26 +02:00
Andrii Landiak
4a32f15dc0 Merge branch 'develop/3.5' of github.com:AndriiLandiak/thingsboard into feature/rest-api-node 2023-03-01 17:37:38 +02:00
ViacheslavKlimov
79670d9f9d Notification system improvements 2023-02-28 19:19:59 +02:00
Andrii Shvaika
ce77d5d1bc Merge remote-tracking branch 'origin/feature/angular15' into feature/alarm-assign 2023-02-28 18:34:02 +02:00
Sergey Matvienko
27f5f8c077 Cassandra tests moved from cassandra-unit to testcontainers 2023-02-28 16:31:54 +01:00
Igor Kulikov
d2876e7a79 Merge branch 'develop/3.5' into feature/angular15 2023-02-28 15:15:40 +02:00
Igor Kulikov
1b73595e59 UI: Angular 15 migration 2023-02-28 15:14:36 +02:00
AndriiD
1ce1ed6665 added rulenode-core-config.js 2023-02-28 14:19:33 +02:00
Andrii Shvaika
76b133376c Merge remote-tracking branch 'origin/develop/3.5' into feature/alarm-assign 2023-02-28 13:38:04 +02:00
Andrii Shvaika
38b2cf41c4 Fix soem tests and added upgrade script 2023-02-24 14:56:06 +02:00
Andrii Shvaika
69b5a5f425 Alarm Service refactoring 2023-02-23 19:03:04 +02:00
Andrii Shvaika
c922bbb989 Alarm service refactroing 2023-02-23 12:31:07 +02:00
Volodymyr Babak
d93ba0e751 Code simplify - remove method 2023-02-22 16:29:24 +02:00
Volodymyr Babak
d0fbecc4c5 Organize imports 2023-02-22 16:10:53 +02:00
Volodymyr Babak
1a6cd82461 License header fix 2023-02-22 13:29:15 +02:00
Volodymyr Babak
881cc886f9 Add newline to end of files 2023-02-21 16:53:08 +02:00
Volodymyr Babak
9bbb88ab0f Add functionality to support multiple certificate entries in pem file 2023-02-21 16:50:09 +02:00
Andrii Shvaika
feb84ace48 Deprecation of the alarm status 2023-02-20 17:11:49 +02:00
ShvaykaD
5cfcd1946d merge else if into one for transformMsg method in TbAbstractGetEntityDetailsNode 2023-02-20 16:34:24 +02:00
ShvaykaD
30b7d819ec enrichment nodes improvements 2023-02-20 16:30:32 +02:00
ViacheslavKlimov
dd5c970b3a Merge remote-tracking branch 'origin/develop/3.5' into feature/notification-system
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/BaseController.java
2023-02-20 12:57:32 +02:00
AndriiD
82be53894b Merge branch 'master' into feature/prod-1586_add_quename_to_generator_node 2023-02-20 09:10:06 +02:00
Andrii Shvaika
c16dfd4407 Alarm query updates 2023-02-17 16:15:17 +02:00
Andrii Shvaika
04eb8c989a Revert the AlarmInfo items. We will update the assignee via separate message 2023-02-16 18:47:51 +02:00
Andrew Shvayka
c4f5d43618
Merge pull request #8090 from imbeacon/feature-alarm-assigning-with-revert
Feature alarm assigning with revert
2023-02-15 19:13:24 +02:00
Andrii Shvaika
75e9bb220d Rule node description update 2023-02-15 13:28:58 +02:00
Vladyslav_Prykhodko
3eba03cccc Fixed after merge 'upstream/develop/3.5' 2023-02-14 11:39:29 +02:00
Vladyslav_Prykhodko
2212a6d9be Merge remote-tracking branch 'upstream/develop/3.5' into feature/notification-system 2023-02-14 11:09:34 +02:00
zbeacon
9250af1904 Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning 2023-02-13 19:55:24 +02:00
Andrii Shvaika
60b8c15895 Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into develop/3.5 2023-02-10 18:16:03 +02:00
Andrii Shvaika
3e6b6349f8 Minor update of the doc 2023-02-10 18:15:52 +02:00
Igor Kulikov
17d1dd258a Update rule nodes UI 2023-02-08 13:25:45 +02:00
Andrii Shvaika
8bd9f2e29c Merge with release 3.4.4 2023-02-07 18:47:38 +02:00
Igor Kulikov
2c41820bdd Update rule nodes UI 2023-02-07 15:57:02 +02:00
Andrii Shvaika
82b9e861a3 Improve filter nodes description 2023-02-06 19:09:27 +02:00
Igor Kulikov
4f57ae4650 Update rule nodes UI 2023-02-06 16:28:31 +02:00
Andrii Shvaika
59b3e62e3a Correct rule node names 2023-02-02 19:20:53 +02:00
zbeacon
26a9f10109 Updated alarm websocket subscriptions 2023-01-31 18:41:41 +02:00