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

6689 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Viacheslav Klimov
a00e3be7ba Merge branch 'master' into master-to-develop-snmp 
# Conflicts:
#	common/dao-api/src/main/java/org/thingsboard/server/dao/device/DeviceService.java
#	common/data/src/main/java/org/thingsboard/server/common/data/device/profile/DeviceProfileTransportConfiguration.java
#	common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/CoapTransportService.java
#	common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportServiceImpl.java
#	common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/SessionMsgListener.java
#	dao/src/main/java/org/thingsboard/server/dao/device/DeviceDao.java
#	dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java
#	pom.xml
 2021-04-12 15:45:39 +03:00
Andrew Shvayka
6b14d23e8c
Merge pull request #4304 from ViacheslavKlimov/feature/snmp-refactoring 
SNMP refactoring
 2021-04-12 13:55:59 +03:00
nickAS21
c634859e90
lwm2m: front start add attributes Lwm2m (#4388) 
* lwm2m: front start add attributes Lwm2m

* lwm2m: front finish add attributes Lwm2m for resources

* lwm2m: front add attributes Lwm2m for resources if isAttribte or isTelemetry

* lwm2m: front add attributes Lwm2m for objects if isAttribte or isTelemetry

* lwm2m: back add resource one

* lwm2m: back fix bug resource controller test
 2021-04-12 13:16:43 +03:00
Igor Kulikov
1b531e2858 Update haproxy config. Enable HTTP/2. 2021-04-12 12:37:03 +03:00
Igor Kulikov
0d733455c1 Enable edge configuration for docker compose 2021-04-12 12:31:16 +03:00
Igor Kulikov
e0f978992e
Merge pull request #3811 from volodymyr-babak/develop/3.3-edge 
Edge functionality
 2021-04-12 12:17:09 +03:00
Volodymyr Babak
4e5c726ea1 Fixed correct class for widget type details 2021-04-09 20:19:21 +03:00
Volodymyr Babak
c5f5acdba1 Improved disconnect process - try 5 times before force close session 2021-04-09 19:53:46 +03:00
Volodymyr Babak
770d3f91f2 Code review changes 2021-04-09 19:38:45 +03:00
Volodymyr Babak
df6f4c9924 Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2021-04-09 19:04:26 +03:00
ShvaykaD
dc87550835
Extract coap-server component to separate module to be used in coap transport and core (CoAP integrations). 
* init commit: coap-server component

* move coap-server to separate module

* fix typo
 2021-04-09 13:06:43 +03:00
Igor Kulikov
a207e31841 Merge with master 2021-04-09 12:40:43 +03:00
Igor Kulikov
4a63660e1d Version set to 3.3.0-SNAPSHOT 2021-04-09 12:37:08 +03:00
vzikratyi-tb
a98499354b
Used thingsboard/haproxy-certbot image (#4354) 
* Used thingsboard/haproxy-certbot image

* Used 1.3.0 version of thingsboard/haproxy-certbot
 2021-04-05 12:43:53 +03:00
ShvaykaD
2344d6d62f
Fixed RPC string params in protobuf payload type. Reverted changes from the previous fix (#4356) 
* Revert "added a fix for string value RPC params: removed redundant escaped characters"

This reverts commit 1891af54

* removed redundant escape characters for string RPC params in Proto payload

* cleanup code
 2021-04-02 12:25:05 +03:00
Viacheslav Klimov
61341a7caf Refactor, implement SNMP traps, add support for SNMP v3 targets 2021-04-02 10:50:05 +03:00
Volodymyr Babak
3e085d370c Make alarm condition serializable 2021-03-31 22:31:45 +03:00
nickAS21
ba7543d30e
Merge pull request #4347 from thingsboard/lwm2m_fix_bug_double_string 
lwm2m: back fix bug format name
 2021-03-31 18:35:17 +03:00
nickAS21
0c12f202fe lwm2m: back fix bug double "" in name 2021-03-31 17:48:31 +03:00
Volodymyr Babak
7044e3e40f Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2021-03-30 19:35:58 +03:00
Viacheslav Klimov
593f95a7af
Provide additional validation for entities (#4326) 
* Provide additional validation for entities

* Refactor

* Create test for NoXssValidator

* Refactor dependencies
 2021-03-30 18:29:55 +03:00
Viacheslav Klimov
1b381298fb Refactor predicate queries building 2021-03-30 18:29:08 +03:00
ShvaykaD
fd3e18f18b
CoAP DTLS support (#4316) 
* dtls init commit

* added fixes after review

* fix typo

* changed translation for DeviceCredentialsType.X509_CERTIFICATE
 2021-03-30 18:28:03 +03:00
Viacheslav Klimov
68a73caada Ignore default value for filters with constant key type 2021-03-30 18:24:00 +03:00
nickAS21
0aa16d28a4
Merge pull request #4339 from thingsboard/lwm2m_add_resourses 
Lwm2m add resourses
 2021-03-30 17:21:54 +03:00
nickAS21
9272611ace lwm2m: back add resource(s) 2021-03-30 16:13:34 +03:00
Andrii Shvaika
fa462467fb Fix JAVA_OPTS in config maps to work with Java 11 2021-03-30 13:55:34 +03:00
nickAS21
090babdf70 lwm2m: back add resource(s) 2021-03-30 13:26:50 +03:00
nickAS21
712bab434e
Merge pull request #4313 from thingsboard/lwm2m_fix_bug_front 
Lwm2m fix bug front
 2021-03-29 13:28:38 +03:00
nickAS21
2fcf5fd7c6 lwm2m: front/back fix bug update profile 2021-03-29 12:50:50 +03:00
nickAS21
23373b055e lwm2m: front fix bug profile updateObserve 2021-03-29 11:13:26 +03:00
nickAS21
8b23bd999f lwm2m: front fix bug create profile lwm2mConfig default 2021-03-27 07:37:58 +02:00
nickAS21
054824a0e4 Merge branch 'develop/3.3' into lwm2m_fix_bug_front 
# Conflicts:
#	common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/client/LwM2mClient.java
 2021-03-27 06:51:01 +02:00
nickAS21
ba4d2ff480
lwm2m: notification in transport, add, update, del models (#4309) 
* lwm2m: notification in transport, add, update, del models

* lwm2m: notification in transport, add, update, del models2
 2021-03-26 17:32:26 +02:00
nickAS21
156c8cc287 lwm2m: front fix bug create profile lwm2mConfig 2021-03-26 16:34:20 +02:00
nickAS21
0710d272a1 lwm2m: front fix bug create device lwm2mConfig default 2021-03-26 12:34:36 +02:00
nickAS21
af57637dc5 lwm2m: notification in transport, add, update, del models 2021-03-25 23:14:03 +02:00
Igor Kulikov
5bb252b418
Merge pull request #4307 from vvlladd28/bug/update-device-profiles/add-new 
UI: Fixed updated device profiles table after added new profiles
 2021-03-25 13:24:03 +02:00
Vladyslav_Prykhodko
1aeb03c0a2 UI: Fixed updated device profiles table after added new profiles 2021-03-25 13:12:26 +02:00
Vladyslav_Prykhodko
8369429faa UI: Added edit resource title for lwm2m model 2021-03-25 13:00:44 +02:00
Igor Kulikov
ccd316a91b UI: Restore data generation condition - fix realtime data generator 2021-03-25 12:51:00 +02:00
ShvaykaD
1891af54b3 added a fix for string value RPC params: removed redundant escaped characters 2021-03-25 12:16:55 +02:00
Viacheslav Klimov
e747329d56 Merge remote-tracking branch 'thingsboard/develop/3.3' into feature/snmp-refactoring 
# Conflicts:
#	common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/server/LwM2mTransportServiceImpl.java
 2021-03-25 10:19:22 +02:00
Viacheslav Klimov
6b29597d3d Merge with develop/snmp 2021-03-25 10:11:38 +02:00
Viacheslav Klimov
306ace040c Refactor 2021-03-25 10:06:06 +02:00
nickAS21
fda871392b
lwm2m: test model2 (#4298) 
* lwm2m: test model2

* lwm2m: test model2 (fix test)
 2021-03-24 19:23:40 +02:00
Andrii Shvaika
32e8ee11bd Merge with develop/3.3 2021-03-24 18:17:50 +02:00
Viacheslav Klimov
fc06e8ac99 Provide SNMP transport configuration validation; refactor 2021-03-24 17:49:17 +02:00
Viacheslav Klimov
039508bfbd Refactor 2021-03-24 17:49:17 +02:00
Viacheslav Klimov
afab5150b8 Provide SNMP transport configuration validation; refactor 2021-03-24 16:43:28 +02:00