dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,560 Commits 106 Branches 71 Tags
Commit Graph

10560 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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