10527 Commits

Author SHA1 Message Date
Igor Kulikov
2d31c75304
Merge pull request #6745 from vvlladd28/improvement/dashboard-selctor-widget/esc
[3.4] UI: Fixed incorrect close add widget panel with the escape key
2022-06-21 17:24:59 +03:00
Igor Kulikov
f3b31f7cb8
Merge pull request #6737 from vvlladd28/bug/adaptive-fullscren/width
[3.4] UI: Fixed incorrect show rulechain dialog in sm display (600-959px)
2022-06-21 17:23:36 +03:00
Igor Kulikov
8e1ecb8640
Merge pull request #6733 from vvlladd28/improvement/image-map/load-image-default
[3.4] UI: Improvement image-map when image attr empty set default image
2022-06-21 17:20:56 +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
Igor Kulikov
a7dc2272a4
Merge pull request #6728 from devaskim/rxjs_export
[3.4] UI: Export all RxJS API into custom widget context
2022-06-21 17:18:45 +03:00
Igor Kulikov
36158d9256
Merge pull request #6725 from vvlladd28/bug/validate-datasources/dataKey-label
[3.4] UI: Improvement function validateDatasources
2022-06-21 17:17:43 +03:00
Andrii Shvaika
a4cd4f3351 Fix vc status api calls 2022-06-21 17:17:13 +03:00
Vladyslav_Prykhodko
d05712d3e2 UI: Improvement alarm details dialog 2022-06-21 17:14:03 +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
Andrii Shvaika
d53985c073 Merge branch 'develop/3.4' of github.com:thingsboard/thingsboard into develop/3.4 2022-06-21 16:11:53 +03:00
Andrii Shvaika
ebbf583392 Fix multi-key cache transaction for attributes service 2022-06-21 16:11:39 +03:00
Vladyslav_Prykhodko
a2422dab00 UI: Fixed permission check in show alarm details 2022-06-21 16:05:10 +03:00
Volodymyr Babak
68e35bbb40 Merge remote-tracking branch 'upstream/develop/3.4' into feature/edge-converters-integration 2022-06-21 15:47:46 +03:00
Andrew Shvayka
a160c542b8
Merge pull request #5959 from desoliture1/tenantExistsRefactor
[3.4] Add cacheable tenantExists method and refactor usages in validators
2022-06-21 15:13:35 +03:00
Vladyslav_Prykhodko
eb4745ea56 UI: Fixed incorrect label in tenant profile 2022-06-21 13:56:46 +03:00
Igor Kulikov
9a893dd330 UI: Entities version create/restore progress and error handling 2022-06-21 13:10:20 +03:00
YevhenBondarenko
c40823095e checkRelation improvements 2022-06-21 10:32:26 +02:00
Sergey Matvienko
0141787d08 RedisTbTransactionalCache - redis cluster watch support by a single key 2022-06-21 11:22:07 +03:00
Vladyslav_Prykhodko
8f4746c64d JS-executor: Added logs compilation time; Cache script map delete min used script 2022-06-21 11:11:32 +03:00
YevhenBondarenko
697f317e4b merget with develop/3.4 2022-06-21 07:18:11 +02: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
Volodymyr Babak
824129bc62 Fixed compilation error 2022-06-20 22:52:54 +03:00
Volodymyr Babak
aa3944e28d Merge branch 'feature/edge-converters-integration' of github.com:volodymyr-babak/thingsboard into feature/edge-converters-integration 2022-06-20 22:06:18 +03:00
Volodymyr Babak
17ec3f41f4 Merge remote-tracking branch 'origin/develop/3.4' into feature/edge-converters-integration 2022-06-20 22:06:05 +03:00
Volodymyr Babak
b61307af1c Fixed incorrect pagination of downlink table 2022-06-20 20:55:13 +03:00
Javier Núñez
bd813d0552 Add vc spanish translations 2022-06-20 19:05:00 +02:00
Igor Kulikov
6ea1ac0c8e Merge branch 'feature/vc-progress' of github.com:thingsboard/thingsboard into feature/vc-progress 2022-06-20 19:48:41 +03:00
Igor Kulikov
5e9899daad UI: Implement progress on single entity version create request. 2022-06-20 19:48:29 +03:00
Andrii Shvaika
0cfaf3c6ef Merge branch 'feature/vc-progress' of github.com:thingsboard/thingsboard into feature/vc-progress 2022-06-20 18:06:23 +03:00
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
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
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