491 Commits

Author SHA1 Message Date
Andrii Landiak
3d7097536c Merge branch 'develop/3.5' into feature/x509-device-cert-impr 2023-02-23 13:09:01 +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
f214864503 added controller methods for saving user settings in UserController 2023-02-07 13:55:16 +02:00
Andrii Landiak
60c7d213cc Merge branch 'develop/3.5' of github.com:AndriiLandiak/thingsboard into feature/x509-device-cert-impr 2023-02-02 10:06:55 +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
Andrii Landiak
7957da4a9e Updated: send full chain to kafka with single message and do whole logic on core 2023-01-20 19:02:14 +02:00
Andrii Landiak
05ed291635 Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into feature/x509-device-cert-impr 2023-01-16 17:51:25 +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
Andrii Landiak
5d35fa1f26 Add ability to upgrade device credentials if chain match with uploaded device profile certificate. 2023-01-12 17:18:29 +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
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
d3a975770b Merge remote-tracking branch 'upstream/master' into alarmComments 2023-01-09 12:38:21 +02:00
Igor Kulikov
4c3154da4b Version set to 3.4.4-SNAPSHOT 2022-12-28 13:33:57 +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
dashevchenko
408afb67f3 fixed test 2022-12-21 16:10:34 +02:00
dashevchenko
2db28e2296 fixed test 2022-12-21 13:41:42 +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
ShvaykaD
3d27340cb5 fix audit log tests 2022-12-16 15:52:20 +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
0bef324a1f refactoring after review 2022-12-12 19:18:45 +02:00
ShvaykaD
661480ff39 base entity service improvement: init commit 2022-12-09 17:33:17 +02:00
dashevchenko
8a157397d4 added rest controller for alarm comments 2022-12-08 17:04:30 +02:00
Igor Kulikov
109caee7c7 Version set to 3.4.3-SNAPSHOT 2022-12-05 17:54:19 +02:00
Andrii Shvaika
770f069f22 Version set to 3.4.2 2022-12-01 12:04:14 +02:00
Andrew Shvayka
f6b4406341
Merge pull request #7518 from smatvienko-tb/cassandra-cloud-astra
[3.4.2] Cassandra cloud connects to Datastax Astra DB
2022-11-09 13:10:38 +02:00
ShvaykaD
ee98f203ef added findAlarmById method to AlarmService 2022-11-04 15:14:43 +02:00
Sergey Matvienko
069e77eb17 Merge remote-tracking branch 'ce/master' into cassandra-cloud-astra 2022-11-01 14:11:58 +02:00
Andrew Shvayka
3844ff6372
Merge pull request #7395 from volodymyr-babak/feature/edge-multi-customers
[3.4.2] Edge PE - customers hierarchy support
2022-10-31 18:49:01 +02:00
Andrii Shvaika
18678cae49 Improved user search in the relation rule node 2022-10-31 16:13:06 +02:00
Volodymyr Babak
dd1effafc4 Do not send delete notification if related edges empty. Minor code refactoring 2022-10-10 14:32:19 +03:00
Andrew Shvayka
cd6e50312c
Merge pull request #7348 from thingsboard/feature/math-rule-node
[3.4.2] Math rule node
2022-09-29 12:54:07 +03:00
Andrew Shvayka
62cd74ee40
Merge pull request #7339 from ViacheslavKlimov/feature/tenant-jdbc-logging
[3.4.2] DB calls stats
2022-09-28 15:44:15 +03:00
Igor Kulikov
f14a337c73 Merge branch 'master' into feature/math-rule-node 2022-09-28 15:01:46 +03:00
Andrii Shvaika
58fd012f7f Merge remote-tracking branch 'origin/feature/assetProfile' 2022-09-27 15:11:55 +03:00