nickAS21
|
b658b4956a
|
refactoring: tests Alarm, Customer add .andExpect(
|
2022-06-28 22:18:58 +03:00 |
|
nickAS21
|
ea04b56076
|
refactoring: tests comments1
|
2022-06-28 21:21:45 +03:00 |
|
nickAS21
|
102787499d
|
refactoring: tests Asset add .andExpect(statusReason(containsString(msgError))
|
2022-06-28 15:30:31 +03:00 |
|
nickAS21
|
d852043bfa
|
refactoring: tests testPushMsgToRuleEngineTime add matcherOriginatorId
|
2022-06-28 14:06:47 +03:00 |
|
nickAS21
|
cb8f11e210
|
refactoring: tests Device, Dashboard add int cntTimeEdge, int cntTimeRuleEngine
|
2022-06-28 11:42:09 +03:00 |
|
nickAS21
|
3ca714d3d4
|
Merge branch 'develop/3.4' into refactoring_tests_08
# Conflicts:
# application/src/main/java/org/thingsboard/server/service/entitiy/DefaultTbNotificationEntityService.java
# application/src/main/java/org/thingsboard/server/service/entitiy/TbNotificationEntityService.java
# application/src/main/java/org/thingsboard/server/service/entitiy/device/DefaultTbDeviceService.java
|
2022-06-28 11:20:49 +03:00 |
|
Andrii Shvaika
|
8886ea5434
|
Merge branch 'develop/3.4' of github.com:thingsboard/thingsboard into develop/3.4
|
2022-06-28 10:24:28 +03:00 |
|
Andrii Shvaika
|
18893d9cf3
|
Fix tenants and User Update Time cache
|
2022-06-28 10:24:15 +03:00 |
|
YevhenBondarenko
|
c97f9d0c70
|
merge with develop/3.4
|
2022-06-27 23:04:35 +02:00 |
|
nickAS21
|
dcdd347892
|
refactoring: tests Device
|
2022-06-27 19:57:29 +03:00 |
|
nickAS21
|
d94012d9e8
|
Merge branch 'develop/3.4' into refactoring_tests_08
|
2022-06-27 19:42:26 +03:00 |
|
Andrew Shvayka
|
dadaa524df
|
Merge pull request #6804 from thingsboard/fix_bug_additinalinfo
[3.4] fix bug: additionalInfo Asset, Alarm, Customer
|
2022-06-27 17:22:03 +03:00 |
|
YevhenBondarenko
|
faa07360d5
|
fixed alarn tests and refactored tb resource service
|
2022-06-27 15:06:37 +02:00 |
|
Andrew Shvayka
|
2c17de997c
|
Merge pull request #6603 from YuriyLytvynchuk/feature/refactor-coap-tests-spead-up
[3.4] Refactor coap tests spead up
|
2022-06-24 14:49:15 +03:00 |
|
nickAS21
|
86078005cb
|
Merge branch 'develop/3.4' into fix_bug_additinalinfo
|
2022-06-24 10:13:10 +03:00 |
|
nickAS21
|
f54201213c
|
refactoring: tests Dashboard
|
2022-06-24 07:20:44 +03:00 |
|
nickAS21
|
ecac67da1c
|
Merge branch 'fix_bug_additinalinfo' into refactoring_tests_08
|
2022-06-23 18:48:22 +03:00 |
|
nickAS21
|
3d3d29e905
|
fix bug: additionalInfo Asset, Alarm, Customer
|
2022-06-23 12:21:11 +03:00 |
|
Volodymyr Babak
|
e068faf6f9
|
Merge remote-tracking branch 'upstream/develop/3.4' into bug/fix-active-flag-on-cloud
|
2022-06-22 19:43:17 +03:00 |
|
Andrii Shvaika
|
9801120384
|
Fixed tests
|
2022-06-22 17:07:14 +03:00 |
|
Volodymyr Babak
|
5a51028577
|
Merge remote-tracking branch 'upstream/develop/3.4' into bug/fix-active-flag-on-cloud
|
2022-06-22 15:59:00 +03:00 |
|
Andrew Shvayka
|
774bb96853
|
Merge pull request #6734 from thingsboard/refactoring_test_customer_05
[3.4] Refactoring test customer
|
2022-06-22 13:32:41 +03:00 |
|
nickAS21
|
f8609ef329
|
reole conflicts2
|
2022-06-22 13:09:20 +03:00 |
|
Andrew Shvayka
|
c93772273c
|
Merge pull request #6642 from ViacheslavKlimov/fix/device-profile-permissions-checks
[3.4] Fix permission checks for DeviceProfileController
|
2022-06-22 13:02:09 +03:00 |
|
Volodymyr Babak
|
3665cae3f8
|
Merge remote-tracking branch 'upstream/develop/3.4' into bug/fix-active-flag-on-cloud
|
2022-06-22 12:52:03 +03:00 |
|
Andrew Shvayka
|
4c6f817e05
|
Merge pull request #6781 from volodymyr-babak/feature/edge-add-ota-updates
[3.4] Edge OTA support
|
2022-06-22 12:47:51 +03:00 |
|
nickAS21
|
5ee6009078
|
Merge branch 'develop/3.4' into refactoring_test_customer_05
# Conflicts:
# application/src/test/java/org/thingsboard/server/controller/AbstractNotifyEntityTest.java
|
2022-06-22 12:42:26 +03:00 |
|
nickAS21
|
5f73066602
|
resolve conflicts
|
2022-06-22 12:32:53 +03:00 |
|
Andrew Shvayka
|
f80583db72
|
Merge pull request #6600 from volodymyr-babak/feature/edge-converters-integration
[3.4] Edge integrations/converters support
|
2022-06-22 11:45:44 +03:00 |
|
nickAS21
|
439fe05a7e
|
Merge branch 'develop/3.4' into refactoring_test_customer_05
# Conflicts:
# common/cache/src/test/java/org/thingsboard/server/cache/CacheSpecsMapTest.java
|
2022-06-22 11:43:01 +03:00 |
|
nickAS21
|
dbd509ed0c
|
refactoring: tests change change name method2
|
2022-06-22 11:09:55 +03:00 |
|
Andrii Shvaika
|
02f61cea79
|
Merge PR #5924
|
2022-06-22 11:03:32 +03:00 |
|
nickAS21
|
f4befe9ce1
|
refactoring: tests change change name method
|
2022-06-22 10:38:16 +03:00 |
|
nickAS21
|
1f945a695b
|
refactoring: tests extract line
|
2022-06-22 07:08:24 +03:00 |
|
nickAS21
|
f7fcc9a7b0
|
refactoring: tests error add change to matcher
|
2022-06-22 06:58:55 +03:00 |
|
nickAS21
|
34d6b7a035
|
Merge branch 'develop/3.4' into refactoring_test_customer_05
|
2022-06-21 19:09:23 +03:00 |
|
nickAS21
|
5d06929c73
|
refactoring: tests asset
|
2022-06-21 18:59:18 +03:00 |
|
Andrii Shvaika
|
f5603c4f72
|
Merge with develop/3.4
|
2022-06-21 17:57:19 +03:00 |
|
Volodymyr Babak
|
2bf8e9d5b4
|
Add implementation and test for ota package contructor
|
2022-06-21 17:53:30 +03:00 |
|
Andrew Shvayka
|
11e43aa68e
|
Merge pull request #6686 from YevhenBondarenko/fix/vulnerabilities
[3.4] fix vulnerabilities
|
2022-06-21 17:20:32 +03:00 |
|
Volodymyr Babak
|
3b3a41a2ec
|
Merge remote-tracking branch 'origin/develop/3.4' into feature/edge-add-ota-updates
|
2022-06-21 16:45:23 +03:00 |
|
nickAS21
|
9e1cb8593f
|
Merge branch 'develop/3.4' into refactoring_test_customer_05
# Conflicts:
# application/src/main/java/org/thingsboard/server/service/entitiy/asset/DefaultTbAssetService.java
|
2022-06-21 08:05:28 +03:00 |
|
Volodymyr Babak
|
a5f0f1d04c
|
Fixed compilation error
|
2022-06-20 22:54:18 +03:00 |
|
Igor Kulikov
|
5e9899daad
|
UI: Implement progress on single entity version create request.
|
2022-06-20 19:48:29 +03:00 |
|
Andrew Shvayka
|
72944d8a1f
|
Merge pull request #6736 from ViacheslavKlimov/vc-improvements
VC tests refactoring
|
2022-06-20 16:01:40 +03:00 |
|
Andrii Shvaika
|
7a4fec93cd
|
Fix re-import of rule chains, and different not related test
|
2022-06-18 09:28:54 +03:00 |
|
nickAS21
|
87e28c9fc8
|
refactoring: removed extra line
|
2022-06-17 19:54:27 +03:00 |
|
nickAS21
|
cdaacb4ed0
|
refactoring: add Mockito.reset(tbClusterService, auditLogService)
|
2022-06-17 19:15:03 +03:00 |
|
nickAS21
|
f2695138ff
|
refactoring: add method manyTime
|
2022-06-17 18:36:29 +03:00 |
|
Volodymyr Babak
|
3912aadf72
|
Added otapackage support for edge - part #1
|
2022-06-17 18:26:32 +03:00 |
|