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

7169 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YevhenBondarenko
7b2e512cd8 added multipart max size 50MB 2021-04-12 19:08:27 +03:00
YevhenBondarenko
401e41f7c3 implemented FirmwareControllerSqlTest 2021-04-12 17:50:12 +03:00
Vladyslav_Prykhodko
45fc32ce3e UI: Added firmware configuration 2021-04-12 16:56:00 +03:00
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
Vladyslav_Prykhodko
3c4ee1288d Merge branch 'develop/3.3-firmware' of https://github.com/YevhenBondarenko/thingsboard into YevhenBondarenko-develop/3.3-firmware 2021-04-12 13:45:48 +03:00
YevhenBondarenko
8860eef1ba added hasData for firmware 2021-04-12 13:35:02 +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
Vladyslav_Prykhodko
2e5bbe2032 Merge remote-tracking branch 'origin/feature/multiple-file-input' into YevhenBondarenko-develop/3.3-firmware 2021-04-12 09:31:01 +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
YevhenBondarenko
95c9562418 refactored 2021-04-09 15:35:07 +03:00
YevhenBondarenko
935aab7535 added checksum and checksum algorithm for firmware 2021-04-09 15:32:06 +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
Vladyslav_Prykhodko
5672d2c451 UI: Added multiple-file-input; Add support load multiple resource 2021-04-09 11:43:11 +03:00
YevhenBondarenko
7954f91fee added upgrade for firmware 2021-04-08 11:45:29 +03:00
YevhenBondarenko
b51fee8740 created firmware dao 2021-04-08 10:30:30 +03:00
Vladyslav_Prykhodko
8ae20e05bd UI: Fixed incorrect calculate minIntervalLimit 2021-04-07 18:03:02 +03:00
Vladyslav_Prykhodko
45277c8789 UI: Fixed error: Expression has changed after it was checked. 2021-04-06 11:57:48 +03:00
YevhenBondarenko
bb90b2f137 lwm2m queue mode 2021-04-06 07:38:52 +03:00
mdheer
f0413055b0
Merge pull request #2 from TTvanWillegen/dashboard_logo 
Dashboard logo - added functionality to change the desired logo path from the settings menu
 2021-04-06 00:39:05 +02:00
mdheer
38f81df839
Merge branch 'master' into dashboard_logo 2021-04-06 00:38:48 +02:00
mdheer
7fb88eca20 added functionality that lets you specify the path to the desired custom logo from the settings menu 2021-04-06 00:34:31 +02:00
Chantsova Ekaterina
51125df8a2 Add JSON input widget 2021-04-05 20:56:15 +03:00
mdheer
9b5ec2e569 logo is only shown in fullscreen 2021-04-05 17:45:01 +02: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
Vladyslav_Prykhodko
aabf5c792a UI: Fixed multiple datasource processing data in map widgets 2021-04-02 17:06:01 +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
Vladyslav_Prykhodko
48db9f50af Fixed local environment variable resolve assets page 404 2021-04-01 13:33:11 +03:00
blackstar-baba
b5849b6ceb
fixed title ex when make rule chain root in chinese 
when make rule chain root in chinese，title display expression like '{{RuleChainName}}'
 2021-04-01 11:14:13 +08: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
Vladyslav_Prykhodko
74e20e2c68 UI: Fixed didn't save widget type filter in widgets selector 2021-03-31 16:49:56 +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
Vladyslav_Prykhodko
fa02d7629e UI: Improvement mobile view timeWindow; Add show time in 24 format 2021-03-30 18:15:37 +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