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

2932 Commits

Author SHA1 Message Date
Andrii Shvaika
166afbd782 Merge branch 'develop/3.5' into develop/3.6 2023-04-07 15:41:24 +03:00
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
b10ed7621d minor refactoring 2023-04-06 18:34:08 +03:00
dashevchenko
c4a5569650 Added logging for failed mqtt ssl certificates 2023-04-06 18:08:06 +03:00
Andrew Shvayka
872a8f0c60
Merge branch 'develop/3.5' into feature/entity-usage 2023-04-06 12:12:49 +03:00
Andrii Shvaika
d71307402e Merge with develop/3.5 2023-04-06 11:43:34 +03:00
Andrew Shvayka
de921b4fa1
Merge pull request #8265 from thingsboard/improvements/notification-system 
Notification system improvements
 2023-04-06 11:13:52 +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
YevhenBondarenko
22981e5e39 added count entity cache 2023-04-05 19:00:52 +02:00
Andrii Shvaika
9165faa341 Improved Platform Updates Service 2023-04-05 17:23:03 +03:00
Andrii Shvaika
b1884f675a Update service and TBEL version improvement 2023-04-05 15:43:09 +03:00
ViacheslavKlimov
fccd60601f RemoteNotificationRuleProcessor 2023-04-04 15:05:56 +03: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
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
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
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
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
YevhenBondarenko
382f5350c0 fixed system info updates 2023-03-29 12:34:32 +02:00
ViacheslavKlimov
7d52ab12dd Fix AlarmNotificationRuleTriggerConfig serialization 2023-03-28 18:44:29 +03: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
de24af159c Device activity notification rule; fix default notification configs 2023-03-27 18:54:08 +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
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
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
YevhenBondarenko
0101f6fc90 Merge branch 'feature/notification-system' of github.com:thingsboard/thingsboard into feature/home-page 2023-03-23 22:14:45 +01:00
zbeacon
ba6a83e575 Added getting users for assignment 2023-03-23 21:09:42 +02:00
ViacheslavKlimov
197207035b Notification system fixes, new notification targets 2023-03-23 18:27:45 +02:00
YevhenBondarenko
37a5aeb485 implemented features info 2023-03-23 16:34:51 +01:00
ViacheslavKlimov
4ea97e6f30 Configured notification delivery methods check 2023-03-23 15:10:18 +02:00
YevhenBondarenko
32278beabc improvements due to comments 2023-03-23 13:56:36 +01: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
ViacheslavKlimov
8705a2324e Notification system improvements: 
- rate limits
- notify on rule node start failure after attempts ended
- default general template for tenants + entities limit rule
- rename ACTION_TARGET_USER to AFFECTED_USER
 2023-03-22 16:48:04 +02:00