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

5560 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Kulikov
a3d2eb4c4e Fix NPE in entity data subscription 2021-01-29 15:05:31 +02:00
Igor Kulikov
34aab3287b
Merge pull request #4002 from ponv/master 
Dynamic color for data points
 2021-01-29 14:04:42 +02:00
Vladyslav_Prykhodko
034ea03f24 Refactoring code to dynamic color point in trip-animation widget 2021-01-29 14:02:48 +02:00
Igor Kulikov
76bb8f13c0 Merge branch 'master' of github.com:thingsboard/thingsboard 2021-01-29 14:00:14 +02:00
Igor Kulikov
33928d4135 Fix NPE in Rest API Call rule node 2021-01-29 14:00:00 +02:00
Andrii Shvaika
cf40729bae Merge branch 'master' of github.com:thingsboard/thingsboard 2021-01-29 13:33:41 +02:00
Andrii Shvaika
00e1ed3aa8 More tests for Deduplication Executor 2021-01-29 13:33:30 +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
cd4a149d8a
Merge pull request #4011 from AndrewVolosytnykhThingsboard/andrew-restclient-fix 
Rest Client unable to get device types fix #3992
 2021-01-29 13:13:14 +02:00
Igor Kulikov
ef0182414f
Merge pull request #3991 from AndrewVolosytnykhThingsboard/andrewdev 
#3966 highestAlarmSeverity fixed
 2021-01-29 13:12:32 +02:00
Igor Kulikov
06420d2ba1
Merge pull request #4014 from YevhenBondarenko/base-url 
default value for prohibitDifferentUrl changed to false
 2021-01-29 13:04:21 +02:00
Igor Kulikov
993579f268
Merge pull request #4020 from PetrTodorov/master 
Update Czech UI Translation
 2021-01-29 13:03:53 +02:00
Andrii Shvaika
5029445b8c Deduplication of the partition change events 2021-01-28 18:59:57 +02:00
AndrewVolostnykhThingsboard
70f9da07d8 CassandraBaseTimeseriesDao init method fix (revert) 2021-01-28 17:01:59 +02:00
PetrTodorov
e4fe3f399b Updated Czech translation 2021-01-28 15:11:50 +01:00
YevhenBondarenko
f1c3e1a578 default value for prohibitDifferentUrl changed to false 2021-01-27 14:45:34 +02:00
AndrewVolostnykhThingsboard
5ce512b853 rest-client: getDeviceTypes fixed 2021-01-27 12:34:57 +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
ponvalavan annamalai
68eebaf041 removed spaces -dynamic color for data points 2021-01-26 18:15:00 +00:00
ponvalavan annamalai
0219b8a6fd Dynamic color for data points 2021-01-26 18:12:21 +00:00
ponvalavan annamalai
fc40047a5e Dynamic color for data points 2021-01-26 18:01:55 +00:00
ponvalavan annamalai
6cd6568ee3 Dynamic color for data points 2021-01-26 17:24:31 +00:00
AndrewVolostnykhThingsboard
3c558a7d2a getHighestAlarmSeverity: cleared unwanted code 2021-01-26 11:45:57 +02:00
Igor Kulikov
61723da391 Version set to 3.3.0-SNAPSHOT 2021-01-26 10:17:52 +02:00
AndrewVolostnykhThingsboard
a4981a869f highestAlarmSeverity fixed 2021-01-25 18:01:17 +02:00
Igor Kulikov
072d0e49c3
Merge pull request #3990 from vvlladd28/bug/reset-password-required-email 
UI: Fixed email validation in form reset password
 2021-01-25 17:15:31 +02:00
Igor Kulikov
a67ea023d1
Merge pull request #3989 from YevhenBondarenko/improvements 
reset password improvements
 2021-01-25 17:15:02 +02:00
Vladyslav_Prykhodko
fdfd090b0b UI: Fixed email validation in form reset password 2021-01-25 17:07:14 +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
Igor Kulikov
d9f1872c8c Device wizard: Rollback(delete) device when failed to save device credentials. 2021-01-25 13:01:13 +02:00
Igor Kulikov
4e3a7ed897 Add overwriteActivityTime checkbox to device wizard. Update rule node ui. 2021-01-22 18:34:16 +02:00
Andrii Shvaika
90334db157 Refactoring of HTTP and MQTT client credentials 2021-01-22 17:06:53 +02:00
Andrii Shvaika
e97c742828 Merge branch 'feature/rest_api_node_ssl' of https://github.com/vkukhtyn/thingsboard 2021-01-22 16:11:43 +02:00
Andrii Shvaika
beff831d5d git push origin masterMerge branch 'zbeacon-fix/lastActivityTime' 2021-01-22 16:07:17 +02:00
Andrii Shvaika
d06ce5555c Simplified implementation of the overwrite activity time flag 2021-01-22 16:06:48 +02:00
Andrii Shvaika
5a5f29610f Merge branch 'fix/lastActivityTime' of https://github.com/zbeacon/thingsboard into zbeacon-fix/lastActivityTime 2021-01-22 15:24:12 +02:00
Igor Kulikov
ddb01aac17 Minor fixes 2021-01-22 12:30:40 +02:00
zbeacon
2d1f9b6158 Moved code to existing processing 2021-01-22 11:53:00 +02:00
Igor Kulikov
45192fc2f0
Merge pull request #3974 from lsyer/master 
Update some translations: locale.constant-zh_CN.json
 2021-01-21 18:38:14 +02:00
Igor Kulikov
1db24fbd52
Merge pull request #3970 from YevhenBondarenko/fix-device-state 
process ALARM_ACK msg in device state
 2021-01-21 18:36:59 +02:00
Igor Kulikov
9346b7fdee
Merge pull request #3972 from vvlladd28/improvement/trip-animation/change-speed 
UI: Fixed bug trip animation widget after change speed or change time to the time slider
 2021-01-21 18:36:12 +02:00
Igor Kulikov
9b8cf75c1a UI: Refactor dashboard page. Add ability to open dashboard state in separate dialog. 2021-01-21 18:03:36 +02:00
lsyer
03b5ca3571 Update some translations: locale.constant-zh_CN.json 2021-01-21 11:05:27 +08:00
Vladyslav_Prykhodko
758ce9f03e UI: Fixed bug trip animation widget after change speed or change time to the time slider 2021-01-20 19:19:47 +02:00
zbeacon
c24db73a37 Refactoring 2021-01-20 12:41:35 +02:00
zbeacon
5338d8e094 Refactoring 2021-01-20 11:44:27 +02:00