Volodymyr Babak
8733c04d29
Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge
6 years ago
Volodymyr Babak
40ad4fb08c
SQL style fix
6 years ago
Volodymyr Babak
30588388e2
Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge
6 years ago
Volodymyr Babak
c71ba1f245
Fixed grpc over ssl
6 years ago
Volodymyr Babak
0f64b3764f
Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge
6 years ago
Viacheslav Klimov
3420eeb9d7
[3.3] [PROD-800] Fix empty search result when query is empty ( #4209 )
* Fix empty search result when query is empty
* Refactor
6 years ago
Viacheslav Klimov
bc6efa5e1e
[3.3] [PROD-685] Provide user's session expiration when his auth data is changed ( #4201 )
* Provide user's session expiration when his auth data is changed
* Provide mock TokenOutdatingService for dao tests
* Increase time gap when checking if token is outdated
* Add license header for TokenOutdatingTest
* Refactor tokens outdating functionality to events usage
* Reset tokens on front-end after changing password
6 years ago
Viacheslav Klimov
e30ec49d2b
[3.3] [PROD-806] Implement alarm condition metadata displaying ( #4185 )
* Implement alarm condition metadata displaying
* Refactor
6 years ago
Andrew Shvayka
0a2477da79
Merge pull request #4238 from thingsboard/add-models
Add models
6 years ago
nickAS21
648e8ec262
lwm2m: add Lwm2m provider for models
6 years ago
nickAS21
d27c721bbf
lwm2m: Merge branch 'develop/3.3' into add-models
6 years ago
Yevhen Bondarenko
43fe84a284
created TransportResourceCache ( #4232 )
* created TransportResourceCache
* return resource by sysadmin if not found by tenant in DefaultTransportApiService
6 years ago
Yevhen Bondarenko
e2dd5b96ae
added resource dao support ( #4213 )
* Version set to 3.3.0-SNAPSHOT
* added resource dao
* added resource support in transport lvl (get resources and "update", "delete" notifications)
* refactoring
* added resource table to hsql schema
* added check for models dir in InstallScripts
* added pageLink support to getResources
6 years ago
nickAS21
d8ea6ac37d
Lwm2m: back: add tenantId and repositoryTenant - test3
6 years ago
nickAS21
447bf05b7b
Lwm2m: back: add tenantId and repositoryTenant - test2
6 years ago
nickAS21
65f4ca5800
Lwm2m: back: add tenantId and repositoryTenant - test
6 years ago
YevhenBondarenko
c78bd55df5
added resource table to hsql schema
6 years ago
YevhenBondarenko
616839a23c
refactoring
6 years ago
YevhenBondarenko
937cd04abe
Merge branch 'develop/3.3' of https://github.com/thingsboard/thingsboard into develop/3.3-lwm2m
6 years ago
YevhenBondarenko
bd3185a98f
added resource support in transport lvl (get resources and "update", "delete" notifications)
6 years ago
nickAS21
3f4714c2ce
Lwm2m strategy ( #4210 )
* Lwm2m: back: two strategy
* Lwm2m: back: add new models
* Lwm2m: back: del new models
6 years ago
Vladyslav
207cc8ac1c
Merge pull request #4192 from thingsboard/lwm2m_bug_keyName
Lwm2m bug key name
6 years ago
YevhenBondarenko
6438f6b0ee
added resource dao
6 years ago
nickAS21
03b647c525
Lwm2m: front: validateObject on the start fix bug
6 years ago
Igor Kulikov
8fe6c956c8
Version set to 3.3.0-SNAPSHOT. Code style improvements.
6 years ago
Igor Kulikov
655052090e
Merge branch 'master' into develop/3.3
6 years ago
Igor Kulikov
2e096cf269
Merge pull request #4187 from YevhenBondarenko/fix/ws
added ping for WS
6 years ago
YevhenBondarenko
e3851dcaad
improvements
6 years ago
YevhenBondarenko
50d96fb49e
Version set to 3.3.0-SNAPSHOT
6 years ago
Igor Kulikov
f29d548d4a
Fix timeseries bars tooltip
6 years ago
nickAS21
675e552672
Lwm2m: back fix bug: shared attr & change observe in profile ( #4175 )
* Lwm2m: back fix bug: shared attr & change observe in profile
* Lwm2m: replace: lwServer by leshanServer. Remove lwServer from interface LwM2mTransportService
* Lwm2m: californium ver 2.6.1
* Lwm2m: californium ver 2.6.1
* Lwm2m: Json clone
6 years ago
Igor Kulikov
8190ed0f4f
Merge branch 'master' of github.com:thingsboard/thingsboard
6 years ago
Igor Kulikov
5d94e5e74a
Minor improvement for oauth2 success handler
6 years ago
Igor Kulikov
e807a56b38
Merge pull request #4190 from vvlladd28/bug/filter-text/alarm-rule
UI: Fixed filter preview text at boolean type in alarm rule
6 years ago
Igor Kulikov
a4d651eb4b
Merge branch 'master' of github.com:thingsboard/thingsboard
6 years ago
Igor Kulikov
bf6745274d
Add http cookie repository to store oauth2 authorization requests
6 years ago
nickAS21
dc8370c859
Lwm2m: front: validateObject on the start
6 years ago
Andrew Shvayka
a3cb9724e3
Merge pull request #4191 from thingsboard/master
Merge master to develop 3.3
6 years ago
Volodymyr Babak
a4fc59246e
Fixed moved class
6 years ago
Vladyslav_Prykhodko
8ef06ed5d6
UI: Fixed filter preview text at boolean type in alarm rule
6 years ago
Volodymyr Babak
e96452cdcf
Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge
6 years ago
Alexander Yurov
ae2ca8af08
Removed unused import
6 years ago
Alexander Yurov
f9d1e34798
Added USER as originator for 'customer details' rule node
6 years ago
VoBa
aedebc32eb
Merge pull request #78 from deaflynx/develop/3.3-edge
Develop/3.3 edge: changes in Edge Downlinks, Edge Widget, fix for edge rule chains missing tooltips
6 years ago
YevhenBondarenko
d91c52487f
Merge branch 'master' of https://github.com/thingsboard/thingsboard into fix/ws
# Conflicts:
# application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetryWebSocketService.java
6 years ago
deaflynx
f470a7ca30
Minor getEdgeEventContentByEntityType refactoring
6 years ago
deaflynx
f2ac0f6913
Minor getEdgeEventContentByEntityType refactoring
6 years ago
deaflynx
7cef8eada4
getEdgeEventContentByEntityType() added function type
6 years ago
deaflynx
bf41bc5f09
Edge Downlinks refactor, prepareEdgeEventContent moved to Entity Service
6 years ago
YevhenBondarenko
e318b49c2d
refactoring
6 years ago