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

5180 Commits

Author SHA1 Message Date
Volodymyr Babak
51a3620b11 Edge sync test - add check for rule chain msg is root 2022-12-27 18:22:28 +02:00
Volodymyr Babak
bcb1601e59 Set default edge root rule chain during creation 2022-12-27 18:09:34 +02:00
Volodymyr Babak
031706e1cf Added functionality to push latest timeseries values to edge on assing entities to edge 2022-12-27 16:53:26 +02:00
Volodymyr Babak
bcdda93de3 Improve logging of edge services and processors 2022-12-27 16:52:51 +02:00
Vladyslav_Prykhodko
8d238e5e35 Fixed call updated script for notification service 2022-12-27 14:34:43 +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
Andrii Shvaika
34d7a6ced8 Merge remote-tracking branch 'origin/master' into develop/3.5 2022-12-27 13:06:46 +02:00
Andrii Landiak
89bb6cafce Improve swagger description for SaveAttributes 2022-12-27 11:15:00 +02:00
Andrew Shvayka
5cc449a686
Merge pull request #7838 from YevhenBondarenko/fix/device-sessions-dump 
[3.5] fixed device sessions dump
 2022-12-26 15:40:44 +02:00
ViacheslavKlimov
409976c6a3 Multiple notification targets for request; improvements and refactoring 2022-12-23 18:47:40 +02:00
Volodymyr Babak
f04753d3f9 Fixed incorrect index creation for edge event migration 2022-12-23 16:35:15 +02:00
YevhenBondarenko
36793c432d fixed device sessions dump 2022-12-23 15:07:44 +01:00
dashevchenko
ae62d2434c updated swagger docs 2022-12-23 11:18:35 +02:00
dashevchenko
dd55d8c9d2 Merge remote-tracking branch 'upstream/master' into alarmComments 2022-12-22 15:08:33 +02:00
dashevchenko
c89374e506 added ttl service 2022-12-22 13:56:45 +02:00
dashevchenko
419380712e fixed security test 2022-12-22 12:37:48 +02:00
Andrii Shvaika
83b2005601 Merge branch 'feature/base-entity-service-improvement' of github.com:ShvaykaD/thingsboard into develop/3.5 2022-12-22 11:41:50 +02:00
zbeacon
5710f01c03 Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning 2022-12-22 08:30:42 +02:00
ViacheslavKlimov
7792e80283 Merge branch 'master' into feature/notification-system 2022-12-21 17:53:41 +02:00
ViacheslavKlimov
0a17f99360 Refactoring; TbSlackNode 2022-12-21 15:04:06 +02:00
Andrii Shvaika
38ef27567c Refactoring of the initial implementation 2022-12-21 14:21:36 +02:00
nickAS21
ca54838f23 sparkplug: comments7 2022-12-21 08:08:16 +02:00
Igor Kulikov
acfb357135 Update UI help link 2022-12-20 16:59:45 +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
dashevchenko
81ed6a6702 added tests for alarm comment services 2022-12-20 11:26:11 +02:00
Volodymyr Babak
5580b17953 Correctly set root rule chain on initial sync 2022-12-19 23:22:11 +02:00
ViacheslavKlimov
58b9b1b6d3 Clear notification system entities on cascade on tenant's deletion 2022-12-19 20:07:52 +02:00
ViacheslavKlimov
738b9dc494 Slack notification channel; refactoring 2022-12-19 19:56:20 +02:00
Andrew Shvayka
84c82d08a7
Merge pull request #7792 from volodymyr-babak/edge/misc-fixes 
[3.4.3][Bug] Edge root rule chain update fix. USER entity support added. INACTIVITY_TIMEOUT pushed to edge.
 2022-12-19 11:56:47 +02:00
ViacheslavKlimov
55fc7131fb Validation for rule node configuration; improve validation error message 2022-12-17 16:58:58 +02:00
nickAS21
f6aa9e6125 sparklug: comments4 2022-12-15 18:44:25 +02:00
ViacheslavKlimov
4b39d2a221 Notification request stats 2022-12-15 15:50:01 +02:00
ViacheslavKlimov
aa89d0e936 Merge branch 'master' into feature/notification-system 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java
#	application/src/main/java/org/thingsboard/server/service/ws/DefaultWebSocketService.java
#	application/src/test/java/org/thingsboard/server/controller/BaseWebsocketApiTest.java
#	application/src/test/java/org/thingsboard/server/controller/TbTestWebSocketClient.java
 2022-12-15 15:32:26 +02:00
ShvaykaD
5c5b83c4ce updated logic & fix typos after review 2022-12-15 15:10:38 +02:00
Volodymyr Babak
268f0499bf Merge branch 'master' of github.com:thingsboard/thingsboard into edge/misc-fixes 2022-12-15 14:53:39 +02:00
Andrew Shvayka
985b985265
Merge pull request #7801 from dashevchenko/addedDeviceProfileServiceToTbContext 
[3.4.3] Added DeviceProfileService and AssetProfileService to TBContext
 2022-12-15 14:39:21 +02:00
Andrii Shvaika
aadc2e35b7 Merge with master 2022-12-15 14:27:13 +02:00
YevhenBondarenko
df28b21733 fixed bulk import test infinite await 2022-12-15 13:19:03 +01:00
dashevchenko
b567341481 added DeviceProfileService and AssetProfileService to TBContext 2022-12-15 12:36:23 +02:00
nickAS21
09e5060bef sparkplug: connection3 2022-12-15 12:22:26 +02:00
Andrew Shvayka
10587d797e
Merge pull request #7788 from ViacheslavKlimov/fix/sysadmin-ws-session 
[3.4.3] Fix NPE on WS subscription for sysadmin
 2022-12-15 12:07:51 +02:00
nickAS21
1bf02b75f2 sparkplug: connection 2022-12-15 11:40:04 +02:00
ViacheslavKlimov
a6bfb049aa Improvements for notification templates 2022-12-14 19:02:23 +02:00
ViacheslavKlimov
377f59400d BaseController refactoring: remove boilerplate permission checks 2022-12-14 18:57:57 +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
cdbb5232f1 updated sql schema update 2022-12-14 12:29:38 +02:00
dashevchenko
201078714c added alarm comment info object, refactoring 2022-12-14 12:20:23 +02:00