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

5882 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
VoBa
004d8a7de9
Merge pull request #64 from deaflynx/develop/2.6-edge 
Develop/2.6 edge UI updates
 2020-12-15 16:22:25 +02:00
Artem Babak
05771cd900 getEdge, getTenantEdges, getCustomerEdges refactored 2020-12-15 15:29:10 +02:00
Artem Babak
00caacf6c2 Delete UI filtering for getEdgeRuleChains 2020-12-15 13:29:17 +02:00
Artem Babak
1463de7c01 Delete UI filtering for getEdgeDashboards 2020-12-15 13:25:27 +02:00
Artem Babak
cb0201e87a Delete UI filtering for getEdge assets/entity-views/devices 2020-12-15 13:22:24 +02:00
VoBa
337fcc2afd
Merge pull request #63 from deaflynx/develop/2.6-edge 
Develop/2.6 edge fixed saveEdge, importEdge
 2020-12-15 11:39:19 +02:00
Artem Babak
1178e5779a Fix for ConstraintViolationException for saveEdge 2020-12-15 11:15:37 +02:00
Artem Babak
6cdb549704 Added ConstraintViolationException for saveEdge 2020-12-15 11:06:39 +02:00
Artem Babak
720c89f109 Fix edge import locale 2020-12-15 09:53:16 +02:00
Artem Babak
769428c42e Fix edge import 2020-12-15 09:51:18 +02:00
Volodymyr Babak
e32dfcfb31 Code review fixes 2020-12-15 08:49:44 +02:00
Volodymyr Babak
6bc247c0e1 Removed local files 2020-12-14 17:03:24 +02:00
Volodymyr Babak
32b608e10d Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge 2020-12-14 15:45:38 +02:00
Volodymyr Babak
b52d2aae17 Get rid of configuration field 2020-12-14 15:31:58 +02:00
Volodymyr Babak
a1d6cee789 Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge 2020-12-14 14:43:54 +02:00
Volodymyr Babak
846f5ba86b Merge remote-tracking branch 'deaflynx/develop/3.3-edge' into develop/3.3-edge 2020-12-14 12:55:07 +02:00
Volodymyr Babak
64694532db Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge 2020-12-14 12:48:49 +02:00
Volodymyr Babak
230a303156 Fixes incorrect customer user sync 2020-12-14 12:37:21 +02:00
Artem Babak
5a04ebfdad Minor code beautify 2020-12-14 11:39:37 +02:00
Artem Babak
4b08103857 Removed device's methods for edge 2020-12-14 11:35:42 +02:00
Volodymyr Babak
85036d0537 Refactored in sync with ce-3 2020-12-14 11:32:35 +02:00
Artem Babak
525ae47347 run config 2020-12-14 11:28:34 +02:00
Volodymyr Babak
83d56fae4c Translate 2020-12-14 11:21:42 +02:00
Artem Babak
36c992e19e Edge events locales updated 2020-12-14 09:56:11 +02:00
Volodymyr Babak
b48d43f4dd Added support for EDGE entity 2020-12-13 19:28:05 +02:00
Volodymyr Babak
0ce128725d License header fix 2020-12-12 20:03:24 +02:00
Volodymyr Babak
0c7a51242d Tech depts. Added support for Edge entity on push to edge node 2020-12-12 19:08:44 +02:00
Volodymyr Babak
69994adb18 Code review fixes 2020-12-11 18:41:18 +02:00
Artem Babak
ede460c0d5 Edges rule chains: fix for default rule chains icons 2020-12-11 16:20:12 +02:00
Artem Babak
a736701ab8 Edge root rule chains issue fix 2020-12-11 15:32:27 +02:00
Artem Babak
a6a0a65d25 Added route for edge dashboard 2020-12-11 11:31:05 +02:00
Artem Babak
fee5034e46 Edge dashboards cell action buttons 2020-12-11 11:04:19 +02:00
Artem Babak
b285b2b00c Fix for edge rulechains 2020-12-11 10:58:36 +02:00
Artem Babak
c19cf2372e Added findEntityViewByTenantIdAndEdgeIdAndType and findDevicesByTenantIdAndEdgeIdAndDeviceProfileId 2020-12-11 08:48:18 +02:00
Volodymyr Babak
ba14bc11e7 Merge branch 'develop/2.6-edge' of github.com:volodymyr-babak/thingsboard into develop/2.6-edge 2020-12-10 18:51:41 +02:00
Volodymyr Babak
3a46cbe5d8 Refactored edge event process. Code review fixes 2020-12-10 18:51:26 +02:00
VoBa
d0bff3d6eb
Merge pull request #61 from deaflynx/develop/2.6-edge 
Develop/2.6 edge UI updates
 2020-12-10 17:57:56 +02:00
Volodymyr Babak
57adec670b Formatting 2020-12-10 17:26:20 +02:00
Artem Babak
3ffa7e3592 Added button unassignFromEdge for entities. Added findAssetsByTenantIdAndEdgeIdAndType() 2020-12-10 16:59:15 +02:00
Volodymyr Babak
193cccf123 Refactored Edge session message poll mechanism. Removed tech dept - Integer.MAX_INTEGER. Code refactoring 2020-12-10 16:18:12 +02:00
Artem Babak
04e50696f6 Fix for setRootRuleChains button - for edge scope 2020-12-10 12:36:52 +02:00
Artem Babak
3e67a9ad0e Fix for setDefaultRoot button - only for edges scope 2020-12-10 12:16:57 +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
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