Vladyslav_Prykhodko
|
fa1a5f086f
|
UI: Minor change in notification
|
2023-03-22 11:53:29 +02:00 |
|
dashevchenko
|
b8b1bce667
|
Merge remote-tracking branch 'upstream/develop/3.5' into alarmCommentFix
|
2023-03-21 19:18:58 +02:00 |
|
Vladyslav_Prykhodko
|
1b2b84e48e
|
Merge remote-tracking branch 'upstream/develop/3.5' into feature/notification-system
|
2023-03-21 15:32:23 +02:00 |
|
Igor Kulikov
|
240b0abb2a
|
Merge branch 'develop/3.5' into feature/menu-improvements
|
2023-03-21 13:34:20 +02:00 |
|
dashevchenko
|
b6adbd6ec8
|
moved logic to DefaultTbAlarmCommentService
|
2023-03-21 13:29:46 +02:00 |
|
dashevchenko
|
b42d663670
|
updated UI to display another default value for wsMessageQueuePerSession (1000 instead of 0)
|
2023-03-21 12:25:42 +02:00 |
|
Vladyslav_Prykhodko
|
26618fa3a2
|
Merge remote-tracking branch 'klimov/feature/notification-system' into feature/notification-system
|
2023-03-21 10:57:26 +02:00 |
|
ViacheslavKlimov
|
0308b0128d
|
Entities limit notifications
|
2023-03-20 17:33:34 +02:00 |
|
Andrii Shvaika
|
80f43b09fa
|
Merge remote-tracking branch 'origin/develop/3.5' into feature/notification-system
|
2023-03-20 16:42:53 +02:00 |
|
ViacheslavKlimov
|
1382c49881
|
Endpoint to find tenant profiles by ids
|
2023-03-20 14:06:53 +02:00 |
|
dashevchenko
|
74ce748059
|
changed default value for ws message queue limit per session from 0 to 1000
|
2023-03-20 12:10:08 +02:00 |
|
ViacheslavKlimov
|
ea7f876d4d
|
Tests fixes
|
2023-03-20 11:32:18 +02:00 |
|
ViacheslavKlimov
|
3f531d8235
|
Fix default notification configs creation; refactoring
|
2023-03-20 11:09:28 +02:00 |
|
ViacheslavKlimov
|
c34b6623ce
|
Default notification configs; improvements
|
2023-03-17 17:17: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 |
|
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 |
|
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 |
|
YevhenBondarenko
|
118fc1554a
|
added TbCoreComponent to the SystemInfoService
|
2023-03-15 18:01:29 +01:00 |
|
dashevchenko
|
a0f46e2e24
|
fixed test
|
2023-03-15 18:37:42 +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 |
|
YevhenBondarenko
|
eea8f977b1
|
added tenant profile type to the entityTableMap (EntityQuery)
|
2023-03-14 16:44:31 +01:00 |
|
YevhenBondarenko
|
0be3c0b5bb
|
removed countEntitiesByTypes and added ability to use Entity count query for sysadmin
|
2023-03-14 16:26:55 +01: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 |
|
YevhenBondarenko
|
76c92c9070
|
Merge branch 'feature/notification-system' of github.com:thingsboard/thingsboard into feature/home-page
|
2023-03-14 13:59:01 +01:00 |
|
dashevchenko
|
210aae6a86
|
updated alarm comment deletion
|
2023-03-14 14:15:37 +02:00 |
|
Oleksandra Matviienko
|
c73fc3e0fc
|
Merge remote-tracking branch 'upstream/develop/3.5' into feature/test_dependency_refactor
# Conflicts:
# dao/src/test/java/org/thingsboard/server/dao/service/BaseDeviceServiceTest.java
# dao/src/test/java/org/thingsboard/server/dao/service/BaseOtaPackageServiceTest.java
|
2023-03-14 10:34:46 +01:00 |
|
Oleksandra Matviienko
|
3841deae24
|
BaseTbResourceServiceTest, BaseDeviceServiceTest: Rule ExpectedException refactored with AssertJ Exception Assertions
|
2023-03-13 23:08:19 +01:00 |
|
Oleksandra Matviienko
|
5cb1b7d275
|
BaseOtaPackageServiceTest: Rule ExpectedException refactored with AssertJ Exception Assertions
|
2023-03-13 22:09:16 +01:00 |
|
Sergey Matvienko
|
7a0c58a18e
|
revert entityDaoServicesMap = new HashMap<>()
|
2023-03-13 18:52:17 +01:00 |
|
Andrii Shvaika
|
ab5769a252
|
Merge with develop/3.5
|
2023-03-13 15:52:06 +02:00 |
|
YevhenBondarenko
|
b936d48419
|
implemented countEntitiesByTypes for SysAdmin
|
2023-03-13 10:57:04 +01:00 |
|
ViacheslavKlimov
|
378ae47acb
|
Alarm comments rule trigger config, NotificationInfo stateEntityId
|
2023-03-13 10:41:40 +02:00 |
|
OleksandraMatviienko
|
67b0d24910
|
the creation and deletion of a tenant moved to the AbstractServiceTest
|
2023-03-10 21:16:18 +01:00 |
|
Oleksandra Matviienko
|
9904c9ccc2
|
uncommon dependency refactoring in AbstractServiceTest in dao package
|
2023-03-10 18:00:16 +01:00 |
|
Sergey Matvienko
|
add0a342c4
|
EntityRegistryService: PostConstrust replaced with event listener ContextRefreshedEvent. This will guarantee that all EntityDaoService's beans created. Otherwise, the Bean may discover beans that not created yet (reproducible on dao tests)
|
2023-03-10 16:38:53 +01:00 |
|
Andrii Landiak
|
e665917758
|
Merge branch 'develop/3.5' of github.com:AndriiLandiak/thingsboard into feature/x509-device-cert-impr
|
2023-03-10 15:46:42 +02:00 |
|
Andrew Shvayka
|
e058786956
|
Merge pull request #8174 from zzzeebra/feature/junit5-migration-exceptions
[3.5] junit5 migration - exception annotation refactoring
|
2023-03-10 12:51:03 +02:00 |
|
ViacheslavKlimov
|
8fcbe876e8
|
Merge branch 'develop/3.5' into feature/notification-system
# Conflicts:
# pom.xml
|
2023-03-08 18:16:16 +02:00 |
|
Andrii Shvaika
|
316ae13428
|
Fix the configuration of consistency level
|
2023-03-08 18:13:16 +02:00 |
|
Andrii Shvaika
|
85f317b99b
|
Set default value to 0 for assign_ts for backward-compatibility
|
2023-03-08 15:19:18 +02:00 |
|
ViacheslavKlimov
|
a56261ac9d
|
Merge with develop/3.5
|
2023-03-08 13:11:31 +02:00 |
|
Oleksandra Matviienko
|
906b4083dd
|
testSaveTenantWithIsolatedProfileInMonolithSetup deleted because isolated tenant in monolith is allowed since queue config feature in tenant profile
|
2023-03-06 17:30:37 +01:00 |
|
Andrii Shvaika
|
aadf7f8295
|
Merge with develop/3.5
|
2023-03-06 17:59:37 +02:00 |
|
Oleksandra Matviienko
|
3ebd9e8992
|
testSaveTenantWithIsolatedProfileInMonolithSetup ignored because Tenant validator have no such validation since queue config feature
|
2023-03-06 16:33:36 +01:00 |
|