2171 Commits

Author SHA1 Message Date
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
8060c6780d fix data convertion for BigInteger values(example: SIM, ICCID) that stored in DB as strings 2023-01-27 10:56:21 +02:00
ShvaykaD
f5e20b5a3e move default queue names and topics to DataConstants 2023-01-26 13:37:19 +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
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
e8d651a108 fixed audit logs 2023-01-12 18:42:47 +02:00
dashevchenko
071b68e938 Alarm comment is not entity any more 2023-01-12 16:35:10 +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
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
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
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
dashevchenko
dd55d8c9d2 Merge remote-tracking branch 'upstream/master' into alarmComments 2022-12-22 15:08:33 +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
dashevchenko
c89374e506 added ttl service 2022-12-22 13:56:45 +02:00
ShvaykaD
652a8c9e89 added getEntityType method in EntityDaoService 2022-12-22 13:02:39 +02:00
dashevchenko
408afb67f3 fixed test 2022-12-21 16:10:34 +02:00
dashevchenko
2db28e2296 fixed test 2022-12-21 13:41:42 +02:00
Igor Kulikov
1c53a90c1a Fix field constraint validation message 2022-12-21 12:36:24 +02:00
dashevchenko
c81e442b35 fixed NPE 2022-12-20 18:05:33 +02:00
dashevchenko
5ba574af36 fixed pull request comments 2022-12-20 15:42:41 +02:00
dashevchenko
df31723f58 pull request comments 2022-12-20 15:37:37 +02:00
dashevchenko
955369a7f1 refactoring 2022-12-20 15:14:45 +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
ShvaykaD
3d27340cb5 fix audit log tests 2022-12-16 15:52:20 +02:00
ShvaykaD
9e33a8d7be fix typo after refactoring in BaseEntityServiceRegistryTest 2022-12-15 16:59:26 +02:00
ShvaykaD
e74a5686a2 added message for assertNotNull check in BaseEntityServiceRegistryTest 2022-12-15 16:32:39 +02:00
ShvaykaD
1d5bf98504 removed unused import in DefaultEntityServiceRegistry 2022-12-15 15:22:53 +02:00
ShvaykaD
da0a0aed30 fix typo after refactoring 2022-12-15 15:18:01 +02:00
ShvaykaD
5c5b83c4ce updated logic & fix typos after review 2022-12-15 15:10:38 +02:00
Andrii Shvaika
aadc2e35b7 Merge with master 2022-12-15 14:27:13 +02:00
ShvaykaD
7d9f437927 rollback optional changes for fetchEntityCustomerId method 2022-12-14 12:37:19 +02:00
ShvaykaD
f167c7c48b code cleanup after review 2022-12-14 12:30:27 +02:00
dashevchenko
201078714c added alarm comment info object, refactoring 2022-12-14 12:20:23 +02:00
ShvaykaD
e21cae2a43 fix typo in BaseRelationService 2022-12-12 19:32:40 +02:00
ShvaykaD
0bef324a1f refactoring after review 2022-12-12 19:18:45 +02:00
Andrew Shvayka
5e1fa45a10
Merge pull request #7768 from ViacheslavKlimov/fix/pagelink-validation
[3.4.3] Additional pageLink validation
2022-12-12 16:35:46 +02:00
Andrew Shvayka
4ce6cd0901
Merge pull request #7773 from volodymyr-babak/bug/fix-duplicate-ws-updates
[3.4.3][Bug] Getting a lot of updates over WS in case of aggregation query, even if no real updates happened
2022-12-12 16:33:41 +02:00