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

1363 Commits

Author SHA1 Message Date
Viacheslav Klimov
3c1682f57a Merge branch 'master' into master-to-snmp 
# Conflicts:
#	common/data/pom.xml
#	common/queue/src/main/java/org/thingsboard/server/queue/discovery/ZkDiscoveryService.java
#	dao/src/main/java/org/thingsboard/server/dao/sql/device/DeviceRepository.java
#	ui-ngx/src/app/shared/models/device.models.ts
 2021-04-20 18:08:10 +03:00
ShvaykaD
321fb731a6
Support of server-side RPC requests via protobuf for CoAP and MQTT 
* rpc response schema added

* rpc request proto

* fixed device profile validation

* fix error messages
 2021-04-20 11:14:27 +03:00
nickAS21
51b0d50542
Lwm2m discovery (#4438) 
* Lwm2m: fix bug delete zero updateAttribute

* Lwm2m: front add select binding

* Lwm2m: discovery only for test

* Lwm2m: remove type_cast_enabled from the main branch.

* Lwm2m: remove type_cast_enabled from the main branch.

* Lwm2m: remove type_cast_enabled from the main branch.

* Lwm2m: remove double code.
 2021-04-20 10:44:11 +03:00
Igor Kulikov
3362ab37da Fix show dashboard logo in fullscreen mode 2021-04-16 17:58:49 +03:00
Vladyslav_Prykhodko
a4347776ad UI: Refactoring dashboard logo translation 2021-04-16 15:40:44 +03:00
Igor Kulikov
5d9ea35fd9
Merge pull request #4284 from TTvanWillegen/master 
UI: Added show logo option in dashboard settings [Issue #3544]
 2021-04-16 15:31:29 +03:00
Vladyslav_Prykhodko
9b2009a501 UI: Refactoring dashboard logo 2021-04-16 14:59:35 +03:00
Vladyslav_Prykhodko
936171b80b UI: Improvement event statistics filter 2021-04-16 12:17:13 +03:00
Andrew Shvayka
e08d1b2c07
Feature/event filters 
* Event filter implementation

* Removed redundant imports

* convert createdTime to column name

* UI: Added ui to filter events parameters

* Case sensitivity fixed, boolean Is Error added

* UI: Added support event filter for error

* Improvement for implementation of Event Filter

* UI: Refactoring event filter

* UI: Add trim

* Filter added for all event types

* UI: Updated filter events for new API

* Refactoring

* Code cleaning. Debug Rule Chain added

* Removed redundant casts in JpaBaseEventDao, correct created_time check

* Removed redundant abstract method in DebugEvent

* refactoring of the filter queries

* Filters for debug events

* UI: Refactoring event table panel

Co-authored-by: AndrewVolosytnykhThingsboard <avolostnykh@thingsboard.io>
Co-authored-by: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Co-authored-by: AndrewVolosytnykhThingsboard <77969531+AndrewVolosytnykhThingsboard@users.noreply.github.com>
 2021-04-15 12:05:04 +03:00
nickAS21
d6979e54da
lwm2m: back: Write Attributes - start (#4402) 
* lwm2m: back: Write Attributes - start

* lwm2m: front: fis bug disable instances

* lwm2m: transport: attr/discavery start

* lwm2m: transport: attributeLwm2m after update profile

* lwm2m: transport: attributeLwm2m after update profile (no delete attribute)

* Lwm2m: back: test

* Lwm2m: back: test2

* Lwm2m: back: test3
 2021-04-15 11:53:45 +03:00
Igor Kulikov
c1e09038cf
Merge pull request #4404 from deaflynx/improvement/edge/rule-chains-routes 
UI: Edge rulechains: open from 'edge' scope
 2021-04-14 16:10:31 +03:00
Igor Kulikov
0940ce8494
Merge pull request #4403 from deaflynx/fix/edge/entity-tables-and-component-actions 
UI: Fixed: entity tables config for edge_customer_user; edge component; translation
 2021-04-14 16:08:20 +03:00
Igor Kulikov
1142502e6a
Merge pull request #4391 from vvlladd28/feature/multiple-file-input 
UI: Added multiple-file-input; Add support load multiple resource
 2021-04-14 16:02:03 +03:00
Igor Kulikov
8fcb609a03
Merge pull request #4377 from vvlladd28/improvement/calculate-min-interval 
UI: Fixed incorrect calculate minIntervalLimit
 2021-04-14 15:58:16 +03:00
Igor Kulikov
eea073a1ce
Merge pull request #4372 from vvlladd28/bug/dashboard/ExpressionChangedAfterItHasBeenCheckedError 
UI: Fixed error: Expression has changed after it was checked.
 2021-04-14 15:57:29 +03:00
Igor Kulikov
3e014ea3cb Fix merge conflicts. 2021-04-14 15:52:23 +03:00
Igor Kulikov
8088dc7159
Merge pull request #4360 from vvlladd28/bugs/maps/parse-data 
UI: Fixed multiple datasource processing data in map widgets
 2021-04-14 15:30:34 +03:00
Igor Kulikov
d1c103d3d3
Merge pull request #4350 from blackstar-baba/master 
Fixed title ex when make rule chain root in chinese
 2021-04-14 15:25:47 +03:00
Igor Kulikov
2eafc77cd4
Merge pull request #4345 from vvlladd28/bug/widget-selector/filter-type 
UI: Fixed didn't save widget type filter in widgets selector
 2021-04-14 15:18:19 +03:00
Igor Kulikov
d28312ef96
Merge pull request #4341 from vvlladd28/improvement/time-window/mobile 
UI: Improvement mobile view timeWindow; Add show time in 24 format
 2021-04-14 15:17:38 +03:00
Igor Kulikov
6517d7937a
Merge pull request #4331 from vvlladd28/bug/control-widget/switch-control 
UI: Fixed switch control widget, didn't update state after get value in call RPC
 2021-04-14 15:15:53 +03:00
Igor Kulikov
59b5f7352e
Merge pull request #4327 from vvlladd28/bug/validator/alarm-rule 
UI: Fixed alarm rules validation in change keyType or valueType
 2021-04-14 15:14:39 +03:00
Igor Kulikov
477d640e65
Merge pull request #4318 from vvlladd28/bug/profiles/sys-admin/select-home-dashboard 
UI: Fixed error access is forbidden in the system admin change profile
 2021-04-14 15:12:08 +03:00
Artem Babak
585f60fe15 Edge rulechains: open/export from 'edge' scope 2021-04-13 13:14:10 +03:00
Artem Babak
d60bb58fe2 Fixed translation: unassign edges 2021-04-13 12:58:00 +03:00
Artem Babak
790cef385d Edge component: hide sensitive buttons for customer_user/customer 2021-04-13 12:56:48 +03:00
Artem Babak
185e7a0874 Entities table config: fixed addEnabled, detailsReadonly for edge_customer_user 2021-04-13 12:53:39 +03:00
Vladyslav_Prykhodko
4a4a747301 UI: Refactoring resource library 2021-04-13 10:12:56 +03:00
Vladyslav_Prykhodko
77eafb1442 Merge remote-tracking branch 'upstream/master' into feature/multiple-file-input 2021-04-13 08:57:44 +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
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
Volodymyr Babak
df6f4c9924 Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2021-04-09 19:04:26 +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
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
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
Vladyslav_Prykhodko
aabf5c792a UI: Fixed multiple datasource processing data in map widgets 2021-04-02 17:06:01 +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
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
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
Vladyslav_Prykhodko
fa02d7629e UI: Improvement mobile view timeWindow; Add show time in 24 format 2021-03-30 18:15:37 +03:00
Vladyslav_Prykhodko
766594a7aa UI: Fixed switch control widget, didn't update state after get value in call rpc 2021-03-29 19:03:44 +03:00
Vladyslav_Prykhodko
903a8fdc27 UI: Fixed alarm rules validation in change keyType or valueType 2021-03-29 15:01:10 +03:00
nickAS21
23373b055e lwm2m: front fix bug profile updateObserve 2021-03-29 11:13:26 +03:00