13621 Commits

Author SHA1 Message Date
Igor Kulikov
b329fbf31e UI: Angular15 migration 2023-02-16 19:33:01 +02:00
Igor Kulikov
f4f7e8f284 UI: Angular15 migration 2023-02-16 19:32:02 +02:00
Igor Kulikov
0c1f284a11 UI: Angular15 migration 2023-02-16 19:29:01 +02:00
Igor Kulikov
0e338f3946 UI: Angular15 migration 2023-02-16 19:28:12 +02:00
Igor Kulikov
9c230e6d50 UI: Angular15 migration 2023-02-16 19:26:29 +02:00
Igor Kulikov
feffef39ef UI: Angular15 migration 2023-02-16 19:24:42 +02:00
nickAS21
9be785c32c sparkplug: comment3 2023-02-16 19:10:27 +02:00
Andrew Shvayka
33ecbb238b
Merge pull request #8097 from rusikv/alarm-assign-ui-dev
[WIP][3.5] UI: Alarm assignment
2023-02-16 18:48:15 +02:00
nickAS21
67c0704a46 sparkplug: comment2 2023-02-16 18:48:04 +02:00
Andrii Shvaika
04eb8c989a Revert the AlarmInfo items. We will update the assignee via separate message 2023-02-16 18:47:51 +02:00
nickAS21
a80b3cb536 sparkplug: tests rpc and attributes 2023-02-16 18:02:50 +02:00
dashevchenko
a613e1dbc6 refactoring 2023-02-16 17:46:24 +02:00
rusikv
994971a5cd UI alarm assignment implementation 2023-02-16 14:51:24 +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
dashevchenko
4470ae9a05 added tests 2023-02-16 13:45:01 +02:00
Vladyslav_Prykhodko
8589047fcc UI: Refactoring web socket 2023-02-16 12:59:43 +02:00
dashevchenko
39070ead53 refactoring 2023-02-16 12:23:22 +02:00
nickAS21
1684b924e8 sparkplug: comments 2023-02-16 11:28:48 +02:00
dashevchenko
ab643063f2 refactoring 2023-02-16 11:19:42 +02:00
Sergey Matvienko
314071b761 SPRING_DATASOURCE_HIKARI_REGISTER_MBEANS parameter added 2023-02-16 09:40:48 +01:00
dashevchenko
559b741749 added REST method in UserController to get users by query 2023-02-16 00:37:10 +02:00
Andrii Shvaika
74fca60cd2 License header 2023-02-15 19:17:27 +02:00
Andrii Shvaika
3932993b58 Alarm assignment improvements 2023-02-15 19:14:11 +02:00
Andrew Shvayka
c4f5d43618
Merge pull request #8090 from imbeacon/feature-alarm-assigning-with-revert
Feature alarm assigning with revert
2023-02-15 19:13:24 +02:00
dashevchenko
e046e8caa6 updated sql script 2023-02-15 18:58:26 +02:00
dashevchenko
453e81e57e updated sql script 2023-02-15 18:57:11 +02:00
nickAS21
59e48ca0ce sparkplug: attribute device/node from deviceProfile if null 2023-02-15 18:43:07 +02:00
Vladyslav_Prykhodko
eddb06b536 UI: Improvement notification components styles 2023-02-15 17:49:28 +02:00
nickAS21
f4af14ed42 sparkplug: attribute device/node from deviceProfile 2023-02-15 17:31:16 +02:00
dashevchenko
644f94d012 refactoring 2023-02-15 17:14:48 +02:00
dashevchenko
2c5c0a17bf refactoring 2023-02-15 17:12:45 +02:00
dashevchenko
c15c4526aa updated RNG used for reset password token to secure one 2023-02-15 17:05:01 +02:00
zbeacon
0eff914d69 Fix for test 2023-02-15 15:44:23 +02:00
nickAS21
524952d264 sparkplug: rpc device 2023-02-15 14:19:10 +02:00
Andrii Shvaika
75e9bb220d Rule node description update 2023-02-15 13:28:58 +02:00
dashevchenko
133c8f9ae4 added new column for user_credentials table 2023-02-15 12:25:30 +02:00
nickAS21
d7050074bc sparkplug: rpc 2023-02-14 18:55:28 +02:00
Vladyslav_Prykhodko
82719b89ef UI: Improvement notification componets styles 2023-02-14 18:16:29 +02:00
Igor Kulikov
960ea641c1 UI: menu improvements 2023-02-14 16:59:04 +02:00
Igor Kulikov
59508be5d7 UI: Minor improvements 2023-02-14 15:33:35 +02:00
Igor Kulikov
290e15ecb8 UI: Use user settings service. 2023-02-14 12:04:23 +02:00
Vladyslav_Prykhodko
3eba03cccc Fixed after merge 'upstream/develop/3.5' 2023-02-14 11:39:29 +02:00
Igor Kulikov
97a0a7e537 Merge branch 'develop/3.5' into feature/menu-improvements 2023-02-14 11:32:06 +02:00
Igor Kulikov
359565e115 UI: Router tabs style improvements 2023-02-14 11:31:34 +02:00
Vladyslav_Prykhodko
2212a6d9be Merge remote-tracking branch 'upstream/develop/3.5' into feature/notification-system 2023-02-14 11:09:34 +02:00
rusikv
fcbdc4194b changed wrong variable name 2023-02-14 10:35:25 +02:00
zbeacon
9250af1904 Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning 2023-02-13 19:55:24 +02:00
Igor Kulikov
916faae774 UI: Menu improvements 2023-02-13 19:09:05 +02:00
Vladyslav_Prykhodko
7d6fcd85c0 UI: Add support create template without save when create notification 2023-02-13 18:12:12 +02:00