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

677 Commits

Author SHA1 Message Date
ViacheslavKlimov
deb2867df1 Multiple notification delivery methods; notification templates 2022-12-14 14:27:20 +02:00
ShvaykaD
7d9f437927 rollback optional changes for fetchEntityCustomerId method 2022-12-14 12:37:19 +02:00
ShvaykaD
f167c7c48b code cleanup after review 2022-12-14 12:30:27 +02:00
dashevchenko
201078714c added alarm comment info object, refactoring 2022-12-14 12:20:23 +02:00
zbeacon
f29d1b0eff Added HasLabel, HasEmail, HasTitle interfaces to get correctly label in entityService, refactoring for alarms processing. The main point is swithing from Alarm entity to AlarmInfo 2022-12-13 13:39:09 +02:00
ViacheslavKlimov
1ba77a30d7 Merge branch 'master' into feature/notification-system 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java
#	application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java
 2022-12-13 12:55:21 +02:00
ShvaykaD
0bef324a1f refactoring after review 2022-12-12 19:18:45 +02:00
zbeacon
08e356a415 Updated alarm assignment to send websocket update on assign, added originator label to alarm info 2022-12-12 13:00:22 +02:00
ShvaykaD
661480ff39 base entity service improvement: init commit 2022-12-09 17:33:17 +02:00
dashevchenko
8a157397d4 added rest controller for alarm comments 2022-12-08 17:04:30 +02:00
Igor Kulikov
109caee7c7 Version set to 3.4.3-SNAPSHOT 2022-12-05 17:54:19 +02:00
zbeacon
591708b029 Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning 2022-12-05 15:23:09 +02:00
Andrii Shvaika
770f069f22 Version set to 3.4.2 2022-12-01 12:04:14 +02:00
zbeacon
0dcde60443 Added alarm assignment feature and tests for it 2022-11-30 13:06:00 +02:00
ViacheslavKlimov
a4ce6252de Retrieve notification info from request when selecting notifications 2022-11-19 15:03:41 +02:00
ViacheslavKlimov
684ef4a658 Add ability to update notification request 2022-11-11 14:06:09 +02:00
Andrew Shvayka
f6b4406341
Merge pull request #7518 from smatvienko-tb/cassandra-cloud-astra 
[3.4.2] Cassandra cloud connects to Datastax Astra DB
 2022-11-09 13:10:38 +02:00
ViacheslavKlimov
165e86c82b Notification rules processing; refactoring 2022-11-08 16:04:50 +02:00
ViacheslavKlimov
48023495a8 Notification api refactoring 2022-11-07 13:50:16 +02: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
12ae902cfc Notification rules initial implementation 2022-11-06 18:13:02 +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
Sergey Matvienko
069e77eb17 Merge remote-tracking branch 'ce/master' into cassandra-cloud-astra 2022-11-01 14:11:58 +02:00
Andrew Shvayka
3844ff6372
Merge pull request #7395 from volodymyr-babak/feature/edge-multi-customers 
[3.4.2] Edge PE - customers hierarchy support
 2022-10-31 18:49:01 +02:00
ViacheslavKlimov
4d34c328d6 New TbNotificationNode; refactoring 2022-10-31 17:44:21 +02:00
Andrii Shvaika
18678cae49 Improved user search in the relation rule node 2022-10-31 16:13:06 +02:00
ViacheslavKlimov
4c61d63149 Upgrade script, indexes 2022-10-31 14:04:29 +02:00
ViacheslavKlimov
f5247386fa Notification system improvements and refactoring 2022-10-26 17:50:33 +03:00
ViacheslavKlimov
fa934f647e Initial notification system structures and dao layer 2022-10-20 16:35:58 +03:00
Volodymyr Babak
dd1effafc4 Do not send delete notification if related edges empty. Minor code refactoring 2022-10-10 14:32:19 +03:00
Andrew Shvayka
cd6e50312c
Merge pull request #7348 from thingsboard/feature/math-rule-node 
[3.4.2] Math rule node
 2022-09-29 12:54:07 +03:00
Andrew Shvayka
62cd74ee40
Merge pull request #7339 from ViacheslavKlimov/feature/tenant-jdbc-logging 
[3.4.2] DB calls stats
 2022-09-28 15:44:15 +03:00
Igor Kulikov
f14a337c73 Merge branch 'master' into feature/math-rule-node 2022-09-28 15:01:46 +03:00
Andrii Shvaika
58fd012f7f Merge remote-tracking branch 'origin/feature/assetProfile' 2022-09-27 15:11:55 +03:00
ViacheslavKlimov
7f23367ee9 Improvements for dao calls audit 2022-09-27 10:12:35 +03:00
Andrii Shvaika
fb49273bd6 Math node implementation 2022-09-23 18:06:33 +03:00
Igor Kulikov
085e3c1580 Implement Asset Profile feature 2022-09-23 15:37:17 +03:00
Yuriy Lytvynchuk
f2890d3363 Merge branch 'master' of github.com:thingsboard/thingsboard into feature/node_fetch_device_credentials 2022-09-23 10:42:51 +03:00
Andrii Shvaika
89c715cd18 Fix Cassandra DAO 2022-09-16 11:55:48 +03:00
Andrii Shvaika
efbe16f8d0 Implementation of the TenantDbCall annotation 2022-09-16 09:00:21 +03:00
Andrii Shvaika
1fcc757147 Improvement to the AGG calculations to include latestTs and count 2022-09-09 14:04:24 +03:00
Yuriy Lytvynchuk
80b47bafaa refactor code 2022-08-26 10:07:25 +03:00
Andrii Shvaika
dea933d906 Version set to 3.4.2 2022-08-19 15:25:18 +03:00
Sergey Matvienko
3c496f4749 Cassandra cloud connect to Datastax Astra DB using SECURE_BUNDLE, CLIENT_ID and CLIENT_SECRET 2022-08-18 00:43:54 +03:00
Andrii Shvaika
8de1ee776c Fix conflicts. Refactored RandomStringUtils 2022-08-16 11:26:32 +03:00
Yuriy Lytvynchuk
7b2a6499d0 nodeDetails 2022-08-09 11:44:24 +03:00
Yuriy Lytvynchuk
00fd1a22aa Node modification 2022-08-08 18:10:58 +03:00
Andrii Shvaika
31124311a3 Device State performance improvements 2022-08-04 14:59:15 +03:00