12265 Commits

Author SHA1 Message Date
zbeacon
1a1360e51a Updated getting alarmData with assigned info 2023-01-31 20:20:55 +02:00
zbeacon
26a9f10109 Updated alarm websocket subscriptions 2023-01-31 18:41:41 +02:00
zbeacon
2524965ea1 Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning 2023-01-18 16:03:11 +02:00
zbeacon
58f94460cc Changes due to commits 2023-01-18 08:51:37 +02:00
Andrew Shvayka
a9828892ef
Merge pull request #7958 from vvlladd28/feature/ui-rule-node/deduplication
Add UI new rule node deduplication
2023-01-17 12:38:45 +02:00
Vladyslav_Prykhodko
5c9cc8c241 Add UI new rule node deduplication 2023-01-17 11:42:37 +02:00
zbeacon
6b03a9a248 Removed redundant check 2023-01-17 11:06:15 +02:00
zbeacon
334455e683 Fix for build after changes 2023-01-17 09:03:00 +02:00
zbeacon
44dcda3bc5 Changes, accroding to comments 2023-01-17 08:15:00 +02:00
Andrew Shvayka
05bb7c6313
Merge pull request #7952 from ShvaykaD/feature/deduplication-rule-node
[3.5] Deduplication rule node
2023-01-16 16:40:47 +02:00
Andrew Shvayka
865d2a03c2
Merge pull request #7929 from volodymyr-babak/edge/public-customer
[3.5] Push public customer to the edge - fixes usage of public dashboards on the edge
2023-01-16 15:58:42 +02:00
ShvaykaD
ea099ae70a deduplication rule node: first stage without redis 2023-01-16 15:55:36 +02:00
Volodymyr Babak
f0adf0a268 Merge remote-tracking branch 'upstream/develop/3.5' into edge/public-customer 2023-01-16 15:54:33 +02:00
Andrew Shvayka
5d08ef9289
Merge pull request #7914 from volodymyr-babak/edge/rule-chain-in-profiles
[3.5] Added default edge rule chain to asset/device profiles
2023-01-16 15:52:59 +02:00
Andrew Shvayka
3cf5fb1a0d
Merge pull request #7878 from volodymyr-babak/edge-install-instructions
[3.5] Add edge install instructions for docker
2023-01-16 15:49:30 +02:00
zbeacon
6d8252de15 Removed reduntant case in installation service 2023-01-16 13:19:55 +02:00
Volodymyr Babak
687cabdfcb Merge remote-tracking branch 'upstream/develop/3.5' into edge/rule-chain-in-profiles 2023-01-16 11:15:00 +02:00
zbeacon
8517a01570 Alarm info update 2023-01-16 11:00:41 +02:00
Volodymyr Babak
194859bdc0 Fixed upgrade service after merge with alarm comments feature 2023-01-16 10:51:40 +02:00
Volodymyr Babak
44a61cc063 Merge remote-tracking branch 'upstream/develop/3.5' into edge/public-customer 2023-01-16 10:35:12 +02:00
zbeacon
24215f2bce Added constructor for alarmOperationResult 2023-01-16 10:15:41 +02:00
zbeacon
1af6648ce9 Merge with develop/3.5 2023-01-16 10:01:05 +02:00
zbeacon
5494bc7d2b Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning 2023-01-16 10:00:45 +02:00
Andrew Shvayka
a190ef3ccf
Merge pull request #7762 from dashevchenko/alarmComments
[3.5] Alarm comments feature
2023-01-13 18:40:20 +02:00
dashevchenko
7792fe7293 deleted unused imports 2023-01-13 17:55:01 +02:00
dashevchenko
0a6d227364 refactoring 2023-01-13 16:37:13 +02:00
dashevchenko
2253933250 fixed audit logs 2023-01-13 14:20:10 +02:00
dashevchenko
55d4f22e46 fixed unit tests 2023-01-13 13:06:52 +02:00
dashevchenko
b80069500b fixed unit tests 2023-01-13 11:57:47 +02:00
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
4f4ef6fa7d DeviceProfileUpdateMsg - make defaultDashboardId optional 2023-01-12 17:38:12 +02:00
dashevchenko
715704d76a Refactoring 2023-01-12 16:56:21 +02:00
dashevchenko
071b68e938 Alarm comment is not entity any more 2023-01-12 16:35:10 +02:00
Volodymyr Babak
6a383eef01 DeviceEdgeProcessor - minor refactoring 2023-01-12 15:55:46 +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
dashevchenko
e0dd0d9369 updated ThingsboardInstallService 2023-01-12 13:16:26 +02:00
Volodymyr Babak
09b41e1aef Notify edge in case assign entity to public customer 2023-01-12 12:56:52 +02:00
zbeacon
f9e1077bca Updated findSeverity method 2023-01-12 10:03:04 +02:00
dashevchenko
36b0e80a23 updated comment length 2023-01-11 17:43:08 +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
Volodymyr Babak
59b4049560 Create public customer during edge sync and push to edge 2023-01-11 15:29:25 +02:00
Volodymyr Babak
fa6d395ffa Edge - push public customer to edge 2023-01-11 15:04:01 +02:00
zbeacon
37bc889f11 Updated queries 2023-01-11 14:51:57 +02:00
zbeacon
c99316976a Updated queries due to particle review 2023-01-11 13:20:20 +02:00
Volodymyr Babak
490c7a0793 Added class logging for fethers during sync 2023-01-11 12:40:21 +02:00
Andrii Shvaika
76082c7177 Version set to 3.5.0-SNAPSHOT 2023-01-10 17:24:26 +02:00
dashevchenko
d7d53a5c14 Merge remote-tracking branch 'upstream/develop/3.5' into alarmComments 2023-01-10 17:24:14 +02:00