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

9055 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Kulikov
4c275888ec Merge branch 'master' of github.com:thingsboard/thingsboard 2021-11-04 16:36:26 +02:00
Igor Kulikov
ce82ca0b1f Fix packaging to substitute properties in package yml 2021-11-04 16:36:14 +02:00
Swoq
52d626882b Fix exception after changing polygon on widget 2021-11-04 16:34:31 +02:00
Yevhen Bondarenko
ad5d1188e4
Merge pull request #5488 from thingsboard/lwm2m_profile_bootstrap_base64 
[3.3.2] Lwm2m profile bootstrap base64
 2021-11-04 16:32:14 +02:00
nickAS21
4efa360f5c lwm2m - profile fix bug server config 2021-11-04 16:26:44 +02:00
Viacheslav Klimov
17f9eebe23 Set serialVersionUIDs for cached entities 2021-11-04 16:25:15 +02:00
Igor Kulikov
0725a27d51 Update rule nodes UI 2021-11-04 15:59:13 +02:00
Igor Kulikov
668f1dda2a Merge branch 'master' of github.com:thingsboard/thingsboard 2021-11-04 15:26:49 +02:00
Igor Kulikov
7c2b3a9fbf Improve REST API error response handling. Update swagger api. 2021-11-04 15:26:36 +02:00
Sergey Matvienko
9e71c0b9fe EntityDataAdapterTest added to verify convertValue method 2021-11-04 14:50:11 +02:00
Andrii Shvaika
a8aca14e74 Merge branch 'feature/efento-water-meter' of https://github.com/ShvaykaD/thingsboard 2021-11-04 13:25:17 +02:00
Viacheslav Klimov
ab0ad885ab Entities text search by substring in JPA repositories 2021-11-04 13:19:42 +02:00
Andrew Shvayka
2166003adc
Merge pull request #5470 from dmytro-landiak/tb-re-processing-strategy-factory-fix 
[3.3.2] Fixed analyze reprocessing decision in TbRuleEngineProcessingStrategyFactory
 2021-11-04 13:16:02 +02:00
Andrew Shvayka
d78c1b2de4
Update TbRuleEngineProcessingStrategyFactory.java 2021-11-04 13:15:13 +02:00
Andrii Shvaika
e18d834461 Code style improvements 2021-11-04 13:07:05 +02:00
Swoq
5599ab5650 Refactoring Device Profile upgrade 2021-11-04 13:04:15 +02:00
Swoq
22ce8cf063 Fix upgrade from version 3.2.2 2021-11-04 13:04:06 +02:00
Andrii Shvaika
88773ade70 Merge branch 'develop/3.3.2' of https://github.com/Swoq/thingsboard into develop/3.3.2 2021-11-04 13:03:13 +02:00
Andrii Shvaika
083372ae09 Merge branch 'develop/3.3.2' of github.com:thingsboard/thingsboard into develop/3.3.2 2021-11-04 13:03:02 +02:00
Viacheslav Klimov
fe5215c7cc Minor refactoring 2021-11-04 12:55:23 +02:00
Viacheslav Klimov
2d845c7840 Merge remote-tracking branch 'origin/master' into fields-validation 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
#	common/data/src/main/java/org/thingsboard/server/common/data/Customer.java
#	common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfile.java
#	common/data/src/main/java/org/thingsboard/server/common/data/EntityView.java
#	common/data/src/main/java/org/thingsboard/server/common/data/OtaPackageInfo.java
#	common/data/src/main/java/org/thingsboard/server/common/data/TbResource.java
#	common/data/src/main/java/org/thingsboard/server/common/data/TbResourceInfo.java
#	common/data/src/main/java/org/thingsboard/server/common/data/TenantProfile.java
#	common/data/src/main/java/org/thingsboard/server/common/data/alarm/Alarm.java
#	common/data/src/main/java/org/thingsboard/server/common/data/edge/Edge.java
#	common/data/src/main/java/org/thingsboard/server/common/data/relation/EntityRelation.java
#	common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChain.java
#	common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNode.java
#	common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetsBundle.java
 2021-11-04 12:43:54 +02:00
