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

5061 Commits

Author SHA1 Message Date
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
rusikv
e61a5f5757 Merge remote-tracking branch 'upstream/develop/3.5' into alarm-details-redesign 2023-04-03 18:35:09 +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
c4545d272a REST API doc improvements 2023-03-31 17:55:57 +03:00
Andrii Shvaika
b0d177ee51 Cache of the dashboard titles 2023-03-31 17:43:49 +03:00
imbeacon
3133775901 Merge remote-tracking branch 'upstream/develop/3.5' into fix/alarm-assignment-user-issues 2023-03-31 17:40:34 +03:00
Andrii Shvaika
95e9f5b715 Improvements 2023-03-31 17:17:12 +03:00
Volodymyr Babak
e327f93aca Merge remote-tracking branch 'upstream/develop/3.5' into edge/solutions-template-updates 2023-03-31 16:33:24 +03:00
Vladyslav_Prykhodko
8874dfa35a Merge remote-tracking branch 'upstream/develop/3.5' into improvements/notification-system 2023-03-31 12:50:46 +03:00
Volodymyr Babak
bacda7e3f6 Base Edge Processor - Added check for tenant entity 2023-03-31 12:32:19 +03:00
rusikv
87067401be Merge remote-tracking branch 'upstream/develop/3.5' into alarm-details-redesign 2023-03-31 12:04:13 +03:00
Andrii Shvaika
1430930bd2 Integration tests 2023-03-30 18:51:21 +03:00
Andrii Shvaika
5d30fefbcb Basic implementation of the Starred and Last visited Info 2023-03-30 17:47:26 +03:00
ViacheslavKlimov
33dca7af71 Notification system fixes and improvements 2023-03-30 15:29:39 +03:00
AndriiD
272a1a9149 Merge remote-tracking branch 'origin/develop/3.5' into refactor-remove-handleException-and-logs 2023-03-30 15:17:21 +03:00
Andrew Shvayka
0335396d6b
Merge pull request #8286 from imbeacon/fix/alarm-originator-label 
[3.5] Fix - Added check for empty string in title/label
 2023-03-30 12:39:17 +03:00
Igor Kulikov
f8a1615582
Merge pull request #8287 from vvlladd28/feaure/map/here/version-3 
API version 3 support has been added to HERE map widget
 2023-03-30 12:31:48 +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
rusikv
d50b6c84ad Merge remote-tracking branch 'upstream/develop/3.5' into alarm-details-redesign 2023-03-30 11:23:02 +03:00
imbeacon
c99368d885 Refactored 2023-03-30 09:52:04 +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
Vladyslav_Prykhodko
8a4028150a UI: API version 3 support has been added to HERE map widget 2023-03-29 17:34:02 +03:00
rusikv
1fecece823 Merge remote-tracking branch 'upstream/develop/3.5' into alarm-details-redesign 2023-03-29 14:38:58 +03:00
YevhenBondarenko
2e1b0bd3cc ignore unstable test 2023-03-29 12:48:24 +02:00
YevhenBondarenko
46b62be30c Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into develop/3.5-fixes 2023-03-29 12:46:53 +02:00
YevhenBondarenko
382f5350c0 fixed system info updates 2023-03-29 12:34:32 +02:00
imbeacon
b0b0777d34 Added check for empty string in title/label 2023-03-29 12:36:58 +03:00
rusikv
92c2d4f021 Alarm details redesign 2023-03-29 12:15:46 +03:00
YevhenBondarenko
fca2aff3d1 minor fixes 2023-03-29 10:25:01 +02:00
Volodymyr Babak
538df69c34 Merge remote-tracking branch 'origin/develop/3.5' into edge/solutions-template-updates 2023-03-28 17:23:54 +03:00
ViacheslavKlimov
14acf7922c Merge branch 'develop/3.5' into improvements/notification-system 2023-03-28 16:50:56 +03:00
Volodymyr Babak
f7a1a7eabe Code review changes 2023-03-28 15:05:57 +03:00
ViacheslavKlimov
74afb9c024 Fix invalid NotificationUpdate deserialization 2023-03-28 14:53:56 +03:00
ViacheslavKlimov
c4827f20f3 API usage limit notification rule 2023-03-28 13:29:49 +03:00
Volodymyr Babak
19dcc85262 Fixed circular dependency issue - WebSocketService and TbEntityDataSubscriptionService 2023-03-28 12:30:06 +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
de24af159c Device activity notification rule; fix default notification configs 2023-03-27 18:54:08 +03:00
ViacheslavKlimov
538be8f5fe Rename some default notification system entities, deduplicate rule engine lifecycle events 2023-03-27 18:21:04 +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
imbeacon
1283217b4b Merge remote-tracking branch 'upstream/develop/3.5' into fix/alarm-assignment-user-issues 2023-03-27 09:55:22 +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