Vladyslav_Prykhodko
|
9b4309c61a
|
Merge remote-tracking branch 'upstream/master' into develop/3.3
|
2021-02-08 10:28:55 +02:00 |
|
Igor Kulikov
|
22e5771120
|
JDK 11 Support
|
2021-02-04 19:31:20 +02:00 |
|
Vladyslav_Prykhodko
|
22a1d24291
|
Added to widgets bundles and widget functional preview and description
|
2021-02-04 19:00:28 +02:00 |
|
Igor Kulikov
|
1643188ab2
|
Fix tests
|
2021-02-01 13:45:26 +02:00 |
|
Igor Kulikov
|
db904c6963
|
Fix HSQLDB support
|
2021-02-01 13:30:03 +02:00 |
|
Igor Kulikov
|
d6abca0096
|
Merge pull request #4022 from AndrewVolosytnykhThingsboard/cassandraBaseTimeseriesDaoFix
CassandraBaseTimeseriesDao init method fix (revert)
|
2021-01-29 13:14:16 +02:00 |
|
Igor Kulikov
|
ef0182414f
|
Merge pull request #3991 from AndrewVolosytnykhThingsboard/andrewdev
#3966 highestAlarmSeverity fixed
|
2021-01-29 13:12:32 +02:00 |
|
AndrewVolostnykhThingsboard
|
70f9da07d8
|
CassandraBaseTimeseriesDao init method fix (revert)
|
2021-01-28 17:01:59 +02:00 |
|
Volodymyr Babak
|
499eb1aef4
|
Merge remote-tracking branch 'upstream/develop/3.3' into develop/3.3-edge
|
2021-01-27 15:12:58 +02:00 |
|
Vladyslav_Prykhodko
|
d5c3f4c997
|
Merge master in develop/3.3
|
2021-01-27 13:31:46 +02:00 |
|
AndrewVolostnykhThingsboard
|
82ae2eb36f
|
findHighestAlarmStatus: code cleaning (i believe that last)
|
2021-01-27 12:25:29 +02:00 |
|
AndrewVolostnykhThingsboard
|
f54dc932f7
|
findHighestAlarmStatus: test for no alarm created, code cleaning
|
2021-01-27 12:22:36 +02:00 |
|
AndrewVolostnykhThingsboard
|
beeade8b07
|
findHighestAlarmStatus: code cleaning
|
2021-01-27 12:16:43 +02:00 |
|
AndrewVolostnykhThingsboard
|
581bb536f5
|
findHighestAlarmStatus: fixed using Repository Query
|
2021-01-27 12:00:20 +02:00 |
|
AndrewVolostnykhThingsboard
|
3c558a7d2a
|
getHighestAlarmSeverity: cleared unwanted code
|
2021-01-26 11:45:57 +02:00 |
|
AndrewVolostnykhThingsboard
|
a4981a869f
|
highestAlarmSeverity fixed
|
2021-01-25 18:01:17 +02:00 |
|
Volodymyr Babak
|
ae8564110a
|
Code clean up
|
2021-01-25 17:30:12 +02:00 |
|
YevhenBondarenko
|
6a458e85b0
|
reset password improvements
|
2021-01-25 17:05:01 +02:00 |
|
YevhenBondarenko
|
4d4d189816
|
getPropagationEntityIds improvements
|
2021-01-25 13:06:11 +02:00 |
|
Volodymyr Babak
|
bc3008ad7b
|
Merge remote-tracking branch 'upstream/master' into develop/3.3-edge
|
2021-01-17 01:47:49 +02:00 |
|
ShvaykaD
|
27e15ab7d8
|
merge after cherry-pick
|
2021-01-14 10:41:14 +02:00 |
|
ShvaykaD
|
b0e6f72658
|
added new methods to JacksonUtil & replaced objectMapper from AuditLogServiceImpl
|
2021-01-14 10:36:15 +02:00 |
|
Valerii Sosliuk
|
f2a31da65e
|
Max Debug Event symbols configurable
|
2021-01-13 11:33:35 +02:00 |
|
Igor Kulikov
|
d31358b2ea
|
Update license header - set 2021 year
|
2021-01-11 13:42:16 +02:00 |
|
Volodymyr Babak
|
c3e1eee6c9
|
Fixed createdTime storage. Fixed copy edge secret and key button
|
2021-01-04 19:45:23 +02:00 |
|
Volodymyr Babak
|
eb24519772
|
Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge
|
2020-12-29 16:55:07 +02:00 |
|
Volodymyr Babak
|
056889be97
|
Added edgeType and edgeSearchQuery support
|
2020-12-29 12:01:40 +02:00 |
|
Volodymyr Babak
|
78a4710c66
|
Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge
|
2020-12-29 11:18:26 +02:00 |
|
Volodymyr Babak
|
e5753c0360
|
Refactored edge rule chains storage
|
2020-12-29 10:18:42 +02:00 |
|
Viacheslav Kukhtyn
|
f1fb0cedae
|
Add audit log details for telemetry deleted and telemetry updated types
|
2020-12-25 18:24:31 +02:00 |
|
Volodymyr Babak
|
995bac539c
|
Added findMissingToRelatedRuleChains method
|
2020-12-24 14:15:39 +02:00 |
|
Volodymyr Babak
|
e58af8fb22
|
Added findMissingToRelatedRuleChains method
|
2020-12-24 13:39:24 +02:00 |
|
Volodymyr Babak
|
df11b383c1
|
Naming conventions update
|
2020-12-23 19:12:05 +02:00 |
|
Volodymyr Babak
|
c5d93d17f4
|
Naming conventions update
|
2020-12-23 18:24:41 +02:00 |
|
Igor Kulikov
|
0d64a64bfe
|
Merge with develop/2.5.6
|
2020-12-23 18:24:09 +02:00 |
|
Igor Kulikov
|
452090b9b7
|
Merge pull request #3883 from ShvaykaD/feature/cassandra-partitions-cache-3.2
[3.2.x] Feature/cassandra partitions cache
|
2020-12-23 16:18:15 +02:00 |
|
Igor Kulikov
|
45756dc728
|
Merge pull request #3834 from YevhenBondarenko/feature/keys-by-query
added ability to get attributes and timeseries keys by entity query
|
2020-12-23 16:13:39 +02:00 |
|
ShvaykaD
|
fb8ddbda58
|
changed doReturn for cassandraBaseTimeseriesDao.getFuture in tests
|
2020-12-23 11:46:05 +02:00 |
|
YevhenBondarenko
|
f50dec4f76
|
fix ConstraintViolationException on findOrCreateDeviceProfile
|
2020-12-22 19:58:54 +02:00 |
|
ShvaykaD
|
637ad6cac5
|
remove boundStatementBuilder from doSavePartition method
|
2020-12-22 17:34:23 +02:00 |
|
nickAS21
|
1150d4e4f3
|
Lwm2m: backEnd: add saveDeviceWithCredential
|
2020-12-22 16:23:03 +02:00 |
|
ShvaykaD
|
24a31d6134
|
update code
|
2020-12-21 21:43:09 +02:00 |
|
ShvaykaD
|
e516cd31dc
|
added Caffeine cache for Cassandra ts partitions saving
|
2020-12-21 19:09:34 +02:00 |
|
Andrii Shvaika
|
2ea3b18738
|
partitions cache improvements
|
2020-12-21 17:06:10 +02:00 |
|
ShvaykaD
|
0a2255d055
|
move SettableFuture.create() to the else block
|
2020-12-21 17:06:10 +02:00 |
|
ShvaykaD
|
724df48f79
|
added default value for .yml parameter & rename params names
|
2020-12-21 17:06:10 +02:00 |
|
ShvaykaD
|
aede1af6f9
|
improvements after review
|
2020-12-21 17:06:10 +02:00 |
|
ShvaykaD
|
0de5868bc5
|
added Caffeine cache for Cassandra ts partitions saving
|
2020-12-21 17:06:10 +02:00 |
|
VoBa
|
c24cf59980
|
Merge pull request #68 from deaflynx/develop/3.3-edge
Added edge_name_unq_key in saveEdge
|
2020-12-18 15:03:48 +02:00 |
|
deaflynx
|
4f6ad3263f
|
Added edge_name_unq_key in saveEdge
|
2020-12-18 14:58:34 +02:00 |
|