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

2962 Commits

Author SHA1 Message Date
Volodymyr Babak
96f0045d0b Merge remote-tracking branch 'upstream/develop/3.5' into edge/public-customer 2023-01-13 09:07:19 +02:00
dashevchenko
e8d651a108 fixed audit logs 2023-01-12 18:42:47 +02:00
Volodymyr Babak
803167608b Sync edge test - added check for public customer 2023-01-12 18:18:01 +02:00
Volodymyr Babak
307ef7814b Update EntityViewControllerTest after fixes in TbEntityViewService 2023-01-12 17:59:19 +02:00
Volodymyr Babak
fd4707c20e Merge remote-tracking branch 'origin/edge/rule-chain-in-profiles' into edge/public-customer 2023-01-12 15:43:24 +02:00
ViacheslavKlimov
91a4de7780 Send notifications via Slack independently of the targets 2023-01-12 15:01:23 +02:00
ViacheslavKlimov
6eea14bcf7 Add default subject to notification template, add 'enabled' option; refactoring 2023-01-12 13:58:19 +02:00
Volodymyr Babak
09b41e1aef Notify edge in case assign entity to public customer 2023-01-12 12:56:52 +02:00
dashevchenko
0eb51cb17d Added Noxss, Length validation for alarm comment, deleted ttl service for alarm comments, added comment creation for ack, clear, severity updated events, fixed tests. 2023-01-11 17:36:22 +02:00
ViacheslavKlimov
7524dd9258 Remove NotificationOriginatorType, use EntityType; refactor NotificationInfo 2023-01-11 15:18:22 +02:00
ViacheslavKlimov
38c9d5dcd8 Move delivery methods to notification template; refactoring 2023-01-11 14:58:18 +02:00
dashevchenko
d7d53a5c14 Merge remote-tracking branch 'upstream/develop/3.5' into alarmComments 2023-01-10 17:24:14 +02:00
Andrii Shvaika
e23fc18dc6 Merge remote-tracking branch 'origin/master' into develop/3.5 2023-01-10 17:04:35 +02:00
Volodymyr Babak
bb5e36ba09 Improve stability of device profile edge test 2023-01-10 15:16:41 +02:00
Volodymyr Babak
7cc1a3f33b Improve logic to group latest by ts 2023-01-10 10:28:14 +02:00
dashevchenko
d3a975770b Merge remote-tracking branch 'upstream/master' into alarmComments 2023-01-09 12:38:21 +02:00
Volodymyr Babak
d0847bb80a Added asset & device profiles default edge rule chain test. Added device & device profile software id and default dashboard id tests 2023-01-09 11:08:13 +02:00
ViacheslavKlimov
5c5d683236 Add indexes for notification entities; refactoring 2023-01-08 13:42:43 +02:00
ViacheslavKlimov
1317a8aca9 Rename WebSocket delivery method to push-notification; refactoring 2023-01-06 18:34:35 +02:00
ViacheslavKlimov
654e61683a Improvements and refactoring 2023-01-06 17:50:34 +02:00
zbeacon
7a4a69d114 Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning 2023-01-05 14:09:10 +02:00
zbeacon
5700fe630d Updated security check and tests 2023-01-05 11:35:46 +02:00
ViacheslavKlimov
141bd74113 Notification target and template api docs; improvements 2023-01-02 17:25:03 +02:00
Volodymyr Babak
a74971e56b Improved edge install instructions text. Fixed testGetEdgeInstallInstructions test 2022-12-30 18:04:13 +02:00
Volodymyr Babak
e74f03e5be EdgeControllerTest - code style fixes and IDEA warning fixes 2022-12-30 16:47:49 +02:00
Volodymyr Babak
8f112f763f Merge branch 'develop/3.5' of github.com:volodymyr-babak/thingsboard into edge-install-instructions 2022-12-30 16:44:48 +02:00
zbeacon
d9add9bdf8 Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning 2022-12-29 20:49:29 +02:00
Volodymyr Babak
2a492a3a15 Move firmware and device data check into update device credentials test 2022-12-28 16:07:49 +02:00
Volodymyr Babak
99a3e9769f Edge test - speed up test by moving firmware and device data check into separate method 2022-12-28 16:02:56 +02:00
Volodymyr Babak
51a3620b11 Edge sync test - add check for rule chain msg is root 2022-12-27 18:22:28 +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
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
ViacheslavKlimov
409976c6a3 Multiple notification targets for request; improvements and refactoring 2022-12-23 18:47:40 +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
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
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
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
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
Volodymyr Babak
268f0499bf Merge branch 'master' of github.com:thingsboard/thingsboard into edge/misc-fixes 2022-12-15 14:53:39 +02:00
Andrii Shvaika
aadc2e35b7 Merge with master 2022-12-15 14:27:13 +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
ViacheslavKlimov
a6bfb049aa Improvements for notification templates 2022-12-14 19:02:23 +02:00