van-vanich
a9b3f409f3
Merge branch 'thingsboard:master' into command_in 2021-11-04 12:31:49 +02:00
Igor Kulikov
cd23b85baa Bump hsqldb version to 2.6.1 to fix sql timeout issues 2021-11-04 11:15:44 +02:00
nickAS21
82704d54d0 lwm2m - profile (Base64 validate) 2021-11-04 07:58:58 +02:00
nickAS21
bad6653a50 lwm2m - update lwm2mController by base64 and createte BootstrpServerCredentials by Profile (Base64 validate) 2021-11-03 23:28:28 +02:00
Igor Kulikov
a3206358c7 Merge branch 'master' of github.com:thingsboard/thingsboard 2021-11-03 19:30:11 +02:00
Igor Kulikov
7f1559f170 Fix swagger redirect 2021-11-03 19:29:56 +02:00
Igor Kulikov
6417ef7cd0
Merge pull request #5486 from ArtemDzhereleiko/imp/widget-settings/no-data-message 
[3.2.2] UI: New widget settings with input field no data message
 2021-11-03 18:51:38 +02:00
Igor Kulikov
c765282454 Update swagger version 2021-11-03 18:46:44 +02:00
Vladyslav_Prykhodko
d53d4362b7 UI: Refactoring noDataDisplayMessageText 2021-11-03 17:57:00 +02:00
Igor Kulikov
f22c421acd
Merge pull request #5485 from vvlladd28/improvement/nav-tree/updated-node 
[3.3.2] UI Improvement: added argument updatedData in function updateNode in …
 2021-11-03 17:14:17 +02:00
Igor Kulikov
6e2f1ccf57 Merge branch 'master' of github.com:thingsboard/thingsboard 2021-11-03 17:12:19 +02:00
Igor Kulikov
2aa7170dba Update swagger properties 2021-11-03 17:12:05 +02:00
Vladyslav_Prykhodko
2a9b28ddc3 UI Improvement: added argument updatedData in function updateNode in nav-tree component 2021-11-03 17:06:09 +02:00
Andrew Shvayka
447dcdcad5
Merge pull request #4878 from smatvienko-tb/feature/sql-query-timeout 
Timeout for all SQL queries to survive enormous heavy query
 2021-11-03 16:45:30 +02:00
Igor Kulikov
4991bb725d Merge branch 'master' of github.com:thingsboard/thingsboard 2021-11-03 16:45:12 +02:00
Igor Kulikov
79588a7b70 Update help assets 2021-11-03 16:45:01 +02:00
Igor Kulikov
c783a2a6e3
Merge pull request #5484 from vvlladd28/improvement/markdown/copy-text 
[3.3.2] UI: Improvement copy text in markdown (didn't work in HTTP)
 2021-11-03 16:38:42 +02:00
Igor Kulikov
460418acbb
Merge pull request #5479 from Terny22/toast-target-id 
[3.3.2] UI: Added "toastTargetId" of widget-container to the "widgetContext" to be able showing toast-messages inside widget's area.
 2021-11-03 16:36:45 +02:00
Andrew Shvayka
71e098c8c4
Merge pull request #5304 from msqr/master 
Add option for HTTP client rule node to not create any message body
 2021-11-03 16:26:51 +02:00
Igor Kulikov
da07edbafd
Merge pull request #5464 from ArtemDzhereleiko/locale/change-translation 
[3.3.2] UI: Change translation
 2021-11-03 16:25:50 +02:00
Igor Kulikov
b2d1f01eee
Merge pull request #5459 from vvlladd28/bug/show-toast/fullscreen-dashboard 
[3.3.2] UI: Fixed display toast in fullscreen dashboard mode
 2021-11-03 16:24:46 +02:00
Igor Kulikov
72cfe8e411
Merge pull request #5452 from ArtemDzhereleiko/imp/new-widget-settings 
[3.3.2] UI: New widget settings layout
 2021-11-03 16:23:53 +02:00
Igor Kulikov
0c1d5b9cc0
Merge pull request #5450 from deaflynx/protobuf-ace-editor 
[3.3.2] UI: Added ace editor for protobuf content
 2021-11-03 16:20:52 +02:00
Andrii Shvaika
b3534942a5 Entity Id and Swagger description 2021-11-03 16:18:00 +02:00
Vladyslav_Prykhodko
47b9892f80 UI: Improvement copy text in markdown (didn't work in HTTP) 2021-11-03 16:13:53 +02:00
nickAS21
b095922aa8 lwm2m - Biding mode default 2021-11-03 15:22:15 +02:00
Igor Kulikov
a26d467516 Merge branch 'master' of github.com:thingsboard/thingsboard 2021-11-03 15:04:06 +02:00
Igor Kulikov
34d6dc50b5 Swagger improvements 2021-11-03 15:03:56 +02:00
nickAS21
f14a966cc6 lwm2m - Biding mode for lwm2m V_1.1 2021-11-03 13:52:42 +02:00