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

5757 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Vladyslav_Prykhodko
8ef06ed5d6 UI: Fixed filter preview text at boolean type in alarm rule 2021-03-03 15:30:57 +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
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
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
Vladyslav_Prykhodko
07ed2581be UI: Refactoring code 2021-03-03 11:52:19 +02:00
Igor Kulikov
16c55b4dda
Merge pull request #4179 from AndrewVolosytnykhThingsboard/activation-link-fix-new 
Activation link fix
 2021-03-03 05:36:04 -04:00
Igor Kulikov
2ac7b122dc
Merge pull request #4173 from vvlladd28/improvement/enities-tables/lable-include-dots 
UI: Added the ability to get the value of a key that contains dots in the name to a table widgets
 2021-03-03 05:26:00 -04:00
Igor Kulikov
2548b8c023
Merge pull request #4165 from vvlladd28/bug/search/spech-character 
UI: fixed text search request include reserved characters
 2021-03-03 05:23:39 -04:00
Igor Kulikov
78b3285116 git push origin masterMerge branch 'vvlladd28-improvement/validation/table/cell-style' 2021-03-03 11:22:01 +02:00
Igor Kulikov
6c024360ff Fix conflicts 2021-03-03 11:21:54 +02:00
ShvaykaD
aa7752e942 fix typo 2021-03-03 11:15:56 +02:00
ShvaykaD
b418b08d23 code simplified 2021-03-03 11:15:56 +02:00
ShvaykaD
0d28d6279c added fix for partitions save 2021-03-03 11:15:56 +02:00
Igor Kulikov
debf1e0375 Update rule nodes config ui 2021-03-03 11:13:44 +02:00
Igor Kulikov
a8088a0655
Merge pull request #4119 from vvlladd28/improvement/js-json-editor/fullscrean 
UI: Added to js/JSON editor always working fullscreen button
 2021-03-03 05:10:02 -04:00
Igor Kulikov
588253daa4
Merge pull request #4113 from ChantsovaEkaterina/improvement/get-alarm-first-entity-info 
Get first entity info: add alarm entity info for single-entity aliases even if no alarms to display
 2021-03-03 05:09:09 -04:00
Igor Kulikov
961455b4af
Merge pull request #4096 from vvlladd28/improvement/timeseries-table/load 
UI: Improvement load and update time into time series table
 2021-03-03 05:05:48 -04:00
Igor Kulikov
18d0d36976 Merge branch 'feature/entity-count-api' 2021-03-02 17:56:16 +02:00
YevhenBondarenko
506151185f added ping for WS 2021-03-02 16:42:59 +02:00
Igor Kulikov
99c9c099ba Add Entity Type alias. Fix Key filter value conditional processing. 2021-03-02 15:13:21 +02:00
Vladyslav_Prykhodko
cbc8991b05 UI: Updated value name 2021-03-02 13:21:53 +02:00
Andrii Shvaika
2b7111516c Merge branch 'feature/entity-count-api' of github.com:thingsboard/thingsboard into feature/entity-count-api 2021-03-02 12:07:05 +02:00
Andrii Shvaika
f8d1fff4cc New Alias 2021-03-02 12:06:50 +02:00
Igor Kulikov
0b43762a83 Introduce entities count datasource. 2021-03-02 12:04:45 +02:00
Andrew Volostnykh
a600a5050a Refactoring 2021-03-01 19:30:56 +02:00
Vladyslav_Prykhodko
c81854e614 Twilio SMS provider added support Phone Number's SID or Messaging Service SID 2021-03-01 19:16:13 +02:00
Andrii Shvaika
1e9016cb47 Implementation 2021-03-01 18:23:39 +02:00
Volodymyr Babak
eec8bb0202 Introduced new configuration option 2021-03-01 16:13:50 +02:00
Volodymyr Babak
594a1290db Async timeout connector customizer. Refactoring 2021-03-01 16:13:50 +02:00
Andrew Volostnykh
a2d9899a46 Null activation link and absent expected field in additional info fixed 2021-03-01 15:15:24 +02:00