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

351 Commits

Author SHA1 Message Date
Andrii Shvaika
23c6144c20 Develop 3.3.3 2021-11-08 17:41:03 +02:00
Andrii Shvaika
942c316e8a Merge with master 2021-11-08 17:36:49 +02:00
Viacheslav Klimov
17f9eebe23 Set serialVersionUIDs for cached entities 2021-11-04 16:25:15 +02:00
Andrii Shvaika
f015a3a45c Merge with master 2021-10-26 19:54:00 +03:00
Viacheslav Klimov
2814c377ac Refactor rule chains importing 2021-10-11 16:29:46 +03:00
nickAS21
9e9a8238db Merge branch develop/3.3.2 into current 2021-09-13 19:01:04 +03:00
nickAS21
1b6fc7d72b Merge branch 'develop/3.3.2' into lwm2m_tests_with_cherry 
# Conflicts:
#	application/src/test/java/org/thingsboard/server/transport/lwm2m/security/AbstractLwM2MIntegrationTest.java
#	application/src/test/java/org/thingsboard/server/transport/lwm2m/security/sql/PskLwm2mIntegrationTest.java
#	common/util/src/main/java/org/thingsboard/common/util/JacksonUtil.java
#	dao/pom.xml
#	dao/src/main/java/org/thingsboard/server/dao/device/DeviceCredentialsServiceImpl.java
 2021-09-13 18:15:58 +03:00
YevhenBondarenko
ffe16b8dfb Merge remote-tracking branch 'upstream/master' into feature/bulk-import/device-credentials 
# Conflicts:
#	ui-ngx/src/app/modules/home/components/import-export/import-export.service.ts
 2021-09-09 17:18:28 +03:00
nickAS21
d491e0f664 lwm2m: Security key validate in dao 2021-09-08 22:12:08 +03:00
Viacheslav Klimov
d14f6a4ddd Refactor device bulk import 2021-09-07 18:52:29 +03:00
Viacheslav Klimov
bd1cfa4491 Merge branch 'master' into feature/bulk-import/device-credentials 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/EdgeController.java
 2021-09-07 16:32:22 +03:00
Igor Kulikov
b173e0799c Update OS package plugin version. Code cleanup. 2021-09-07 11:47:43 +03:00
Igor Kulikov
049627db97 Version set to 3.3.2-SNAPSHOT 2021-09-06 18:55:10 +03:00
Igor Kulikov
02b8b8b873
Merge branch 'master' into dependency-upgrade-test-scope 2021-09-01 14:57:02 +03:00
Andrew Shvayka
f47985ccc6
Merge pull request #5157 from thingsboard/develop/3.3.1 
Refactoring: Introduced Edge License service.
 2021-08-27 16:01:26 +03:00
Andrew Shvayka
78fe8b0150
Merge pull request #5155 from thingsboard/develop/3.3.1 
Refactoring: Introduced Edge License service. Remove web dependency f…
 2021-08-27 15:55:22 +03:00
Andrew Shvayka
3d2e86b62f
Merge pull request #5154 from thingsboard/master 
Merge master to Develop 3.3.2
 2021-08-27 15:54:46 +03:00
Andrii Shvaika
37fd7f4988 Validation and Replacement of Queue names in the Device profile 2021-08-26 15:51:59 +03:00
Volodymyr Babak
6f9ac66863 Refactoring: Introduced Edge License service. Remove web dependency from dao 2021-08-25 15:59:26 +03:00
Volodymyr Babak
5007eccb26 Added logs for edge license check. Replaced Object class with JsonNode 2021-08-20 13:14:18 +03:00
Andrii Shvaika
6be0cb020a Version set to 3.3.2-SNAPSHOT 2021-08-16 12:41:29 +03:00
Andrii Shvaika
3661647c3a Version set to 3.3.1-SNAPSHOT 2021-08-16 12:39:43 +03:00
Viacheslav Klimov
e33a336ed9 Merge remote-tracking branch 'origin/master' into feature/bulk-import/device-credentials 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/DeviceController.java
#	application/src/main/java/org/thingsboard/server/controller/EdgeController.java
#	common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceService.java
#	ui-ngx/src/app/core/http/device.service.ts
 2021-08-09 12:27:53 +03:00
