Andrew Shvayka
|
4972c5950d
|
Merge pull request #8233 from thingsboard/bug/rest-template-concurrency
REST client concurrency mode fix on token refresh
|
2023-03-17 15:23:09 +02:00 |
|
ViacheslavKlimov
|
6c40e2e40e
|
Merge remote-tracking branch 'origin/feature/notification-system' into feature/notification-system
|
2023-03-17 15:04:00 +02:00 |
|
Vladyslav_Prykhodko
|
e6a56d0099
|
Merge remote-tracking branch 'klimov/feature/notification-system' into feature/notification-system
|
2023-03-17 14:41:09 +02:00 |
|
Igor Kulikov
|
8d3278c355
|
Add tenantId to device and asset profile info objects
|
2023-03-17 14:21:27 +02:00 |
|
Igor Kulikov
|
c03865e50b
|
Add tenantId to device and asset profile info objects
|
2023-03-17 14:18:34 +02:00 |
|
Igor Kulikov
|
eac7ce25a8
|
Add tenantId to device and asset profile info objects
|
2023-03-17 14:17:24 +02:00 |
|
ViacheslavKlimov
|
3b8ed5fae6
|
Notification rules improvements; new platform users filters
|
2023-03-17 14:03:03 +02:00 |
|
Andrii Shvaika
|
1960d99504
|
REST template concurrency
|
2023-03-17 13:50:49 +02:00 |
|
zbeacon
|
a889649d32
|
Added sorting to test for alarm assignment, added and to where clause for filter by assigneeId
|
2023-03-17 12:55:44 +02:00 |
|
zbeacon
|
89ee862b13
|
Added sorting for alarm assignee field in query
|
2023-03-17 11:28:59 +02:00 |
|
YevhenBondarenko
|
535b411b7e
|
Merge branch 'feature/notification-system' of github.com:thingsboard/thingsboard into feature/home-page
|
2023-03-17 10:01:17 +01:00 |
|
Igor Kulikov
|
d5d7463904
|
UI: Entities route improvements.
|
2023-03-16 16:16:14 +02:00 |
|
Vladyslav_Prykhodko
|
ca2fac4b9d
|
UI: Add new notification rule settings
|
2023-03-16 15:45:34 +02:00 |
|
Artem Dzhereleiko
|
5e212366c2
|
UI: Fixed height of expation panel for widget settings
|
2023-03-16 14:30:02 +02:00 |
|
Igor Kulikov
|
41d6f383c6
|
UI: Entities table header style improvement.
|
2023-03-16 13:26:58 +02:00 |
|
dashevchenko
|
ce7d56332b
|
Merge remote-tracking branch 'upstream/develop/3.5' into alarmCommentFix
|
2023-03-16 13:26:40 +02:00 |
|
ViacheslavKlimov
|
1e7c1a8a5a
|
Merge branch 'develop/3.5' into feature/notification-system
|
2023-03-16 13:12:35 +02:00 |
|
ViacheslavKlimov
|
4a20adc62e
|
Alarm related notification rules
|
2023-03-16 13:12:04 +02:00 |
|
Igor Kulikov
|
fde346d8e4
|
UI: Router tabs improvements. Improve entities table to watch router data changes.
|
2023-03-16 13:07:10 +02:00 |
|
Artem Dzhereleiko
|
1172d1ce77
|
UI: Fixed expantion panel with hint
|
2023-03-16 13:05:46 +02:00 |
|
dashevchenko
|
c748702933
|
fixed tests
|
2023-03-16 12:37:10 +02:00 |
|
Seraphym-Tuhai
|
37cbc75968
|
Merge branch 'develop/3.5' of https://github.com/thingsboard/thingsboard into allure
|
2023-03-16 12:27:30 +02:00 |
|
YevhenBondarenko
|
d13a458eb0
|
saveCUrrentSystemInfo improvements
|
2023-03-16 10:21:40 +01:00 |
|
Artem Dzhereleiko
|
e96e355a31
|
UI: Fixed stepper for device and device profile dialog
|
2023-03-16 11:05:23 +02:00 |
|
YevhenBondarenko
|
118fc1554a
|
added TbCoreComponent to the SystemInfoService
|
2023-03-15 18:01:29 +01:00 |
|
Vladyslav_Prykhodko
|
c7dbf6be89
|
UI: Add new notification type alarm assignment
|
2023-03-15 18:39:06 +02:00 |
|
dashevchenko
|
a0f46e2e24
|
fixed test
|
2023-03-15 18:37:42 +02:00 |
|
YevhenBondarenko
|
4cb2a304ee
|
added getSystemInfo to the rest client
|
2023-03-15 17:06:05 +01:00 |
|
YevhenBondarenko
|
8ede0b2822
|
added ability to send system info throw ZK
|
2023-03-15 16:54:23 +01:00 |
|
Vladyslav_Prykhodko
|
ec11d4174b
|
UI: Improvement rule notification alarm
|
2023-03-15 17:26:50 +02:00 |
|
Andrew Shvayka
|
444c05a76c
|
Merge pull request #8220 from smatvienko-tb/fix/tests-awaitForDeviceActorToReceiveSubscription
[3.5] Fix tests - await for device actor to receive subscription
|
2023-03-15 17:24:29 +02:00 |
|
Seraphym-Tuhai
|
40874d1ee3
|
fix test 'remove root rule chain from details view'
|
2023-03-15 17:19:22 +02:00 |
|
Vladyslav_Prykhodko
|
e69970b09f
|
UI: Fix notification escalation table
|
2023-03-15 16:15:53 +02:00 |
|
Andrew Shvayka
|
c4e0586265
|
Merge pull request #7833 from smatvienko-tb/fix/logNode-isStandardForTBEL
[3.5] Custom TBEL script ignored fix for TbLogNode
|
2023-03-15 15:11:28 +02:00 |
|
nickAS21
|
8236e26e5c
|
sparkplug: delete isSparkplug from transport proto
|
2023-03-15 14:53:03 +02:00 |
|
Vladyslav_Prykhodko
|
a39db0a1cf
|
UI: Fix notification after change API
|
2023-03-15 13:28:31 +02:00 |
|
Artem Dzhereleiko
|
da4d0f93a3
|
UI: Fix horizontal stepper scroll
|
2023-03-15 13:26:19 +02:00 |
|
Seraphym-Tuhai
|
d9369feef0
|
refactoring
|
2023-03-15 13:23:10 +02:00 |
|
Serafym
|
bf7fc25957
|
Merge branch 'develop/3.5' into allure
|
2023-03-15 12:43:11 +02:00 |
|
ViacheslavKlimov
|
0d07d70818
|
Merge remote-tracking branch 'origin/feature/notification-system' into feature/notification-system
|
2023-03-15 12:32:43 +02:00 |
|
ViacheslavKlimov
|
ba8f27fa76
|
Notification system refactoring and improvements
|
2023-03-15 12:32:23 +02:00 |
|
Sergey Matvienko
|
13b59bf85f
|
tests: awaitForDeviceActorToReceiveSubscription
|
2023-03-15 11:27:12 +01:00 |
|
Artem Dzhereleiko
|
8c64b76b14
|
UI: fix ui
|
2023-03-15 12:06:47 +02:00 |
|
Seraphym-Tuhai
|
5b620ffec3
|
add message in assertions of tests on redirect to documentation page
|
2023-03-14 18:15:52 +02:00 |
|
YevhenBondarenko
|
eea8f977b1
|
added tenant profile type to the entityTableMap (EntityQuery)
|
2023-03-14 16:44:31 +01:00 |
|
Andrew Shvayka
|
410042e1dc
|
Merge pull request #8185 from Seraphym-Tuhai/fix-ui-tests
[3.5] fix tests after update on UI
|
2023-03-14 17:42:54 +02:00 |
|
Andrew Shvayka
|
519afb47a8
|
Merge pull request #8217 from thingsboard/fix_bug_sparkplug_device_offline
[fix bug][3.4.5] failed_close_session_of_device
|
2023-03-14 17:39:45 +02:00 |
|
YevhenBondarenko
|
0be3c0b5bb
|
removed countEntitiesByTypes and added ability to use Entity count query for sysadmin
|
2023-03-14 16:26:55 +01:00 |
|
Seraphym-Tuhai
|
bd0e768983
|
attached epic, feature and description to UI tests
|
2023-03-14 17:26:49 +02:00 |
|
Vladyslav_Prykhodko
|
88128640e9
|
Merge branch 'feature/notification-system' of github.com:thingsboard/thingsboard into feature/notification-system
|
2023-03-14 16:37:50 +02:00 |
|