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

9320 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Shvayka
29ccfaa23e
Merge pull request #5953 from YevhenBondarenko/fix/lwm2m-subscription-info 
[3.3.3] added updating session metadata if attributes/rpc subscription was sent by this way
 2022-01-24 13:51:23 +02:00
YevhenBondarenko
c1f43bd3ba added updating session metadata if attributes/rpc subscription was sent by this way 2022-01-24 13:06:17 +02:00
Andrew Shvayka
847630259c
Merge pull request #5947 from ViacheslavKlimov/fix/lwm2m-config-validation-npe 
[3.3.3] Fix NPE during Lwm2mDeviceProfileTransportConfiguration validation
 2022-01-24 13:02:12 +02:00
Igor Kulikov
5300372b65
Merge pull request #5950 from ouertani/TB-5948 
#5948 snpm -> snmp
 2022-01-24 12:23:38 +02:00
Ouertani
4fc21755eb #5948 snpm -> snmp 2022-01-23 10:41:26 +01:00
Viacheslav Klimov
f83b16c095 Fix NPE during Lwm2mDeviceProfileTransportConfiguration validation 2022-01-21 16:45:04 +02:00
Igor Kulikov
db5d1876ee
Merge pull request #5942 from vvlladd28/feature/auto-generate-type 
[3.3.3] UI: Add script to generate types in the project
 2022-01-21 16:27:52 +02:00
Vladyslav_Prykhodko
a1cd5e6a13 UI: Created script generate-types 2022-01-21 16:16:41 +02:00
Vladyslav_Prykhodko
e538d4288d UI: Updated build:types script 2022-01-21 15:19:43 +02:00
Vladyslav_Prykhodko
d8bb296d3c UI: Add script to generate types in the project 2022-01-20 18:35:59 +02:00
Andrew Shvayka
f6db786328
Merge pull request #5938 from thingsboard/lwm2m_fix_bug_DTLSconfig_bootstrap 
[3.3.3] lwm2m: fix_bug_DTLSconfig_bootstrap
 2022-01-20 16:09:05 +02:00
nickAS21
427f9b191f lwm2m: add bootstrap DTLS config - SERVER_ONLY 2022-01-20 15:27:10 +02:00
Andrii Shvaika
7f32c10d77 Fix initialization error for LwM2M Bootstrap mode 2022-01-20 14:40:12 +02:00
Andrew Shvayka
fc280254dd
Merge pull request #5930 from YevhenBondarenko/feature/californium-update 
[3.3.3] updated Californium and Leshan versions
 2022-01-20 14:05:31 +02:00
Andrii Shvaika
522a68a1a8 Merge branch 'master' of github.com:thingsboard/thingsboard 2022-01-20 13:24:12 +02:00
Andrii Shvaika
8e066f387a Fix tests according to new feature: startTs and endTs of the alarm are taken from the message. 2022-01-20 13:23:59 +02:00
YevhenBondarenko
57510b4d54 Merge branch 'master' of github.com:thingsboard/thingsboard into feature/californium-update 
# Conflicts:
#	common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/bootstrap/LwM2MTransportBootstrapService.java
#	common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/secure/TbLwM2MDtlsCertificateVerifier.java
 2022-01-20 13:23:30 +02:00
Andrew Shvayka
91373fcb64
Merge pull request #5922 from volodymyr-babak/code-review 
[3.3.3] Code review minor misc fixes
 2022-01-20 13:15:25 +02:00
Andrew Shvayka
a3f3578b65
Merge pull request #5796 from desoliture1/gatewayFix 
[WIP][3.3.3] MQTT Gateway API - fix response data on attributes request
 2022-01-20 13:04:48 +02:00
desoliture
fc9078a2be fix case where both shared and client attributes were requested 2022-01-20 12:58:55 +02:00
Andrii Shvaika
8b0a1f5538 Fix for #5931 and merge the PR #5915 2022-01-20 12:53:24 +02:00
Andrii Shvaika
1104c4e8f6 Merge branch 'fix/device-profile' of https://github.com/YevhenBondarenko/thingsboard 2022-01-20 12:19:52 +02:00
Igor Kulikov
ac8f866d1a
Merge pull request #5932 from vvlladd28/improvement/dashboard-autocomplete/double-request-and-init 
[3.3.3] UI: Improvement dashboard autocomplete - fixed double request and init component
 2022-01-20 12:18:35 +02:00
Andrew Shvayka
c40254b157
Merge pull request #5933 from thingsboard/bug/5931 
Fix for Bug #5931
 2022-01-20 12:17:27 +02:00
