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

650 Commits

Author SHA1 Message Date
dashevchenko
d3a975770b Merge remote-tracking branch 'upstream/master' into alarmComments 2023-01-09 12:38:21 +02:00
ViacheslavKlimov
5c5d683236 Add indexes for notification entities; refactoring 2023-01-08 13:42:43 +02:00
ViacheslavKlimov
654e61683a Improvements and refactoring 2023-01-06 17:50:34 +02:00
ViacheslavKlimov
141bd74113 Notification target and template api docs; improvements 2023-01-02 17:25:03 +02:00
zbeacon
a812a88db1 Refactoring to keep EntityService 2022-12-30 12:51:45 +02:00
zbeacon
022aee36d0 Merge with develop/3.5 2022-12-29 20:49:58 +02:00
zbeacon
d9add9bdf8 Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning 2022-12-29 20:49:29 +02:00
Igor Kulikov
4c3154da4b Version set to 3.4.4-SNAPSHOT 2022-12-28 13:33:57 +02:00
Andrii Shvaika
509da5dee4 Merge branch 'feature/notification-system' of github.com:ViacheslavKlimov/thingsboard into feature/notification-system 2022-12-27 13:07:55 +02:00
ViacheslavKlimov
409976c6a3 Multiple notification targets for request; improvements and refactoring 2022-12-23 18:47:40 +02:00
Andrew Shvayka
19513ec027
Merge pull request #7804 from ShvaykaD/feature/base-entity-service-improvement 
[3.5] improvements for base entity service v2
 2022-12-22 14:14:47 +02:00
ShvaykaD
652a8c9e89 added getEntityType method in EntityDaoService 2022-12-22 13:02:39 +02:00
zbeacon
5710f01c03 Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning 2022-12-22 08:30:42 +02:00
dashevchenko
408afb67f3 fixed test 2022-12-21 16:10:34 +02:00
ViacheslavKlimov
0a17f99360 Refactoring; TbSlackNode 2022-12-21 15:04:06 +02:00
dashevchenko
2db28e2296 fixed test 2022-12-21 13:41:42 +02:00
dashevchenko
7203c15dec fixed pull request comments 2022-12-20 15:07:50 +02:00
dashevchenko
ed37dc850a merged with master 2022-12-20 12:09:34 +02:00
ShvaykaD
3d27340cb5 fix audit log tests 2022-12-16 15:52:20 +02:00
ViacheslavKlimov
4b39d2a221 Notification request stats 2022-12-15 15:50:01 +02:00
ShvaykaD
5c5b83c4ce updated logic & fix typos after review 2022-12-15 15:10:38 +02:00
Andrii Shvaika
aadc2e35b7 Merge with master 2022-12-15 14:27:13 +02:00
ViacheslavKlimov
a6bfb049aa Improvements for notification templates 2022-12-14 19:02:23 +02:00
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