Andrii Shvaika
|
04eb8c989a
|
Revert the AlarmInfo items. We will update the assignee via separate message
|
2023-02-16 18:47:51 +02:00 |
|
Andrii Shvaika
|
c392df2b8f
|
Alarm Query to fetch onloy assigned alarms
|
2023-02-16 14:10:50 +02:00 |
|
zbeacon
|
dda627b63e
|
Added getting NameLabelAndCustomerDetails to EntityService
|
2023-02-16 14:03:20 +02:00 |
|
Andrii Shvaika
|
3932993b58
|
Alarm assignment improvements
|
2023-02-15 19:14:11 +02:00 |
|
zbeacon
|
9250af1904
|
Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning
|
2023-02-13 19:55:24 +02:00 |
|
dashevchenko
|
683dee03da
|
refactoring
|
2023-02-12 20:52:18 +02:00 |
|
dashevchenko
|
a25e328b7c
|
fixed update settings method
|
2023-02-11 00:25:52 +02:00 |
|
Andrii Shvaika
|
b92fa8ce5d
|
Minor code review improvements
|
2023-02-10 18:40:01 +02:00 |
|
dashevchenko
|
6c5054a6e8
|
added caching, added PUT methods, refactored code
|
2023-02-10 17:08:27 +02:00 |
|
dashevchenko
|
f3b6531362
|
merged with develop/3.5
|
2023-02-07 14:59:21 +02:00 |
|
dashevchenko
|
16c5a4f1f9
|
refactoring
|
2023-02-07 14:49:09 +02:00 |
|
dashevchenko
|
f214864503
|
added controller methods for saving user settings in UserController
|
2023-02-07 13:55:16 +02:00 |
|
zbeacon
|
26a9f10109
|
Updated alarm websocket subscriptions
|
2023-01-31 18:41:41 +02:00 |
|
Andrii Shvaika
|
a203c336f1
|
Merge with master
|
2023-01-31 16:20:04 +02:00 |
|
Igor Kulikov
|
cbdc4517e4
|
Update license header year to 2023
|
2023-01-31 10:43:56 +02:00 |
|
ShvaykaD
|
f5e20b5a3e
|
move default queue names and topics to DataConstants
|
2023-01-26 13:37:19 +02:00 |
|
Volodymyr Babak
|
08114319eb
|
DEPRECATED - deprecated. Revert ENTITY_MERGE_RPC_MESSAGE and set as deprecated
|
2023-01-24 12:56:20 +02:00 |
|
Volodymyr Babak
|
f7db1d6612
|
Revert deprecated enum
|
2023-01-23 17:03:41 +02:00 |
|
Volodymyr Babak
|
94c69acf5d
|
Introduced BaseDeviceEdgeProcessor
|
2023-01-23 12:21:48 +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
|
44dcda3bc5
|
Changes, accroding to comments
|
2023-01-17 08:15:00 +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 |
|
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
|
24215f2bce
|
Added constructor for alarmOperationResult
|
2023-01-16 10:15:41 +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 |
|
Volodymyr Babak
|
4f4ef6fa7d
|
DeviceProfileUpdateMsg - make defaultDashboardId optional
|
2023-01-12 17:38:12 +02:00 |
|
dashevchenko
|
071b68e938
|
Alarm comment is not entity any more
|
2023-01-12 16:35:10 +02:00 |
|
zbeacon
|
f9e1077bca
|
Updated findSeverity method
|
2023-01-12 10:03:04 +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 |
|
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 |
|
Andrii Shvaika
|
e23fc18dc6
|
Merge remote-tracking branch 'origin/master' into develop/3.5
|
2023-01-10 17:04:35 +02:00 |
|
dashevchenko
|
ed7cd2c255
|
Added Noxss annotations
|
2023-01-09 17:53:46 +02:00 |
|
dashevchenko
|
0427425f83
|
Added email for AlarmCommentInfo
|
2023-01-09 13:06:55 +02:00 |
|
dashevchenko
|
d3a975770b
|
Merge remote-tracking branch 'upstream/master' into alarmComments
|
2023-01-09 12:38:21 +02:00 |
|
Volodymyr Babak
|
ab924d6e13
|
Added default edge rule chain to asset/device profiles. Added propagation of software id to edge
|
2023-01-05 18:05:56 +02:00 |
|
Volodymyr Babak
|
46f8ce990b
|
Added getEdgeDockerInstallInstructions method to RestClient
|
2023-01-03 11:11:46 +02:00 |
|
zbeacon
|
a812a88db1
|
Refactoring to keep EntityService
|
2022-12-30 12:51:45 +02:00 |
|
zbeacon
|
022aee36d0
|
Merge with develop/3.5
|
2022-12-29 20:49:58 +02:00 |
|
zbeacon
|
d9add9bdf8
|
Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning
|
2022-12-29 20:49:29 +02:00 |
|
Igor Kulikov
|
4c3154da4b
|
Version set to 3.4.4-SNAPSHOT
|
2022-12-28 13:33:57 +02:00 |
|
Andrii Shvaika
|
34d7a6ced8
|
Merge remote-tracking branch 'origin/master' into develop/3.5
|
2022-12-27 13:06:46 +02:00 |
|
Andrew Shvayka
|
19513ec027
|
Merge pull request #7804 from ShvaykaD/feature/base-entity-service-improvement
[3.5] improvements for base entity service v2
|
2022-12-22 14:14:47 +02:00 |
|
ShvaykaD
|
652a8c9e89
|
added getEntityType method in EntityDaoService
|
2022-12-22 13:02:39 +02:00 |
|
zbeacon
|
5710f01c03
|
Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning
|
2022-12-22 08:30:42 +02:00 |
|
dashevchenko
|
408afb67f3
|
fixed test
|
2022-12-21 16:10:34 +02:00 |
|