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

7013 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Artem Babak
3e67a9ad0e Fix for setDefaultRoot button - only for edges scope 2020-12-10 12:16:57 +02:00
nickAS21
4bf0af9e78 Lwm2m: add logLwm2m to start bootstrap 2020-12-10 11:36:55 +02:00
Artem Babak
4d4e4d02b5 Edge rule chains table columns updated 2020-12-10 09:56:00 +02:00
nickAS21
2fcc48555c
Lwm2m 3 3 (#3829) 
* Lwm2m: Back ->  add telemetry logLwm2m

* Lwm2m: Back ->  add telemetry logLwm2m

* Lwm2m: SNAPSHOT 3.3.o

* Lwm2m: SNAPSHOT 3.3.0 All
 2020-12-09 22:37:47 +02:00
Artem Babak
77e73516e6 Edge's dashboards - fix for card buttons 2020-12-09 17:46:23 +02:00
Artem Babak
850b338943 Edge's rule chains - fix for card buttons 2020-12-09 17:33:16 +02:00
Andrew Shvayka
7667afaeae
Develop/lwm2m (#3826) 
* LwM2M - Start transport

* LwM2M - Test endpoint

* LwM2M - Test endpoint

* LwM2M - Test add xml

* LwM2M device registration

* LwM2M - add get from client, add attributes and telemetry upgrade from registration client

* LwM2M - add get from client, add attributes and telemetry upgrade from registration client

* LwM2M implementation

* LwM2M - add to service telemetry and attribute

* LwM2M add to service attribute and telemetry

* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType

* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType

* LwM2M - add transport.process

* LwM2M - delete from yml tenantid, PSK -ok

* LwM2M - yml del tenantId

* LwM2M - add RPK

* LwM2M - add connect only x509 certificate. Crate certificates in serverKeyStore.jks and clientKeyStore.jks

* LwM2M - add no_sec

* LwM2M - add RPK & PSK integration test with app Client

* LwM2M - add RPK & PSK integration test with app Client

* LwM2M - add read JKS from file

* LwM2M - add read JKS from file

* LwM2M - add bootstrap cert

* LwM2M - add bootstrap RPK

* LwM2M - add bootstrap No_sec

* LwM2M - cleaned the code

* LwM2M - add to 3.0 in UI credentials lwm2m

* LwM2M - add to 3.0 in UI credentials lwm2m

* LwM2M - add to 3.0 in UI credentials lwm2m

* LwM2M - fix bug CoAP transport

* LwM2M: UI - add Json to credentials

* LwM2M: Back - add command "/3/0/5" - trigger client

* LwM2M: fix bug Json edit dialog

* LwM2M: fix bug Json edit dialog

* lwm2m: fix bug Json edit dialog: add validate

* lwm2m: UI add tabs

* lwm2m: UI add tabs (cleaner)

* lwm2m: add interface SecurityConfigModels

* lwm2m: add interface SecurityConfigModels2

* lwm2m: change html

* lwm2m: UI add bootstrap component

* lwm2m: UI add bootstrap component with FormControl

* lwm2m: UI add start Observe

* lwm2m: UI - correct

* lwm2m: UI - correct

* lwm2m: UI - add Validator: BS RPK, X509

* lwm2m: UI - add Observe

* lwm2m: UI - finish Observe

* lwm2m: UI - fix bug config-service update identity

* lwm2m: Bootstarp&Sewrver All config secure

* lwm2m: Bootstarp&Sewrver All config secure for new Front format

* lwm2m: Bootstarp&Sewrver Different config secure for new Front format

* lwm2m: Add attributes Gui and Backend

* lwm2m: Add attributes Gui and Backend final

* lwm2m: Add telemetrys to Gui

* lwm2m: Add Attribute & telemetry in Gui to instance

* lwm2m: Optimize Attr/Telemetry

* lwm2m: Optimize Attr/Telemetry

* lwm2m: Optimize Attr/Telemetry

* lwm2m: Optimize Attr/Telemetry for mobile

* lwm2m: Model folder

* lwm2m: Ok on AWS: NoSec, PSK, X509
bad registration - RPK

* lwm2m: KeyStore start only one

* lwm2m: Server observe ok

* lwm2m: Server fix bug finish session without remove

* lwm2m: Server add function installValue

* lwm2m: Server add function getAttrTelemetry to tingsboard

* lwm2m: Server add function installValue

* lwm2m: Server add function update Telemetry, Attr from observe

* lwm2m: Server add comments

* lwm2m: Server add session listener

* lwm2m: Server add onGetChangeCredentials with analyze

* lwm2m: Server add onGetChangeCredentials with analyze Onserve add

* lwm2m: Server: updated algorithm for analyzing dynamic changes in attributes / telemetry / observation

* lwm2m: fix bug:  "ngx-flowchart" compile

* lwm2m: get value resource OPAQUE - byte [] to HexString

* lwm2m: change path to base

* lwm2m: fix bug COAP & lwm2m

* Lwm2m_3_2: back: cleaner, test bootstrap-ok front: restore

* Lwm2m_3_2: back: del SynchronousRegistrationListener.java

* Lwm2m_3_2: front: start profile lwm2m UI

* Lwm2m_3_2: front&back: add to profile lwm2m (api, getModels...)

* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json

* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (2)

* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (3)

* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (4)

* Lwm2m_3_2: front: add update change bootstrapConfig and save to config json

* Lwm2m_3_2: update after merge master

* lwm2m: fix bug proto

* lwm2m: fix bug in yml keyStore.jks

* lwm2m: fix bug tests

* lwm2m: front: add nameThingsboard

* lwm2m: fix bug Autowired lwm2mContext, caseCamel

* lwm2m: back-end^ start api /lwm2m/deviceProfile/bootstrap

* lwm2m: back-end: add method read models from resources

* lwm2m: back-end/front: add and finish api bootstrapConfig

* lwm2m: back-end: add decode profile

* lwm2m: back-end: add new bin in transport api

* lwm2m: add microservice lwm2m and docker lwm2m.

* lwm2m: add microservice lwm2m and docker lwm2m (fix bug)

* lwm2m: front: start fix bug disabled resources

* lwm2m: master to lwm2m merge, front add change attribute, telemetry

* lwm2m: front PR

* lwm2m: front add sort keyName to Json on the start

* lwm2m: front add instances

* lwm2m: front add/del instances FormGrp Value

* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m
# Conflicts:
#	common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
#	common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/SessionMsgListener.java
#	ui-ngx/src/app/modules/home/components/home-components.module.ts

* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m

* lwm2m: Front: del sort after add/del instance

* lwm2m: Front: fix bug reindex FormArray after update

* Lwm2m: Front fix bug add/del instans

* Lwm2m: Front finish1 profile

* Lwm2m: Back add profile to ModelClient

* Lwm2m: Back add form profile sent thingsboard: attr/tel/observe

* Lwm2m: Back -> fix bug: serverKeyStore.jks] Unable to load KeyStore  files server

* Lwm2m: Back -> fix bug: onRegistered an unReg

* Lwm2m: Back -> add updateProfiles

* Lwm2m: Back -> add updateDevice and updateProfile dynamic

* Lwm2m: Back -> error if CoapCode not access

* Lwm2m: Front -> clear credential

* Lwm2m: Front ->  credential fix bug button "save"

* Lwm2m: Back ->  add telemetry logLwm2m

Co-authored-by: nickAS21 <nick@avalr.com.ua>
 2020-12-09 17:13:11 +02:00
Andrew Shvayka
24ccd2a2b5 Revert "[3.2.1] Develop/lwm2m (#3547)" 
This reverts commit df6151f5ae8d3b77a67318dbb774d55e3f297960.
 2020-12-09 17:11:50 +02:00
Andrew Shvayka
df6151f5ae
[3.2.1] Develop/lwm2m (#3547) 
* LwM2M - Start transport

* LwM2M - Test endpoint

* LwM2M - Test endpoint

* LwM2M - Test add xml

* LwM2M device registration

* LwM2M - add get from client, add attributes and telemetry upgrade from registration client

* LwM2M - add get from client, add attributes and telemetry upgrade from registration client

* LwM2M implementation

* LwM2M - add to service telemetry and attribute

* LwM2M add to service attribute and telemetry

* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType

* LwM2M - add LWM2M_CREDENTIALS to DeviceCredentialsType

* LwM2M - add transport.process

* LwM2M - delete from yml tenantid, PSK -ok

* LwM2M - yml del tenantId

* LwM2M - add RPK

* LwM2M - add connect only x509 certificate. Crate certificates in serverKeyStore.jks and clientKeyStore.jks

* LwM2M - add no_sec

* LwM2M - add RPK & PSK integration test with app Client

* LwM2M - add RPK & PSK integration test with app Client

* LwM2M - add read JKS from file

* LwM2M - add read JKS from file

* LwM2M - add bootstrap cert

* LwM2M - add bootstrap RPK

* LwM2M - add bootstrap No_sec

* LwM2M - cleaned the code

* LwM2M - add to 3.0 in UI credentials lwm2m

* LwM2M - add to 3.0 in UI credentials lwm2m

* LwM2M - add to 3.0 in UI credentials lwm2m

* LwM2M - fix bug CoAP transport

* LwM2M: UI - add Json to credentials

* LwM2M: Back - add command "/3/0/5" - trigger client

* LwM2M: fix bug Json edit dialog

* LwM2M: fix bug Json edit dialog

* lwm2m: fix bug Json edit dialog: add validate

* lwm2m: UI add tabs

* lwm2m: UI add tabs (cleaner)

* lwm2m: add interface SecurityConfigModels

* lwm2m: add interface SecurityConfigModels2

* lwm2m: change html

* lwm2m: UI add bootstrap component

* lwm2m: UI add bootstrap component with FormControl

* lwm2m: UI add start Observe

* lwm2m: UI - correct

* lwm2m: UI - correct

* lwm2m: UI - add Validator: BS RPK, X509

* lwm2m: UI - add Observe

* lwm2m: UI - finish Observe

* lwm2m: UI - fix bug config-service update identity

* lwm2m: Bootstarp&Sewrver All config secure

* lwm2m: Bootstarp&Sewrver All config secure for new Front format

* lwm2m: Bootstarp&Sewrver Different config secure for new Front format

* lwm2m: Add attributes Gui and Backend

* lwm2m: Add attributes Gui and Backend final

* lwm2m: Add telemetrys to Gui

* lwm2m: Add Attribute & telemetry in Gui to instance

* lwm2m: Optimize Attr/Telemetry

* lwm2m: Optimize Attr/Telemetry

* lwm2m: Optimize Attr/Telemetry

* lwm2m: Optimize Attr/Telemetry for mobile

* lwm2m: Model folder

* lwm2m: Ok on AWS: NoSec, PSK, X509
bad registration - RPK

* lwm2m: KeyStore start only one

* lwm2m: Server observe ok

* lwm2m: Server fix bug finish session without remove

* lwm2m: Server add function installValue

* lwm2m: Server add function getAttrTelemetry to tingsboard

* lwm2m: Server add function installValue

* lwm2m: Server add function update Telemetry, Attr from observe

* lwm2m: Server add comments

* lwm2m: Server add session listener

* lwm2m: Server add onGetChangeCredentials with analyze

* lwm2m: Server add onGetChangeCredentials with analyze Onserve add

* lwm2m: Server: updated algorithm for analyzing dynamic changes in attributes / telemetry / observation

* lwm2m: fix bug:  "ngx-flowchart" compile

* lwm2m: get value resource OPAQUE - byte [] to HexString

* lwm2m: change path to base

* lwm2m: fix bug COAP & lwm2m

* Lwm2m_3_2: back: cleaner, test bootstrap-ok front: restore

* Lwm2m_3_2: back: del SynchronousRegistrationListener.java

* Lwm2m_3_2: front: start profile lwm2m UI

* Lwm2m_3_2: front&back: add to profile lwm2m (api, getModels...)

* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json

* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (2)

* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (3)

* Lwm2m_3_2: back: fix bug from commented front: add update change observe/attribute/telemetry to config json (4)

* Lwm2m_3_2: front: add update change bootstrapConfig and save to config json

* Lwm2m_3_2: update after merge master

* lwm2m: fix bug proto

* lwm2m: fix bug in yml keyStore.jks

* lwm2m: fix bug tests

* lwm2m: front: add nameThingsboard

* lwm2m: fix bug Autowired lwm2mContext, caseCamel

* lwm2m: back-end^ start api /lwm2m/deviceProfile/bootstrap

* lwm2m: back-end: add method read models from resources

* lwm2m: back-end/front: add and finish api bootstrapConfig

* lwm2m: back-end: add decode profile

* lwm2m: back-end: add new bin in transport api

* lwm2m: add microservice lwm2m and docker lwm2m.

* lwm2m: add microservice lwm2m and docker lwm2m (fix bug)

* lwm2m: front: start fix bug disabled resources

* lwm2m: master to lwm2m merge, front add change attribute, telemetry

* lwm2m: front PR

* lwm2m: front add sort keyName to Json on the start

* lwm2m: front add instances

* lwm2m: front add/del instances FormGrp Value

* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m
# Conflicts:
#	common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/MqttTransportHandler.java
#	common/transport/transport-api/src/main/java/org/thingsboard/server/common/transport/SessionMsgListener.java
#	ui-ngx/src/app/modules/home/components/home-components.module.ts

* lwm2m: Merge remote-tracking branch 'origin/master' into develop/lwm2m

* lwm2m: Front: del sort after add/del instance

* lwm2m: Front: fix bug reindex FormArray after update

* Lwm2m: Front fix bug add/del instans

* Lwm2m: Front finish1 profile

* Lwm2m: Back add profile to ModelClient

* Lwm2m: Back add form profile sent thingsboard: attr/tel/observe

* Lwm2m: Back -> fix bug: serverKeyStore.jks] Unable to load KeyStore  files server

* Lwm2m: Back -> fix bug: onRegistered an unReg

* Lwm2m: Back -> add updateProfiles

* Lwm2m: Back -> add updateDevice and updateProfile dynamic

* Lwm2m: Back -> error if CoapCode not access

* Lwm2m: Front -> clear credential

* Lwm2m: Front ->  credential fix bug button "save"

* Lwm2m: Back ->  add telemetry logLwm2m

Co-authored-by: nickAS21 <nick@avalr.com.ua>
 2020-12-09 17:09:16 +02:00
YevhenBondarenko
264798b7f9 refactored 2020-12-09 15:53:42 +02:00
YevhenBondarenko
4163c00054 updated kafka to version 2.6.0, kafka settings improvements 2020-12-09 15:53:42 +02:00
deaflynx
2c360f5221 Added buttons to entities' cards for edge scope except Dashboards 2020-12-09 13:29:20 +02:00
deaflynx
a79b7678ee Added buttons to rule chain cards for edge/edges/tenant scopes 2020-12-09 12:58:17 +02:00
Andrii Shvaika
460cec99ec Version set to 3.3-SNAPSHOT 2020-12-09 11:07:00 +02:00
deaflynx
ffd50e0baf 'Root' rc changed into 'Default root' 2020-12-09 10:29:26 +02:00
Artem Babak
6d354af815 Added edge locale 2020-12-09 06:14:19 +02:00
Igor Kulikov
6027958c24
Merge pull request #3815 from vvlladd28/improvement/safari/admin-widget 
UI: Fixed admin widget in safari browser; Fixed order action button
 2020-12-08 15:45:43 +02:00
Igor Kulikov
e65b09abec
Merge pull request #3810 from shga89/patch-2 
Update locale.constant-ko_KR.json
 2020-12-08 15:45:00 +02:00
Artem Babak
79567951b2 Updated edge breadcrumb 2020-12-08 15:20:16 +02:00
Artem Babak
8c05171dc3 Minor ruleChainType code refactor 2020-12-08 11:53:12 +02:00
Artem Babak
f17070ac4f Public edges uncommented 2020-12-08 11:03:49 +02:00
Artem Babak
cf2da5c9b1 Fixed filter edge by type. Added edge to entity-filer/subtype 2020-12-08 10:34:34 +02:00
Artem Babak
91c4affb07 Minor edge changes 2020-12-08 09:23:55 +02:00
Vladyslav Prykhodko
f133551e98 UI: Fixed custom action (with HTML) template action order in dialog 2020-12-08 00:15:07 +02:00
Vladyslav Prykhodko
4d3fe3fd96 UI: Fixed admin widget action order in dialog 2020-12-08 00:03:07 +02:00
Vladyslav Prykhodko
5be701d64d UI: Fixed admin widget in safari browser 2020-12-07 23:31:52 +02:00
Volodymyr Babak
c48315b54c Temporary disabled attributes request test 2020-12-07 13:46:37 +02:00
Volodymyr Babak
2a5097b371 Device processor test fixes 2020-12-07 13:05:28 +02:00
Volodymyr Babak
9f79f83d83 Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge 2020-12-07 11:36:20 +02:00
Volodymyr Babak
d79d00aa87 Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2020-12-07 10:46:15 +02:00
Volodymyr Babak
36f6ad2a62 Merge branch 'develop/2.6-edge' of github.com:volodymyr-babak/thingsboard into develop/2.6-edge 2020-12-05 16:54:34 +02:00
Volodymyr Babak
79929c995b Merge remote-tracking branch 'upstream/develop/2.5.5' into develop/2.6-edge 2020-12-05 16:53:56 +02:00
Seok Hyun, Ga
90e856f937
Update locale.constant-ko_KR.json 
Comma was missing in line 296.
 2020-12-05 21:50:23 +09:00
Igor Kulikov
146e6126ed
Merge pull request #3808 from vvlladd28/improvement/mac/video-camera 
UI: Fixed first init webcamera in iOS device
 2020-12-04 19:34:38 +02:00
ShvaykaD
409fb1f2bc Merge branch 'master' of github.com:thingsboard/thingsboard 2020-12-04 17:48:09 +02:00
Vladyslav_Prykhodko
8d82cec849 UI: Fixed first init webcamera in iOS device 2020-12-04 12:03:26 +02:00
Igor Kulikov
87991deaf7
Merge pull request #3806 from vvlladd28/bug/response/admin-setting/md 
UI: Fixed show OAuth2 settings in table screen
 2020-12-04 09:19:52 +02:00
Vladyslav_Prykhodko
521f14e725 UI: Fixed show OAuth2 settings in table screen 2020-12-03 20:05:39 +02:00
Igor Kulikov
8519f0a9f1
Merge pull request #3805 from vvlladd28/improvement/mac/filter 
UI: Fixed show in Safari browser dashboard filter
 2020-12-03 18:44:29 +02:00
Vladyslav_Prykhodko
41006bf3fc UI: Fixed show in Safari browser dashboard filter 2020-12-03 18:20:45 +02:00
Volodymyr Babak
74fe82a091 Fix license header 2020-12-03 16:32:19 +02:00
Igor Kulikov
3ebe0e98b2
Merge pull request #3804 from vvlladd28/improvement/mac/profile 
UI: Fixed show in Safari browser profile; Fixed show ui-rule-node
 2020-12-03 16:30:50 +02:00
Vladyslav_Prykhodko
2ca3ce47f4 UI: Fixed show in Safari browser profile; Fixed show ui-rule-node 2020-12-03 16:27:27 +02:00
YevhenBondarenko
6f2f9c54dc fixed zones in SchedulerUtils and ApiUsageStateService improvements 2020-12-03 16:11:33 +02:00
Igor Kulikov
ffdef6425a
Merge pull request #3799 from vvlladd28/improvement/api-usage/translation 
UI: Added translation for dashboard api usage
 2020-12-03 15:37:31 +02:00
Igor Kulikov
30bca76585 UI: set default background color 2020-12-03 14:47:28 +02:00
Igor Kulikov
8a30b99d18 Merge branch 'master' of github.com:thingsboard/thingsboard 2020-12-03 14:09:59 +02:00
Igor Kulikov
c9598a23ea UI: Introduce initial page loading spinner 2020-12-03 14:09:48 +02:00
ShvaykaD
a583f9fa8e Merge branch 'master' of github.com:thingsboard/thingsboard 2020-12-03 11:50:57 +02:00
Volodymyr Babak
144891b393 Fixed RPC call edge test 2020-12-03 11:11:11 +02:00