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

4218 Commits

Author SHA1 Message Date
YevhenBondarenko
bda442bab2 refactored tb services 2022-06-20 13:35:50 +02: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
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
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
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
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
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
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
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
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
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
Andrii Shvaika
2fb13de456 Backport of the permance improvements from PE 2022-06-16 08:47:19 +03:00
Andrii Shvaika
829a3e257e Merge with develop/3.4 2022-06-16 08:35:56 +03:00
Igor Kulikov
c4bdee92db PSQL annotation and dialect cleanup. 2022-06-15 14:04:13 +03:00
Igor Kulikov
0c1d3611cd
Merge pull request #5983 from amarkevich/PostgreSQL10Dialect 
switch to PostgreSQL10Dialect
 2022-06-15 13:07:23 +03:00
nickAS21
835e8d5d1e refactoring: commit4 2022-06-15 12:57:14 +03:00
nickAS21
eceec2af0c Merge branch 'develop/3.4' into refactoring_tests_alarm_customer 
refactoring: alarm resolving the conflict
 2022-06-15 12:24:29 +03:00
Andrii Shvaika
fe4ec688b0 Put external Id into Context 2022-06-15 12:02:28 +03:00
Andrii Shvaika
6579807bb6 Bug fixes and no more tenant id in the git repo 2022-06-15 11:44:23 +03:00
Andrii Shvaika
aba4fa8215 Performance improvement for entities export 2022-06-15 11:09:08 +03:00
Andrii Shvaika
c63805bcf1 Merge the PR #6713 2022-06-15 10:55:48 +03:00
Andrii Shvaika
1df554c837 Refactoring 2022-06-15 10:45:04 +03:00
Andrii Shvaika
b55dbdf050 Entity Export refactoring 2022-06-15 10:32:19 +03:00