Andrii Shvaika
|
2a447ec345
|
Add Load Entities Progress
|
2022-06-20 18:05:55 +03:00 |
|
Igor Kulikov
|
5c240469b2
|
Merge branch 'develop/3.4' into feature/vc-progress
|
2022-06-20 17:28:56 +03:00 |
|
Andrew Shvayka
|
9a77fb8abd
|
Merge pull request #6759 from thingsboard/feature/entities-version-control
[3.4] Entities version control
|
2022-06-20 17:15:34 +03:00 |
|
Andrii Shvaika
|
4ba19dea89
|
Merge branch 'develop/3.4' into feature/entities-version-control
|
2022-06-20 17:09:32 +03:00 |
|
Andrii Shvaika
|
8fa5fc8c3f
|
Improved rate limits processing filter to avoid NPE
|
2022-06-20 17:09:05 +03:00 |
|
Andrii Shvaika
|
b08b39fb08
|
Version Control Progress implementation
|
2022-06-20 17:06:32 +03:00 |
|
Igor Kulikov
|
6bf6893b30
|
Revert get entity alarms controller method
|
2022-06-20 16:53:06 +03:00 |
|
Andrew Shvayka
|
72944d8a1f
|
Merge pull request #6736 from ViacheslavKlimov/vc-improvements
VC tests refactoring
|
2022-06-20 16:01:40 +03:00 |
|
YevhenBondarenko
|
bda442bab2
|
refactored tb services
|
2022-06-20 13:35:50 +02:00 |
|
nickAS21
|
c7a7e487ad
|
testActiveAlarmScheduleFromDynamicValuesWhenDefaultScheduleIsInactive - remove ignore
|
2022-06-20 12:26:53 +03:00 |
|
Andrii Shvaika
|
bdd8432049
|
Fix import/export of rule chains and dashboard with external id references
|
2022-06-20 12:00:21 +03:00 |
|
YevhenBondarenko
|
6cc45544d6
|
license:format
|
2022-06-19 20:41:20 +02:00 |
|
nickAS21
|
6cf8f51d6b
|
Merge remote-tracking branch 'origin/fix_bug_controller_alarm_asset' into refactoring_test_customer_05
|
2022-06-18 21:19:39 +03:00 |
|
nickAS21
|
6d29ef415e
|
testActiveAlarmScheduleFromDynamicValuesWhenDefaultScheduleIsInactive - to ignore
|
2022-06-18 21:07:04 +03:00 |
|
Andrii Shvaika
|
5cad77910f
|
Improved method that replaces uuids
|
2022-06-18 10:48:02 +03:00 |
|
nickAS21
|
f57578c87a
|
update license header
|
2022-06-18 10:18:58 +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 |
|
Vladyslav_Prykhodko
|
9af37b2636
|
UI: Fixed incorrect close add widget panel with the escape key
|
2022-06-17 17:35:33 +03:00 |
|
Andrii Shvaika
|
3d85fb7c0a
|
Merge branch 'feature/entities-version-control' of github.com:thingsboard/thingsboard into feature/entities-version-control
|
2022-06-17 16:10:55 +03:00 |
|
Andrii Shvaika
|
fa5335130b
|
Entities import/export for CE
|
2022-06-17 16:10:29 +03:00 |
|
nickAS21
|
ed5696c3f9
|
refactoring: fix bug asset.save alarm.delete
|
2022-06-17 16:01:40 +03:00 |
|
Igor Kulikov
|
4ca32aab0a
|
Merge branch 'develop/3.4' into feature/entities-version-control
|
2022-06-17 14:58:41 +03:00 |
|
Igor Kulikov
|
d33c783b66
|
Fix circular bean dependency
|
2022-06-17 14:57:37 +03:00 |
|
Igor Kulikov
|
1e75f9f0e3
|
Merge with develop/3.4
|
2022-06-17 13:59:32 +03:00 |
|
Igor Kulikov
|
4036725d10
|
Fix entities deletion order when deleting tenant
|
2022-06-17 13:55:03 +03:00 |
|
Igor Kulikov
|
48a9907add
|
Merge branch 'ViacheslavKlimov-rate-limits-to-tenant-profile' into develop/3.4
|
2022-06-17 13:04:43 +03:00 |
|
Igor Kulikov
|
d982c09f68
|
Fix conflicts
|
2022-06-17 13:04:32 +03:00 |
|
Igor Kulikov
|
401e798b58
|
Fix getAlarms for entity for customer - filter by customer id.
|
2022-06-17 12:46:31 +03:00 |
|
Vladyslav_Prykhodko
|
2457fdf317
|
UI: Fixed incorrect show fullscreen dialog in sm display(600-959px)
|
2022-06-17 12:10:40 +03:00 |
|
Viacheslav Klimov
|
f9bfe6eb6f
|
Fix 2fa error msg
|
2022-06-17 12:10:02 +03:00 |
|
Viacheslav Klimov
|
1d8a2a0885
|
Fix testExternalIdsInExportData
|
2022-06-17 12:06:51 +03:00 |
|
Andrii Shvaika
|
8099c19eb7
|
Merge #6730
|
2022-06-17 11:56:54 +03:00 |
|
Andrii Shvaika
|
2dad98b2f7
|
Improvement to the Rule Chain diff
|
2022-06-17 11:54:20 +03:00 |
|
Viacheslav Klimov
|
86c5d18116
|
Tests for external ids in export data
|
2022-06-17 11:37:28 +03:00 |
|
YevhenBondarenko
|
2b18b44a52
|
added tenant cache
|
2022-06-16 22:04:26 +02:00 |
|
Yuriy Lytvynchuk
|
a3f97f9c77
|
fix semicolon
|
2022-06-16 18:27:37 +03:00 |
|
Viacheslav Klimov
|
49a83d3e18
|
Fix tests
|
2022-06-16 18:17:12 +03:00 |
|
Andrii Shvaika
|
493b8f2f7b
|
Improved comparison of the objects before import
|
2022-06-16 17:53:05 +03:00 |
|
Yuriy Lytvynchuk
|
e26bd7b2b9
|
Merge remote-tracking branch 'upstream/develop/3.4' into feature/refactor-coap-tests-spead-up
|
2022-06-16 17:32:01 +03:00 |
|
nickAS21
|
1df23e2a9a
|
refactoring: customer tests error -> different type exception
|
2022-06-16 15:33:22 +03:00 |
|
Igor Kulikov
|
dc8798e0c2
|
Update vc-executor docker build script
|
2022-06-16 15:21:45 +03:00 |
|
Igor Kulikov
|
9168669b4b
|
Merge branch 'develop/3.4' into feature/entities-version-control
|
2022-06-16 15:19:06 +03:00 |
|
Vladyslav_Prykhodko
|
66cc42644e
|
UI: Improvement image-map when image attr empty set default image
|
2022-06-16 15:18:25 +03:00 |
|
nickAS21
|
7a4be17442
|
Merge branch 'refactoring_test_customer_04' into refactoring_test_customer_05
|
2022-06-16 15:13:50 +03:00 |
|
Andrii Shvaika
|
5c72f596a4
|
Remove test logging
|
2022-06-16 15:04:59 +03:00 |
|
Andrii Shvaika
|
ad20b5d866
|
Fix Ota Package Ids
|
2022-06-16 15:00:43 +03:00 |
|