2725 Commits

Author SHA1 Message Date
Andrii Shvaika
76b133376c Merge remote-tracking branch 'origin/develop/3.5' into feature/alarm-assign 2023-02-28 13:38:04 +02:00
Andrii Shvaika
b9cf5c7836 Improvement of the save alarm procedure 2023-02-28 12:03:59 +02:00
Andrew Shvayka
3e313371d1
Merge pull request #8143 from smatvienko-tb/feature/test-improvements-memory
[3.5] Test improvements - memory
2023-02-28 11:52:58 +02:00
Sergey Matvienko
368455119b Shutdown callback executor for RemoteJsInvokeService. Call shutdown timeoutExecutorService from AbstractScriptInvokeService 2023-02-27 21:58:12 +01:00
Sergey Matvienko
af62bc1d98 Shutdown jsExecutor after Nashorn destroy 2023-02-27 21:30:37 +01:00
Sergey Matvienko
0f324d1132 HashPartitionService: set myPartitions atomically 2023-02-24 20:54:40 +01:00
Andrii Shvaika
69b5a5f425 Alarm Service refactoring 2023-02-23 19:03:04 +02:00
Andrii Shvaika
c922bbb989 Alarm service refactroing 2023-02-23 12:31:07 +02:00
Andrii Shvaika
feb84ace48 Deprecation of the alarm status 2023-02-20 17:11:49 +02:00
zbeacon
0427eeea9d Added check - does assigned information available 2023-02-18 13:07:32 +02:00
Andrii Shvaika
c16dfd4407 Alarm query updates 2023-02-17 16:15:17 +02:00
Andrii Shvaika
d77e8f0cba Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into feature/alarm-assign 2023-02-17 12:44:36 +02:00
Andrii Shvaika
f877fdef3f Alarm assignee as an object 2023-02-17 12:37:30 +02:00
Andrii Shvaika
8b6950031e Alarm asignee updates 2023-02-17 12:14:59 +02:00
dashevchenko
b261cb2ab1 renamed UserData to UserEmailInfo 2023-02-17 11:12:46 +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
dashevchenko
a613e1dbc6 refactoring 2023-02-16 17:46: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
dashevchenko
559b741749 added REST method in UserController to get users by query 2023-02-16 00:37:10 +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