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

1350 Commits

Author SHA1 Message Date
Andrew Shvayka
8769911694
Merge pull request #8256 from imbeacon/fix/alarm-assignment-user-issues 
Added getting user list for alarm assignment and ability to assign alarms for customer users
 2023-04-07 15:00:22 +03:00
Andrew Shvayka
14ed9df205
Merge pull request #6986 from adovh/feature/work-1385-custom-mqtt-subscribe-topic 
[3.5] added ability to create&subscribe custom mqtt attributes topics
 2023-04-07 13:48:20 +03:00
dashevchenko
c07eb9e920 fixes for flaky tests 2023-04-06 17:57:37 +03:00
dashevchenko
47cf1eac77 fixes for flaky tests 2023-04-06 17:28:30 +03:00
Andrew Shvayka
87e48d9803
Merge pull request #8317 from volodymyr-babak/edge-attr-fix 
[3.5] Edge processor - delete attribute msg is not properly handled for non device type
 2023-04-06 13:04:36 +03:00
Andrew Shvayka
872a8f0c60
Merge branch 'develop/3.5' into feature/entity-usage 2023-04-06 12:12:49 +03:00
imbeacon
863b7a72ed Merge 2023-04-06 11:48:46 +03:00
Andrii Shvaika
d71307402e Merge with develop/3.5 2023-04-06 11:43:34 +03:00
Illia Barkov
ae35b45799
Merge branch 'develop/3.5' into fix/alarm-assignment-user-issues 2023-04-06 10:52:57 +03:00
YevhenBondarenko
059fad1421 merge with develop/3.5 2023-04-05 23:29:31 +02:00
Volodymyr Babak
9e189c30e6 Remove redundant JSON code 2023-04-05 16:09:41 +03:00
Volodymyr Babak
463ad698c4 Edge telemetry processor - fixed processing of delete attribute request for non device entities 2023-04-05 15:25:03 +03:00
YevhenBondarenko
60a4878ba7 improvements due to comments 2023-04-05 11:17:20 +02:00
ViacheslavKlimov
a4ad8feb7f Merge remote-tracking branch 'origin/improvements/notification-system' into improvements/notification-system 2023-04-04 12:58:57 +03:00
ViacheslavKlimov
bbaf2a5054 Notification rule trigger via ClusterService 2023-04-04 12:58:47 +03:00
Vladyslav_Prykhodko
c4bb1d8476 Merge remote-tracking branch 'upstream/develop/3.5' into improvements/notification-system 2023-04-04 12:52:24 +03:00
Andrew Shvayka
28a90e965a
Merge pull request #8274 from volodymyr-babak/edge-alarm-id 
[3.5] Alarm entity that was delivered from the edge is stored with provided ID
 2023-04-04 12:19:39 +03:00
ViacheslavKlimov
cd50eabd40 Notification rule node; refactoring 2023-04-03 19:02:23 +03:00
Andrii Shvaika
ad6f007161 Improvement to the System Info API 2023-04-03 18:46:50 +03:00
Volodymyr Babak
8d4f1e31dc Code review updates - remove redundant alarmService.findById - use correct alarm service method based on msg type 2023-04-03 13:41:02 +03:00
ViacheslavKlimov
dc3ca22e63 Slack recipients preview and recipient params; refactoring 2023-04-03 12:21:09 +03:00
YevhenBondarenko
8481b71b7e added entity usage 2023-04-03 10:07:16 +02:00
Andrii Shvaika
b0d177ee51 Cache of the dashboard titles 2023-03-31 17:43:49 +03:00
Andrii Shvaika
95e9f5b715 Improvements 2023-03-31 17:17:12 +03:00
Andrii Shvaika
1430930bd2 Integration tests 2023-03-30 18:51:21 +03:00
ViacheslavKlimov
33dca7af71 Notification system fixes and improvements 2023-03-30 15:29:39 +03:00
ViacheslavKlimov
5c8d9e9f8d Merge branch 'develop/3.5' into improvements/notification-system 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbEntityDataSubscriptionService.java
 2023-03-30 12:14:53 +03:00
imbeacon
2bd6a29ca4 Merge remote-tracking branch 'upstream/develop/3.5' into fix/alarm-assignment-user-issues 2023-03-30 09:28:45 +03:00
YevhenBondarenko
2e1b0bd3cc ignore unstable test 2023-03-29 12:48:24 +02:00
YevhenBondarenko
fca2aff3d1 minor fixes 2023-03-29 10:25:01 +02:00
ViacheslavKlimov
14acf7922c Merge branch 'develop/3.5' into improvements/notification-system 2023-03-28 16:50:56 +03:00
ViacheslavKlimov
c4827f20f3 API usage limit notification rule 2023-03-28 13:29:49 +03:00
Volodymyr Babak
c13d2ae144 Merge remote-tracking branch 'origin/develop/3.5' into edge-alarm-id 2023-03-28 09:54:47 +03:00
ViacheslavKlimov
408eb0bc02 Refactor notification rules processing 2023-03-27 14:37:07 +03:00
imbeacon
01996334e2 Refactoring, added tests 2023-03-27 13:53:36 +03:00
YevhenBondarenko
43efbbe8b9 fixed testSystemInfoTimeSeriesWsCmd 2023-03-24 17:29:09 +01:00
Andrii Shvaika
e5b661454e Merge branch 'feature/home-page' of github.com:YevhenBondarenko/thingsboard into feature/home-page 2023-03-24 17:25:52 +02:00
YevhenBondarenko
af13292b4b Merge remote-tracking branch 'vklimov/feature/notification-system' into feature/notification-system 2023-03-24 14:24:12 +01:00
ViacheslavKlimov
54f9240c08 Fix tests 2023-03-24 15:21:57 +02:00
Volodymyr Babak
fc4be34d55 Added edgeAlarmId into AlarmCreateOrUpdateActiveRequest. BaseAlarmProcessor - use alarmId from cloud 2023-03-24 14:22:34 +02:00
Vladyslav_Prykhodko
eea6e5a5e6 Merge remote-tracking branch 'upstream/develop/3.5' into feature/notification-system 2023-03-24 13:42:44 +02:00
ViacheslavKlimov
4673e812b0 Fix notification system tests 2023-03-24 13:21:25 +02:00
Andrew Shvayka
0b0fb2e6e5
Merge pull request #8253 from adovh/bug/fix-alarm-assignment-check-user-id 
[3.5] added assignee check for alarm
 2023-03-24 11:52:26 +02:00
YevhenBondarenko
0101f6fc90 Merge branch 'feature/notification-system' of github.com:thingsboard/thingsboard into feature/home-page 2023-03-23 22:14:45 +01:00
YevhenBondarenko
a35b3cd6ad System info improvements 2023-03-23 21:54:14 +01:00
YevhenBondarenko
37a5aeb485 implemented features info 2023-03-23 16:34:51 +01:00
AndriiD
0788a89f54 added assignee check to controller 2023-03-23 14:07:35 +02:00
ViacheslavKlimov
5e400726d3 Merge branch 'develop/3.5' into feature/notification-system 2023-03-23 12:36:08 +02:00
ViacheslavKlimov
cda1836986 Recipient preview for notification request; template params functions 2023-03-22 18:11:54 +02:00
YevhenBondarenko
befa454017 save system info to api usage, and added tests 2023-03-22 13:18:43 +01:00