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
|
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 |
|
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
|
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
|
071b68e938
|
Alarm comment is not entity any more
|
2023-01-12 16:35:10 +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
|
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
|
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 |
|
zbeacon
|
5710f01c03
|
Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning
|
2022-12-22 08:30:42 +02:00 |
|
dashevchenko
|
df31723f58
|
pull request comments
|
2022-12-20 15:37:37 +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 |
|
ViacheslavKlimov
|
55fc7131fb
|
Validation for rule node configuration; improve validation error message
|
2022-12-17 16:58:58 +02:00 |
|
dashevchenko
|
201078714c
|
added alarm comment info object, refactoring
|
2022-12-14 12:20:23 +02:00 |
|
zbeacon
|
f29d1b0eff
|
Added HasLabel, HasEmail, HasTitle interfaces to get correctly label in entityService, refactoring for alarms processing. The main point is swithing from Alarm entity to AlarmInfo
|
2022-12-13 13:39:09 +02:00 |
|
Andrew Shvayka
|
0ee678e234
|
Merge pull request #7761 from ViacheslavKlimov/fix/entity-view-ts
[3.4.3] Fix no timeseries data in widget for entity view; fix State Chart invalid behavior
|
2022-12-12 15:54:29 +02:00 |
|
zbeacon
|
08e356a415
|
Updated alarm assignment to send websocket update on assign, added originator label to alarm info
|
2022-12-12 13:00:22 +02:00 |
|
ViacheslavKlimov
|
4851f1af9f
|
Fix comparing entity versions: ignore tenantId and createdTime
|
2022-12-09 19:03:57 +02:00 |
|
ViacheslavKlimov
|
808b1dc0c5
|
'Show merge commits' option in repository settings
|
2022-12-09 18:31:59 +02:00 |
|
dashevchenko
|
8a157397d4
|
added rest controller for alarm comments
|
2022-12-08 17:04:30 +02:00 |
|
ViacheslavKlimov
|
28d6e4c736
|
Copy queryId when updating query
|
2022-12-08 13:16:34 +02:00 |
|
Igor Kulikov
|
109caee7c7
|
Version set to 3.4.3-SNAPSHOT
|
2022-12-05 17:54:19 +02:00 |
|
zbeacon
|
591708b029
|
Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning
|
2022-12-05 15:23:09 +02:00 |
|
Andrii Shvaika
|
770f069f22
|
Version set to 3.4.2
|
2022-12-01 12:04:14 +02:00 |
|
zbeacon
|
0dcde60443
|
Added alarm assignment feature and tests for it
|
2022-11-30 13:06:00 +02:00 |
|
ShvaykaD
|
3820909d65
|
bugfix: #7683
|
2022-11-25 16:36:32 +02:00 |
|
Igor Kulikov
|
d10f64c348
|
Refactor MVEL -> TBEL
|
2022-11-22 16:38:01 +02:00 |
|