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

6499 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Volodymyr Babak
0f64b3764f Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge 2021-03-16 16:59:15 +02:00
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
 2021-03-16 15:29:46 +02:00
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
 2021-03-15 17:11:23 +02:00
Viacheslav Klimov
e30ec49d2b
[3.3] [PROD-806] Implement alarm condition metadata displaying (#4185) 
* Implement alarm condition metadata displaying

* Refactor
 2021-03-15 17:09:35 +02:00
Andrew Shvayka
0a2477da79
Merge pull request #4238 from thingsboard/add-models 
Add models
 2021-03-15 16:18:43 +02:00
nickAS21
648e8ec262 lwm2m: add Lwm2m provider for models 2021-03-12 17:53:03 +02:00
nickAS21
d27c721bbf lwm2m: Merge branch 'develop/3.3' into add-models 2021-03-12 15:19:47 +02:00
Yevhen Bondarenko
43fe84a284
created TransportResourceCache (#4232) 
* created TransportResourceCache

* return resource by sysadmin if not found by tenant in DefaultTransportApiService
 2021-03-12 13:00:51 +02:00
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
 2021-03-09 19:45:28 +02:00
nickAS21
d8ea6ac37d Lwm2m: back: add tenantId and repositoryTenant - test3 2021-03-09 11:08:51 +02:00
nickAS21
447bf05b7b Lwm2m: back: add tenantId and repositoryTenant - test2 2021-03-08 19:24:33 +02:00
nickAS21
65f4ca5800 Lwm2m: back: add tenantId and repositoryTenant - test 2021-03-08 00:00:44 +02:00
YevhenBondarenko
c78bd55df5 added resource table to hsql schema 2021-03-05 19:10:44 +02:00
YevhenBondarenko
616839a23c refactoring 2021-03-05 18:05:47 +02:00
YevhenBondarenko
937cd04abe Merge branch 'develop/3.3' of https://github.com/thingsboard/thingsboard into develop/3.3-lwm2m 2021-03-05 17:44:41 +02:00
YevhenBondarenko
bd3185a98f added resource support in transport lvl (get resources and "update", "delete" notifications) 2021-03-05 17:43:56 +02:00
nickAS21
3f4714c2ce
Lwm2m strategy (#4210) 
* Lwm2m:  back: two strategy

* Lwm2m:  back: add new models

* Lwm2m:  back: del new models
 2021-03-05 17:40:13 +02:00
Vladyslav
207cc8ac1c
Merge pull request #4192 from thingsboard/lwm2m_bug_keyName 
Lwm2m bug key name
 2021-03-04 20:21:26 +02:00
YevhenBondarenko
6438f6b0ee added resource dao 2021-03-04 18:32:28 +02:00
nickAS21
03b647c525 Lwm2m: front: validateObject on the start fix bug 2021-03-04 17:19:07 +02:00
Igor Kulikov
8fe6c956c8 Version set to 3.3.0-SNAPSHOT. Code style improvements. 2021-03-04 12:37:38 +02:00
Igor Kulikov
655052090e Merge branch 'master' into develop/3.3 2021-03-04 12:03:39 +02:00
Igor Kulikov
2e096cf269
Merge pull request #4187 from YevhenBondarenko/fix/ws 
added ping for WS
 2021-03-04 04:57:04 -04:00
YevhenBondarenko
e3851dcaad improvements 2021-03-04 10:50:57 +02:00
YevhenBondarenko
50d96fb49e Version set to 3.3.0-SNAPSHOT 2021-03-04 10:03:09 +02:00
Igor Kulikov
f29d548d4a Fix timeseries bars tooltip 2021-03-03 18:47:56 +02:00
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
 2021-03-03 18:18:56 +02:00
Igor Kulikov
8190ed0f4f Merge branch 'master' of github.com:thingsboard/thingsboard 2021-03-03 17:31:39 +02:00
Igor Kulikov
5d94e5e74a Minor improvement for oauth2 success handler 2021-03-03 17:31:22 +02:00
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
 2021-03-03 11:22:42 -04:00
Igor Kulikov
a4d651eb4b Merge branch 'master' of github.com:thingsboard/thingsboard 2021-03-03 17:19:37 +02:00
Igor Kulikov
bf6745274d Add http cookie repository to store oauth2 authorization requests 2021-03-03 17:19:24 +02:00
nickAS21
dc8370c859 Lwm2m: front: validateObject on the start 2021-03-03 17:18:49 +02:00
Andrew Shvayka
a3cb9724e3
Merge pull request #4191 from thingsboard/master 
Merge master to develop 3.3
 2021-03-03 15:57:51 +02:00
Volodymyr Babak
a4fc59246e Fixed moved class 2021-03-03 15:50:39 +02:00
Vladyslav_Prykhodko
8ef06ed5d6 UI: Fixed filter preview text at boolean type in alarm rule 2021-03-03 15:30:57 +02:00
Volodymyr Babak
e96452cdcf Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge 2021-03-03 15:18:38 +02:00
Alexander Yurov
ae2ca8af08 Removed unused import 2021-03-03 15:12:59 +02:00
Alexander Yurov
f9d1e34798 Added USER as originator for 'customer details' rule node 2021-03-03 15:12:59 +02:00
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
 2021-03-03 15:11:19 +02:00
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
 2021-03-03 14:38:42 +02:00
deaflynx
f470a7ca30 Minor getEdgeEventContentByEntityType refactoring 2021-03-03 14:38:41 +02:00
deaflynx
f2ac0f6913 Minor getEdgeEventContentByEntityType refactoring 2021-03-03 14:35:58 +02:00
deaflynx
7cef8eada4 getEdgeEventContentByEntityType() added function type 2021-03-03 14:31:13 +02:00
deaflynx
bf41bc5f09 Edge Downlinks refactor, prepareEdgeEventContent moved to Entity Service 2021-03-03 14:30:02 +02:00
YevhenBondarenko
e318b49c2d refactoring 2021-03-03 13:22:31 +02:00
YevhenBondarenko
f68158c550 improvements 2021-03-03 12:15:21 +02:00
Igor Kulikov
3255eb9027 Version set to 3.2.2-SNAPSHOT 2021-03-03 12:02:06 +02:00
Igor Kulikov
d77ec66203
Merge pull request #4181 from vvlladd28/improvement/twilio-sms-provider 
Twilio SMS provider added support Phone Number's SID or Messaging Service SID
 2021-03-03 05:54:15 -04:00
deaflynx
3c03618d3e Edge Downlinks: deleted @Input tenandId, added Widgets/DeviceProfile fetch methods 2021-03-03 11:52:24 +02:00