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

674 Commits

Author SHA1 Message Date
Volodymyr Babak
df6f4c9924 Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2021-04-09 19:04:26 +03:00
Igor Kulikov
a207e31841 Merge with master 2021-04-09 12:40:43 +03:00
Igor Kulikov
4a63660e1d Version set to 3.3.0-SNAPSHOT 2021-04-09 12:37:08 +03:00
Volodymyr Babak
7044e3e40f Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2021-03-30 19:35:58 +03:00
Viacheslav Klimov
68a73caada Ignore default value for filters with constant key type 2021-03-30 18:24:00 +03:00
Igor Kulikov
e17de056c2 Merge with master 2021-03-19 12:16:43 +02:00
Viacheslav Klimov
35626766a1 Refactor 2021-03-18 18:05:56 +02:00
Viacheslav Klimov
c98a2d18a1 Refactor 2021-03-18 18:05:56 +02:00
Viacheslav Klimov
22ada62f3b Fix outdated data in alarm clear event 2021-03-18 18:05:56 +02:00
zbeacon
52d1b756fa Fix for test script node function 2021-03-17 17:04:27 +02:00
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
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 Volostnykh
d1da849061 Correction of tests for DeviceProfile 2021-03-15 17:06:36 +02:00
Illia Barkov
593f63818e
Added support for RSA encrypted keys in PEM client credentials (#4230) 
* Added support for RSA encrypted keys in PEM client credentials

* Refactoring

* Refactoring
 2021-03-15 11:40:23 +02:00
Igor Kulikov
b850e7fb25
Merge pull request #4219 from volodymyr-babak/fix-error-msg 
Fixed msg in case unexpected originator type
 2021-03-10 18:21:43 +02:00
Volodymyr Babak
ec6e2611cb Fixed msg in case unexpected originator type 2021-03-10 12:01:58 +02:00
Andrii Shvaika
46f742441f Alarm State improvement 2021-03-09 12:25:56 +02:00
Igor Kulikov
8fe6c956c8 Version set to 3.3.0-SNAPSHOT. Code style improvements. 2021-03-04 12:37:38 +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
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
Igor Kulikov
3255eb9027 Version set to 3.2.2-SNAPSHOT 2021-03-03 12:02:06 +02:00
Igor Kulikov
debf1e0375 Update rule nodes config ui 2021-03-03 11:13:44 +02:00
Andrii Shvaika
f8d1fff4cc New Alias 2021-03-02 12:06:50 +02:00
Andrii Shvaika
3cd964327a Constant filters for device profile 2021-02-26 19:26:31 +02:00
Yevhen Bondarenko
3716e2833a
[WIP]added redis stores support to lwm2m transport (#4164) 
* added redis stores support to lwm2m transport

* added cache dependency to dao

* added cache dependency to dao-api

* moved JacksonUtil to the common.util package

* added cache to the component scan for install

* lwm2m stores improvements
 2021-02-26 14:16:34 +02:00
YevhenBondarenko
667a4459aa fixed sas credentials in iot hub node 
(cherry picked from commit 36ff1a8f9e853da7b5f1d0bf3e564b37ea0d92bc)
 2021-02-23 15:55:04 +02:00
Volodymyr Babak
10d3dd01bb Merge branch 'develop/3.3' of github.com:thingsboard/thingsboard into develop/3.3-edge 2021-02-22 19:08:30 +02:00
Andrii Shvaika
4b43cd75f7 Merge branch 'master' into develop/3.3 2021-02-22 13:29:08 +02:00
Andrii Shvaika
5865dd288c Ignore old properties 2021-02-19 13:05:23 +02:00
Andrii Shvaika
d5f70af38a Ignore removed properties. 2021-02-18 15:54:28 +02:00
Andrii Shvaika
a14c10f1bc Merge branch 'master' of github.com:thingsboard/thingsboard 2021-02-18 15:42:12 +02:00
Andrii Shvaika
bfd0ed5d04 Delta Calculation Node improvement 2021-02-18 15:42:01 +02:00
Andrew Volostnykh
e70df09b08 Code cleaning and fix of tests 2021-02-16 17:04:23 +02:00
Andrew Volostnykh
6bf2b322af Test and some code cleaning 2021-02-16 17:04:23 +02:00
Andrew Volostnykh
e93c975a01 Compound with front-end, fix of incorrect getter use 2021-02-16 17:04:23 +02:00
AndrewVolosytnykhThingsboard
77de9da2a8 DynamicValue: Rename 'useInherit' to correct name 'inheritMode' 2021-02-16 17:04:23 +02:00
AndrewVolosytnykhThingsboard
1c78a59fb2 Logic for inheritance in DynamicValue added 2021-02-16 17:04:23 +02:00
YevhenBondarenko
d5b28222a3 fixed unlimited error messages in TbMsgGeneratorNode 2021-02-16 16:17:39 +02:00
Andrii Shvaika
a15e991d23 Added support of BigDecimal to the JsonConverter 2021-02-16 12:52:25 +02:00
Volodymyr Babak
c46c1b08e7 Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2021-02-15 17:07:25 +02:00
VoBa
eaa2c5785f
Handle case when device was removed from db but message in the queue (#4092) 
* Remove device from cache in case null value cached in the distributed redis

* Handle case when device was removed from db but message in the queue exists

* Code review chagnes
 2021-02-12 16:06:01 +02:00
Andrii Shvaika
dac7c5250f Improvements to the DeviceStateService 2021-02-12 15:40:54 +02:00
Viacheslav Kukhtyn
c4b1f9ea7a Process alarms on activity and inactivity events when device state is persisted to telemetry 2021-02-12 15:40:54 +02:00
Viacheslav Kukhtyn
d34d38613b Process alarm rules on activity and inactivity events 2021-02-12 15:40:54 +02:00
Volodymyr Babak
b58c831343 Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge 2021-02-12 13:10:06 +02:00
Andrii Shvaika
58e31ceb78 Improvement to the restarts of the rule nodes 2021-02-11 18:19:40 +02:00
Igor Kulikov
67aba9e4b1 Merge branch 'master' into develop/3.3 2021-02-11 11:05:10 +02:00
Igor Kulikov
5120ccb536 Update rule node UI 2021-02-10 17:17:54 +02:00