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

5192 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
7c99cfd852
Merge pull request #8327 from adovh/refactor-remove-handleException-and-logs 
removed redundant handle exception
 2023-04-07 15:01:36 +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
Andrew Shvayka
a8d0d871e1
Merge pull request #8285 from rusikv/alarm-details-redesign 
Alarm details redesign
 2023-04-07 13:05:03 +03:00
Andrew Shvayka
6bcbfc1b28
Merge pull request #8325 from volodymyr-babak/edge-log-fix 
[3.5] Fixed logging of EdgeGrpcSession
 2023-04-07 13:01:52 +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
rusikv
bcee982497 Merge remote-tracking branch 'upstream/develop/3.5' into alarm-details-redesign 2023-04-06 16:08:38 +03:00
AndriiD
799eb52893 upd 2023-04-06 15:28:08 +03:00
AndriiD
f2fa3551cf removed redundant try-catches 2023-04-06 13:37:18 +03:00
Volodymyr Babak
13c4351024 Fixed logging of EdgeGrpcSession 2023-04-06 13:22:40 +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
d7b5d89990
Revert "[3.5] removed redundant handleException usages" 2023-04-06 12:38:52 +03:00
Andrii Shvaika
6fc3905fc1 Merge branch 'refactor-remove-handleException-and-logs' of github.com:adovh/thingsboard into develop/3.5 2023-04-06 12:18:17 +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
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
Volodymyr Babak
9e189c30e6 Remove redundant JSON code 2023-04-05 16:09:41 +03:00
Volodymyr Babak
0f5261b8dd Merge branch 'fix-rpc-keep-alive-issue' into edge-attr-fix 2023-04-05 15:52:05 +03:00
Andrii Shvaika
b1884f675a Update service and TBEL version improvement 2023-04-05 15:43:09 +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
ViacheslavKlimov
7aa215f49d Fix notification request update handling in cluster mode; Rule nodes fixes 2023-04-05 14:28:50 +03:00
Volodymyr Babak
1b29c97008 Edge Session - improved error logging in case general process is interrupred because of sync started 2023-04-05 13:41:09 +03:00
YevhenBondarenko
60a4878ba7 improvements due to comments 2023-04-05 11:17:20 +02: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
Andrew Shvayka
bb17e708f1
Merge pull request #8308 from YevhenBondarenko/fix/upgrade-script 
[3.5]fixed upgrade script
 2023-04-04 12:12:49 +03:00
Andrew Shvayka
bf62babfd6
Merge pull request #8301 from volodymyr-babak/edge/solutions-template-updates 2023-04-03 21:20:18 +03:00
YevhenBondarenko
a4720bea87 fixed upgrade script 2023-04-03 19:23:13 +02: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
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