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

7516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Kulikov
d9a5ee6d0d
Merge pull request #4212 from YevhenBondarenko/fix/ws 
TbWebSocketHandler refactoring
 2021-03-09 12:58:42 +02:00
Andrii Shvaika
46f742441f Alarm State improvement 2021-03-09 12:25:56 +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
VoBa
953054fadc
eval is not thread safe. Added lock to avoid 'No such function invokeInternalXXX' exception (#4211) 
* eval is not thread safe. Added lock to avoid 'No such function invokeInternalXXX' exception

* License fix
 2021-03-05 18:18:58 +02:00
YevhenBondarenko
69025ab3af TbWebSocketHandler refactoring 2021-03-05 18:17:35 +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
Igor Kulikov
6789cff802 Fix schema version 2021-03-05 17:43:22 +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
Igor Kulikov
9187a827e7 Merge branch 'vvlladd28-feature/dashboard/widget-select-preview' 2021-03-05 17:09:00 +02:00
Igor Kulikov
71062f64df New widget selector backend support 2021-03-05 17:08:46 +02:00
Igor Kulikov
23903588ac Merge branch 'feature/dashboard/widget-select-preview' of https://github.com/vvlladd28/thingsboard into vvlladd28-feature/dashboard/widget-select-preview 2021-03-05 13:02:13 +02:00
Igor Kulikov
3e9c00048a
Merge pull request #4203 from vvlladd28/improvement/multiple-attributes/disable 
UI: Added dynamic change state disable input fields at multiple attributes widget
 2021-03-05 06:56:34 -04:00
Vladyslav
207cc8ac1c
Merge pull request #4192 from thingsboard/lwm2m_bug_keyName 
Lwm2m bug key name
 2021-03-04 20:21:26 +02:00
Vladyslav_Prykhodko
3dd57fd286 UI: Redesign search input widget selector 2021-03-04 19:38:30 +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
Vladyslav_Prykhodko
35b37f4875 UI: Added dynamic change state disable input fields at multiple attributes widget 2021-03-04 17:17:26 +02:00
Vladyslav_Prykhodko
a3e2106888 UI: Added filter widget type 2021-03-04 17:11:55 +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
Vladyslav_Prykhodko
55b5b3f20e UI: Update preview image in input widgets bundle 2021-03-03 18:52:49 +02:00
Igor Kulikov
f29d548d4a Fix timeseries bars tooltip 2021-03-03 18:47:56 +02:00
Vladyslav_Prykhodko
b3b9701076 UI: Added search widget 2021-03-03 18:41:01 +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
6c5f840de8 UI: Added search widgets bundle 2021-03-03 15:41:47 +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
Vladyslav_Prykhodko
530c077b05 Merge remote-tracking branch 'upstream/master' into feature/dashboard/widget-select-preview 2021-03-03 15:03:06 +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