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

5370 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Kulikov
6814c21ee9 restore ver 3.2.1-SNAPSHOT 2020-12-23 18:24:42 +02:00
Igor Kulikov
0d64a64bfe Merge with develop/2.5.6 2020-12-23 18:24:09 +02:00
Igor Kulikov
bfee301625 Set ver to 2.5.6-SNAPSHOT 2020-12-23 17:47:58 +02:00
Igor Kulikov
0117330be1
Merge pull request #3889 from vvlladd28/improvement/show-many/alarm0rules 
UI: Improvement time rendering profiles seated too many parameters
 2020-12-23 17:42:35 +02:00
Igor Kulikov
77d5e6c44f
Merge pull request #3701 from Dmitriymush/master 
[3.2.1] bug-fix: Trip-animation
 2020-12-23 17:41:42 +02:00
Vladyslav_Prykhodko
b19bcdfe9a UI: Improvement time rendering profiles seated too many parameters 2020-12-23 17:31:08 +02:00
Dmitriymush
fd3208cf82 2nd part of additions to fix after review 2020-12-23 17:14:19 +02:00
Igor Kulikov
ccab1aa2c9
Merge pull request #3887 from YevhenBondarenko/mqtt-transport-improvements 
Mqtt flag sessionPresent depends on flag isCleanSession
 2020-12-23 16:57:58 +02:00
YevhenBondarenko
16d82e77fc refactored 2020-12-23 16:54:14 +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
Igor Kulikov
bb643df296
Merge pull request #3888 from YevhenBondarenko/fix-device-profile-service 
fix ConstraintViolationException on findOrCreateDeviceProfile
 2020-12-23 13:31:58 +02:00
Igor Kulikov
09ed69a568
Merge pull request #3885 from vvlladd28/bug/bulk-import/updated-type-device 
UI: Fixed updated deviceProfile in bulk import devices
 2020-12-23 13:30:19 +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
YevhenBondarenko
bff16ddafd Mqtt flag sessionPresent depends on flag isCleanSession 2020-12-22 18:02:38 +02:00
ShvaykaD
637ad6cac5 remove boundStatementBuilder from doSavePartition method 2020-12-22 17:34:23 +02:00
Vladyslav_Prykhodko
3e28c960d3 UI: Fixed updated deviceProfile in bulk import devices 2020-12-22 13:40:02 +02:00
ShvaykaD
24a31d6134 update code 2020-12-21 21:43:09 +02:00
Igor Kulikov
4c4ec36b5c
Merge pull request #3882 from vvlladd28/improvement/device-profile/load 
UI: Fixed load device-profile details
 2020-12-21 19:38:57 +02:00
ShvaykaD
e516cd31dc added Caffeine cache for Cassandra ts partitions saving 2020-12-21 19:09:34 +02:00
Vladyslav_Prykhodko
f566bff84a UI: Fixed load device-profile details 2020-12-21 18:59:54 +02:00
ShvaykaD
6bfc1b8930 Merge branch 'master' of github.com:thingsboard/thingsboard 2020-12-21 17:23:55 +02:00
Viacheslav Kukhtyn
8e279bbbd7 Methods findInfoByTo() and findInfoByQuery() should return EntityRelationInfo but no EntityRelation 2020-12-21 17:07:44 +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
Andrii Shvaika
be84a0fc20 Version set to 2.5.6-SNAPSHOT 2020-12-21 16:42:45 +02:00
ShvaykaD
12667d89ea Merge branch 'master' of github.com:thingsboard/thingsboard 2020-12-21 15:19:26 +02:00
Igor Kulikov
8fe13a2c7a
Merge pull request #3870 from vvlladd28/fixed/translate/sl 
UI: Fixed Slovenian locale after merge
 2020-12-21 09:57:02 +02:00
Vladyslav_Prykhodko
ba3e779cc0 UI: Fixed Slovenian locale after merge 2020-12-19 14:40:36 +02:00
fdrobnic
c910597f62
Added Slovenian locale (#3855) 
* Add files via upload

Added Slovenian locale

* Add files via upload

* Delete locale-sl_SI.json

* Added Slovenian locale

* Delete locale-sl_SI.json
 2020-12-18 17:38:25 +02:00
Vladyslav_Prykhodko
3aa97eec06 UI: Improvement autocomplete data keys in datasource widget 2020-12-17 13:32:03 +02:00
Dmitriymush
65027b9c17 Additions to fixes after review 2020-12-16 18:42:55 +02:00
Dmitriymush
96ff9ddedd Fixes after review 2020-12-16 17:36:08 +02:00
YevhenBondarenko
91bb1ed504 refactored findEntityTimeseriesAndAttributesKeysByQuery 2020-12-16 11:21:28 +02:00
YevhenBondarenko
dfb82bf28f findEntityTimeseriesAndAttributesKeysByQuery improvements 2020-12-16 11:05:35 +02:00
YevhenBondarenko
92f088b53f changed dashboard configuration column type 2020-12-16 10:11:42 +02:00
Igor Kulikov
77a0e3bbe1
Merge pull request #3849 from vvlladd28/bugs/load-fonts/prod 
UI: Fixed load material icon fonts
 2020-12-15 18:40:15 +02:00
Vladyslav_Prykhodko
d1e0cf175e UI: Fixed load material icon fonts 2020-12-15 18:28:38 +02:00
Andrii Shvaika
395ab10c0c Avoid sending WARNINGS if api usage value is zero 2020-12-15 18:09:52 +02:00
Andrii Shvaika
87914be4af Improved logging of Rule Node Errors 2020-12-15 17:40:19 +02:00
YevhenBondarenko
f63b4b1f7c created findEntityTimeseriesAndAttributesKeysByQuery instead findEntityTimeseriesKeysByQuery and findEntityAttributesKeysByQuery 2020-12-15 16:16:02 +02:00
Andrii Shvaika
b22404e9fb Change AWS SMS type from Promotional to Transactional 2020-12-14 18:26:18 +02:00
Igor Kulikov
b7afd7991e
Merge pull request #3846 from vvlladd28/bugs/translation/czech 
UI: Clear locales constant in czech language
 2020-12-14 11:13:04 +02:00
Vladyslav_Prykhodko
e7db92dfa0 UI: Clear locales constant in czech language 2020-12-14 11:02:38 +02:00
Igor Kulikov
af707122c4
Merge pull request #3842 from Hamza-Slama/patch-1 
Remove useless space
 2020-12-14 09:41:49 +02:00
Hamza Slama
8463976328
Remove useless space 2020-12-12 14:54:34 +01:00