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

9039 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Viacheslav Klimov
aaead618aa Set serialVersionUID for DeviceProfile class 2021-11-03 13:23:35 +02:00
Sergey Tarnavskiy
4e1e8ce56b Added widget toastTargetId to the widgetContext 2021-11-02 17:03:44 +02:00
ShvaykaD
af2a5c241d added CoAP Efento responses callback 2021-11-02 16:58:21 +02:00
Yevhen Bondarenko
1dada1526f
Merge pull request #5476 from thingsboard/lwm2m_bs_forbiden 
lwm2m - authorization in Bootstrap session
 2021-11-02 14:56:11 +02:00
nickAS21
934a03ea79 lwm2m - authorization in Bootstrap session default true 2021-11-02 14:54:40 +02:00
nickAS21
2d10409042 lwm2m - authorization in Bootstrap session 2021-11-02 13:31:17 +02:00
Viacheslav Klimov
8d28a28b08 Implement entities search within all tenants 2021-11-01 20:04:35 +02:00
Igor Kulikov
113a6389fa Merge with master 2021-11-01 18:59:09 +02:00
Igor Kulikov
d110f5a005 Update springfox swagger version. 2021-11-01 18:58:11 +02:00
Yevhen Bondarenko
e04ba2d61c
Merge pull request #5466 from thingsboard/lwm2m_fix_bug_update_fw 
[3.3.2]lwm2m - fix bug info if first update Fw/Sw - failed
 2021-11-01 16:30:53 +02:00
Dima Landiak
c49297b433 logging improvements 2021-11-01 14:57:16 +02:00
ShvaykaD
467a94f688 added new efento endpoints support 2021-11-01 13:46:44 +02:00
Dima Landiak
8914cdb707 fixed the reprocessing logic for rule engine messages when the strategy is not set to reprocess them 2021-11-01 13:23:38 +02:00
nickAS21
5daeb0a12c lwm2m - fix bug info if first update Fw/Sw - failed (change text msg) 2021-11-01 13:10:12 +02:00
Dima Landiak
f005f82fe0 fixed rest json converter to parse json array 2021-11-01 09:04:28 +02:00
Andrii Shvaika
3e67dc1c00 Restore the getTenantAsset API call signature 2021-10-29 15:58:05 +03:00