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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Igor Kulikov
|
aadfd1eb88
|
Dockerfile improvements
|
2022-06-16 13:47:02 +03:00 |
|
YevhenBondarenko
|
e61bfea55e
|
merge with develop/3.4
|
2022-06-16 12:04:58 +02:00 |
|
nickAS21
|
feb957e261
|
refactoring: customer tests error -> different type exception
|
2022-06-16 12:48:11 +03:00 |
|
Igor Kulikov
|
4195d48c3b
|
Updated and optimized docker build files.
|
2022-06-16 12:39:39 +03:00 |
|
Viacheslav Klimov
|
6e27ed46d6
|
Merge remote-tracking branch 'origin/feature/entities-version-control' into vc-improvements
# Conflicts:
# application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/BaseEntityImportService.java
# application/src/main/java/org/thingsboard/server/service/sync/vc/DefaultEntitiesVersionControlService.java
# common/data/src/main/java/org/thingsboard/server/common/data/sync/ie/EntityImportSettings.java
|
2022-06-16 12:36:27 +03:00 |
|
Andrii Shvaika
|
c0e84e2242
|
Fix license headers
|
2022-06-16 12:33:06 +03:00 |
|
Viacheslav Klimov
|
3581172e8f
|
Tests for export/import api
|
2022-06-16 12:32:12 +03:00 |
|
Andrii Shvaika
|
15c1e215d4
|
Improve performance of relation and rule chain service
|
2022-06-16 12:09:17 +03:00 |
|
Igor Kulikov
|
7e7f54319c
|
Merge pull request #6719 from smatvienko-tb/postgres-await-startup
[3.4] Postgres await startup in docker containers with Postgres bundled
|
2022-06-16 12:05:23 +03:00 |
|
Igor Kulikov
|
b91dbdca2a
|
Merge pull request #6721 from vvlladd28/improvemnt/msa/pkg-script
[3.4] UI: Updated version node in pkg script
|
2022-06-16 12:00:55 +03:00 |
|
Igor Kulikov
|
2062ad3611
|
Merge pull request #6729 from smatvienko-tb/debian-release-for-postgres-repository
[3.4] Postgresql repo from os-release $VERSION_CODENAME for dockerfile.
|
2022-06-16 11:59:25 +03:00 |
|
Igor Kulikov
|
7d35f3d8ca
|
Merge pull request #6190 from duhow/optimize-dockerfiles-2
[3.4] Optimize Dockerfiles
|
2022-06-16 11:58:48 +03:00 |
|
Viacheslav Klimov
|
88fcff5556
|
Set external ids in the config of rule chains and dashboards on export; add JsonIgnoreProperties in export data
|
2022-06-16 11:10:49 +03:00 |
|