Andrii Shvaika
519e05bd11 Fix for Bug #5931 2022-01-20 12:15:56 +02:00
Vladyslav_Prykhodko
92dfa75aec UI: Improvement dashboard autocomplete - fixed double request and init component 2022-01-20 12:15:14 +02:00
Andrii Shvaika
ced4f23908 License header fix for bootstrap verifier 2022-01-20 12:13:08 +02:00
Andrii Shvaika
5eb907c2e3 License header fix for Geo Util 2022-01-20 12:12:36 +02:00
YevhenBondarenko
f6cb46b069 minor fix 2022-01-20 12:09:43 +02:00
Igor Kulikov
956fcdbf8a
Merge pull request #5928 from ArtemDzhereleiko/bug-fix/add-user-help-link 
[3.3.3] UI: Fixed help link for add user dialog
 2022-01-20 12:08:14 +02:00
Igor Kulikov
e96c496f6f Merge branch 'ArtemDzhereleiko-imp/clear-event' 2022-01-20 12:07:35 +02:00
Igor Kulikov
32f173fd0c Fix conflicts 2022-01-20 12:07:18 +02:00
Andrew Shvayka
a634b5669e
Merge pull request #5897 from thingsboard/lwm2m_bootstrap_trust_cert 
[3.3.3] lwm2m: add verify trust certificate to bootstrap
 2022-01-20 12:04:23 +02:00
Andrew Shvayka
93f647b7a7
Update TbLwM2MDtlsBootstrapCertificateVerifier.java 2022-01-20 12:03:14 +02:00
Igor Kulikov
f4ba4b35d2
Merge pull request #5923 from ChantsovaEkaterina/improvement/public-api-asset-models 
[3.3.3] UI: asset models added to public api
 2022-01-20 12:01:58 +02:00
Igor Kulikov
0befbdd497
Merge pull request #5913 from pinkevmladchy/pinkevmladchy/Dashboard-(Date-range-navigator)--the-calendar-when-selecting-dates-is-displayed-in-a-column,-but-should-be-horizontal(Windows) 
[3.3.3] UI: (date range navigator) the calendar when selecting dates is displayed in a column, but should be horizontal(windows)
 2022-01-20 12:01:29 +02:00
Igor Kulikov
4c972ec59b
Merge pull request #5910 from ArtemDzhereleiko/bug-fix/widget-advanced-settings/show-title-icon 
[3.3.3] UI: Added additional condition to define showTitleIcon
 2022-01-20 12:00:52 +02:00
YevhenBondarenko
f528e3c760 refactored 2022-01-20 11:10:18 +02:00
Igor Kulikov
116dfe8e46 Merge branch 'master' of github.com:thingsboard/thingsboard 2022-01-20 11:06:36 +02:00
Igor Kulikov
1e70670af9 UI: Add new propagate alarm fields 2022-01-20 11:06:25 +02:00
desoliture1
9c2b0cf0b8
[3.3.3] Self-intersecting polygons, polygons with holes, multiple polygons support (#5687) 
* fix coordinate containing checking for self-intersecting polygons

* add multipolygons and holes suppot

* Refactor GeoUtil

* add support for building polygons by two coordinates

* add corresponding tests for polygon processing from GeoUtils

* refactor GeoUtil, update JTS lib to 1.18.2 version

* refactor

Co-authored-by: Viacheslav Klimov <viacheslavklimov11@gmail.com>
 2022-01-20 11:05:40 +02:00
YevhenBondarenko
292220cddc updated Californium and Leshan versions 2022-01-20 09:41:36 +02:00
Volodymyr Babak
8526df3389 Merge remote-tracking branch 'upstream/master' into code-review 2022-01-19 21:25:03 +02:00
Igor Kulikov
8fa4dd18f3 Fix compilation errors 2022-01-19 17:56:28 +02:00
ArtemDzhereleiko
d6f63bd7a3 UI: Fixed help link for add user dialog 2022-01-19 17:55:00 +02:00
ArtemDzhereleiko
8421eccfd2 UI: Added to clear event dialog and hide action if table empty 2022-01-19 17:43:52 +02:00
Volodymyr Babak
e1df82f086 Merge remote-tracking branch 'upstream/master' into code-review 2022-01-19 17:17:36 +02:00
Igor Kulikov
a336bba515 Merge branch 'master' of github.com:thingsboard/thingsboard 2022-01-19 17:02:28 +02:00
Igor Kulikov
7e9d711f5c UI: Improve entity details usability 2022-01-19 17:02:18 +02:00
Volodymyr Babak
4401724f94 Merge remote-tracking branch 'origin/master' into code-review 2022-01-19 16:52:12 +02:00