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

10518 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sergey Matvienko
7652576662 Postgresql repo from os-release $VERSION_CODENAME for dockerfile. Disable docker cache temporary to avoid cached releases collission 2022-06-16 11:04:12 +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
Vladyslav_Prykhodko
539390e6b5 UI: Improvement function validateDatasources added validation for required label in dataKey setting 2022-06-15 16:21:00 +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
Andrew Shvayka
eb710b91cd
Merge pull request #6695 from thingsboard/refactoring_tests_alarm_customer 
[3.4] Refactoring_tests: alarm, customer
 2022-06-15 13:03:45 +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
Vladyslav_Prykhodko
812a120393 UI: Updated version node in pkg script 2022-06-15 12:07:08 +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
Andrii Shvaika
8e3054c999 Entities Import Context 2022-06-15 09:42:52 +03:00
Sergey Matvienko
92818934ab Postgres startup script improved, Install db script improved. First launch file writes only ofter success install. More verbosity added during Postgresql startup 2022-06-14 22:40:01 +03:00
Andrew Shvayka
a9cad82371
Merge pull request #6352 from desoliture1/subCustomerAlarmsCheckerTestsFix 
[3.4] Tests for Alarms availability with users hierarchy
 2022-06-14 19:17:27 +03:00