Andrii Shvaika
2078c71d32 Added module cluster-api and used it in rule engine and other services 2021-08-06 17:33:52 +03:00
Sergey Matvienko
e223dda96f test scope: dependency upgrade a refactor for all POMs in project 2021-08-06 13:53:35 +03:00
Viacheslav Klimov
3505810280 Bulk import device credentials handling refactoring 2021-08-05 15:13:05 +03:00
Volodymyr Babak
9fd816387b Merge branch 'master' of github.com:thingsboard/thingsboard into edge-fix-concurrent-async-issue 2021-07-22 16:48:56 +03:00
Volodymyr Babak
3ae5acbcc8 Added lock on edge event save/read. Removed save async method 2021-07-22 15:59:47 +03:00
Igor Kulikov
e1afbe6667 Control visibility and order of dashboard in mobile application. Ability to hide widgets in mobile mode. Fix dashboard state changes processing. 2021-07-22 15:44:40 +03:00
hanyuepeng
d3c51ca1c7 fix(Claiming devices): resolve SerializationFailedException 
when use redis as the cache, this
interface
http(s)://host:port/api/v1/$ACCESS_TOKEN/claim  throw
a
SerializationFailedException but ignored by AbstractTransformFuture
,and when do  Device Claiming API
Request(http(s)://host:port/api/customer/device/$DEVICE_NAME/claim),the
system show :Failed to claim the device
 2021-07-21 13:03:10 +08:00
Volodymyr Babak
08f11b0d1b Merge remote-tracking branch 'upstream/master' into edge-3.3 2021-07-13 21:37:51 +03:00
Volodymyr Babak
d2d95a2575 Merge remote-tracking branch 'upstream/master' into edge-3.3 2021-07-08 10:15:29 +03:00
AndrewVolosytnykhThingsboard
22933e5402 Merge branch 'master' into ota-service-url-validation 2021-07-06 17:44:56 +03:00
AndrewVolosytnykhThingsboard
7975e2a96a Implement of method to find dashboard by name and tenant ID, used to find correct dashboard in case multiple dashboard start with the same name. 2021-07-06 16:52:13 +03:00
Andrew Shvayka
4e5f485106
Merge pull request #4682 from thingsboard/feature/cleanup-call-deduplication 
Refactoring of the TTL cleanup services
 2021-06-23 19:33:48 +03:00
Volodymyr Babak
c85aea31a0 Added possibility to disable validation for save edge function 2021-06-23 17:27:06 +03:00
YevhenBondarenko
f1f41851cc merge with master 2021-06-22 15:46:39 +03:00
Volodymyr Babak
da082e2700 Merge remote-tracking branch 'upstream/master' into edge-3.3 2021-06-20 19:22:28 +03:00
AndrewVolosytnykhThingsboard
f1216c9720 Url validation for Ota Package and tests 2021-06-16 18:58:55 +03:00
YevhenBondarenko
e58d5b2d8a removed rpc status sent, added idx_rpc_tenant_id_device_id 2021-06-14 15:06:21 +03:00
Igor Kulikov
1ed624d30b Introduce mobile app oauth2 request authentication using application token signed by application secret. 2021-06-11 13:37:23 +03:00
YevhenBondarenko
5626c30f2f Merge branch 'master' of https://github.com/thingsboard/thingsboard into feature/persisted-rpc 
# Conflicts:
#	common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/DefaultLwM2MTransportMsgHandler.java
 2021-06-11 11:27:28 +03:00
YevhenBondarenko
489c67778a implemented persisted RPC 2021-06-11 11:10:06 +03:00
Igor Kulikov
cc531daaee Add platform type filter for oauth2 registrations. 2021-06-10 17:01:16 +03:00
Igor Kulikov
8e4f8594f7 Refactor OAuth2 settings. Add mobile application parameters: package and callback URL scheme 2021-06-10 11:50:11 +03:00
ShvaykaD
6af34cf043 refactoring ttl cleanup services 2021-06-07 15:25:02 +03:00
Volodymyr Babak
77c080f82b Device created on the edge will use that same ID on the cloud 2021-06-04 18:25:02 +03:00
Andrii Shvaika
083dc38cf8 Refactoring of the ttl cleanup services 2021-06-03 19:32:25 +03:00
YevhenBondarenko
43b4f4461d created data limits for resources and otaPackages, added url for the otaPackage 2021-06-03 18:34:39 +03:00
Volodymyr Babak
831ddc43bc Merge remote-tracking branch 'upstream/master' into edge-3.3 2021-06-02 18:00:28 +03:00