Igor Kulikov
969c03637d
Merge branch 'master' into develop/3.0
2020-04-29 09:50:37 +03:00
Igor Kulikov
fa5c051476
Fix demo data loader: set tenantId for termostatAlarms asset
2020-04-29 09:50:22 +03:00
Andrii Shvaika
79b4411c69
Synchronization of device connect processing in gateways
2020-04-29 09:45:24 +03:00
YevhenBondarenko
ef35ee8c30
added queue settings to js-executor
2020-04-29 09:41:21 +03:00
Igor Kulikov
bd8dc95b27
Merge with master
2020-04-29 09:40:51 +03:00
Vladyslav
8a246cceab
Clear code ( #2691 )
2020-04-29 09:34:33 +03:00
Andrii Shvaika
d78193f2e5
Test Thermostat devices
2020-04-28 21:19:53 +03:00
Igor Kulikov
2caff258bd
Merge with master
2020-04-28 20:07:14 +03:00
Vladyslav
6e50e97767
Add termostat dashboard reletion ( #2687 )
...
* Add termostat dashboard reletion
* Add create reletion
2020-04-28 20:05:54 +03:00
Vladyslav
01ba25d8e7
Update default dashboard thermostats ( #2689 )
2020-04-28 20:03:53 +03:00
Igor Kulikov
08a2d0cd79
Merge branch 'ArtemHalushko-map/3.0' into develop/3.0
2020-04-28 20:02:55 +03:00
Igor Kulikov
413ad261e2
Fix conflicts
2020-04-28 20:02:33 +03:00
Artem Halushko
8bc06df8d4
input bundles updates
2020-04-28 19:56:16 +03:00
Artem Halushko
73b03394f0
tile layers and locations set fixes
2020-04-28 19:27:38 +03:00
Igor Kulikov
a4cd853a20
Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0
2020-04-28 18:48:44 +03:00
Igor Kulikov
e5da36a69c
Merge branch 'develop/3.0' of github.com:thingsboard/thingsboard into develop/3.0
2020-04-28 18:47:31 +03:00
Igor Kulikov
37c8cd157d
UI: Migrate gateway widgets and gateways demo dashboard to 3.0
2020-04-28 18:47:20 +03:00
Artem Halushko
1e0e1bd542
fix some ds problems
2020-04-28 18:20:48 +03:00
Andrii Shvaika
eb3cc332d1
Fix gateway/device last activity time checks
2020-04-28 18:19:30 +03:00
YevhenBondarenko
214a606066
revert thingsboard.yml
2020-04-28 17:07:25 +03:00
YevhenBondarenko
d264a5206c
revert RemoteJsInvokeService
2020-04-28 17:05:53 +03:00
YevhenBondarenko
6322da3d04
merge with master
2020-04-28 16:51:04 +03:00
YevhenBondarenko
0dc31fbdde
created awsSqs, pubSub, rabbitmq js-executors
2020-04-28 16:13:16 +03:00
Vladyslav
81f26b4b48
Update dashboard ( #2684 )
2020-04-28 16:09:04 +03:00
Artem Halushko
0ef4a40375
entity save fix#3
2020-04-28 15:21:36 +03:00
Artem Halushko
9479b4194f
entity save fix #2
2020-04-28 15:18:40 +03:00
Igor Kulikov
6a47f022ac
Add new widgetContext field currentUser
2020-04-28 14:58:21 +03:00
Igor Kulikov
a39fe0f313
Minor fixes
2020-04-28 14:44:48 +03:00
Igor Kulikov
45f3d5324e
Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0
2020-04-28 14:29:02 +03:00
bdrlamb
cb6e91277f
Fix MQTT inactivity disconnects
...
MQTT clients don't send PINGREQ messages if they've recently sent [UN]SUBSCRIBE/PUBLISH messages. The MQTT server last activity timestamp is currently only updated in response to PINGREQ messages. This causes the server to disconnect any clients that regularly send PUBLISH messages since they don't send PINGREQ.
This change adds reportActivity calls in response to PUBLISH, SUBSCRIBE and UNSUBSCRIBE in addition to PINGREQ.
2020-04-28 14:15:57 +03:00
Andrii Shvaika
6e82f4c8f0
Merge branch 'develop/2.5'
2020-04-28 14:09:36 +03:00
Andrii Shvaika
8abb718349
Merge with develop
2020-04-28 14:09:20 +03:00
Artem Halushko
c627e79947
small css fix
2020-04-28 13:48:55 +03:00
Artem Halushko
d56a3abaca
saveEntity && minor fixes
2020-04-28 13:31:47 +03:00
Artem Halushko
77ec391185
merge fixes
2020-04-28 12:13:05 +03:00
Artem Halushko
dd98d761df
Merge branch 'develop/3.0' of https://github.com/thingsboard/thingsboard into map/3.0
2020-04-28 12:07:46 +03:00
Vladyslav
a36de5d62c
Add gateway type and clear import ( #2677 )
2020-04-28 12:04:21 +03:00
Artem Halushko
2bd1a796e0
image map alias image support
2020-04-28 11:57:09 +03:00
Artem Halushko
0ce514b58c
wip on image-map fixes
2020-04-27 19:20:23 +03:00
Igor Kulikov
8cfe4ef44f
Merge branch 'develop/3.0' of github.com:thingsboard/thingsboard into develop/3.0
2020-04-27 18:37:36 +03:00
Igor Kulikov
2fc25ad33d
Remove redudant css import
2020-04-27 18:37:26 +03:00
Artem Halushko
4f8942b112
update map bundles
2020-04-27 16:10:46 +03:00
Artem Halushko
26e5f69b32
map fixes
2020-04-27 14:46:43 +03:00
Andrii Shvaika
2728c7cd29
Merge remote-tracking branch 'origin/master' into develop/3.0
2020-04-27 14:45:18 +03:00
Andrii Shvaika
86f21023fe
Improved PartitionService and fixed startup order in docker-compose.yml
2020-04-27 14:44:29 +03:00
YevhenBondarenko
ba140644c7
added Azure Service Bus queue settings
2020-04-27 11:16:53 +03:00
YevhenBondarenko
30e5af3627
added zookeeper configs to coap and http
2020-04-27 11:16:12 +03:00
YevhenBondarenko
5b8122e1b3
added <logger name="com.microsoft.azure.servicebus.primitives.CoreMessageReceiver" level="OFF" />
2020-04-27 11:16:12 +03:00
YevhenBondarenko
4aa225baba
added exclusions to azure dependency, and added logger level OFF to CoreMessageReceiver
2020-04-27 11:16:12 +03:00
Igor Kulikov
0289b0c1a2
UI: Get rid of 'multiple directives with 'exportAs' set to ngForm'
2020-04-27 10:39:18 +03:00
