5359 Commits

Author SHA1 Message Date
YevhenBondarenko
3c5bce7d20 Updated thermostat demo 2020-11-16 18:58:41 +02:00
YevhenBondarenko
aa61db22f2 added validations for DeviceProfileAlarm type 2020-11-16 18:49:18 +02:00
Andrii Shvaika
706fd01d76 Device Profile Proto Improvement 2020-11-16 17:18:24 +02:00
Igor Kulikov
566f24f429
Merge pull request #3733 from vvlladd28/improvement/device-profile/alarm-type/validation
UI: Added unique alarm type validation in alarm rule
2020-11-16 17:17:14 +02:00
Vladyslav_Prykhodko
7dc793e777 UI: Change translate 2020-11-16 17:12:27 +02:00
ShvaykaD
13a731ecb3 fix MqttTopicFilterFactory toFilter 2020-11-16 16:56:59 +02:00
ShvaykaD
7482d73a9b added AlwaysTrueTopicFilter 2020-11-16 16:56:59 +02:00
ShvaykaD
fde0e7824d change regex for # filter 2020-11-16 16:56:59 +02:00
ShvaykaD
9c14088cad added # filter topic handling 2020-11-16 16:56:59 +02:00
ShvaykaD
22c9103955 fix MqttTopicFilterFactory toFilter 2020-11-16 16:55:24 +02:00
ShvaykaD
3127678d17 added AlwaysTrueTopicFilter 2020-11-16 16:52:24 +02:00
Vladyslav_Prykhodko
abfb6893ba UI: Added unique alarm type validation in alarm rule 2020-11-16 16:48:10 +02:00
Andrii Shvaika
bb833ee098 Merge branch 'feature/device-profile-telemetry-proto-schema' of https://github.com/ShvaykaD/thingsboard 2020-11-16 15:16:55 +02:00
ShvaykaD
4fc7668a72 added default mqtt proto schemas 2020-11-16 14:12:49 +02:00
YevhenBondarenko
076f548358 refactored AlarmState 2020-11-16 13:07:58 +02:00
YevhenBondarenko
150b1bb809 AlarmState improvements (used createDetails for update or clear alarm). 2020-11-16 13:07:58 +02:00
ShvaykaD
699b2ef9be changed schema for testPushMqttTelemetryWithTs: set Values as inner object 2020-11-16 12:22:13 +02:00
Andrii Shvaika
10e6b9a458 Merge branch 'master' of github.com:thingsboard/thingsboard 2020-11-16 10:52:31 +02:00
Andrii Shvaika
a87a3d684e Improvement to handling of subscription updates 2020-11-16 10:52:18 +02:00
Igor Kulikov
c1737d0de3
Merge pull request #3722 from vvlladd28/bug/map/fit-bound
Fixed fit bounds marker is disabled covered all markers
2020-11-16 09:34:05 +02:00
Vladyslav_Prykhodko
34c8294e9d Fixed fit bounds marker is disabled covered all markers 2020-11-13 20:28:55 +02:00
ShvaykaD
42152f4a92 Merge branch 'master' of github.com:thingsboard/thingsboard 2020-11-13 16:34:33 +02:00
ShvaykaD
861fd65109 merge with master 2020-11-13 16:33:41 +02:00
Igor Kulikov
f0ed4329d3
Merge pull request #3721 from YevhenBondarenko/feature/tenant-profile
DefaultTenantProfileConfiguration improvements
2020-11-13 16:33:25 +02:00
YevhenBondarenko
4b4e2b702e DefaultTenantProfileConfiguration improvements 2020-11-13 16:21:14 +02:00
ShvaykaD
4a18781304 added TransportPayloadTypeConfiguration, fix tests, ui 2020-11-13 16:19:40 +02:00
Igor Kulikov
35a2107944
Merge pull request #3717 from YevhenBondarenko/feature/tenant-profile
[WIP]added maxCustomers, maxUsers, maxDashboards, maxRuleChains for Tenant…
2020-11-13 15:52:21 +02:00
YevhenBondarenko
2df72b4ec1 license format 2020-11-13 15:51:28 +02:00
YevhenBondarenko
a1d9ce6e45 created validateNumberOfEntitiesPerTenant 2020-11-13 15:32:49 +02:00
Igor Kulikov
573b9a345a
Merge pull request #3719 from ChantsovaEkaterina/improvement/service-completion-get-entity-timeseries
[3.2] Add getEntityTimeseries method to Service Completion
2020-11-13 15:25:32 +02:00
Igor Kulikov
637f816f7f
Merge pull request #3718 from YevhenBondarenko/master
Merge with develop/2.5.5
2020-11-13 15:25:05 +02:00
Andrii Shvaika
9f2bae9815 Improvements to API usage statistics collection 2020-11-13 13:29:23 +02:00
YevhenBondarenko
4eccf7f916 fix validateCreate from UserServiceImpl 2020-11-13 13:00:33 +02:00
YevhenBondarenko
0f662a679c Merge with develop/2.5.5 2020-11-13 12:02:13 +02:00
Chantsova Ekaterina
8f43eb86cd Add getEntityTimeseries method to Service Completion 2020-11-13 12:02:09 +02:00
YevhenBondarenko
ba1b000adb added maxCustomers, maxUsers, maxDashboards, maxRuleChains for TenantProfile 2020-11-13 11:55:31 +02:00
Igor Kulikov
75e5ccd447
Merge pull request #3716 from YevhenBondarenko/develop/2.5.5-vulnerabilities
[WIP]updated jedis version
2020-11-13 11:05:15 +02:00
YevhenBondarenko
57c14f1c93 changed spring version to 5.2.10.RELEASE 2020-11-13 10:17:46 +02:00
Andrii Shvaika
627c0577b0 Fix for ws reconnect issues 2020-11-12 19:44:49 +02:00
Andrii Shvaika
dc25e0dd3c Merge branch 'master' of github.com:thingsboard/thingsboard 2020-11-12 19:32:51 +02:00
Andrii Shvaika
cb41548b22 Add cleanup of clear alarm state on non matching condition 2020-11-12 19:32:45 +02:00
YevhenBondarenko
5850fa0cd9 updated jedis version 2020-11-12 18:58:07 +02:00
Igor Kulikov
4d4b988357
Merge pull request #3712 from YevhenBondarenko/develop/2.5.5-vulnerabilities
updated versions
2020-11-12 17:36:52 +02:00
Igor Kulikov
cb6892bc3e
Merge pull request #3711 from YevhenBondarenko/feature/alarm-state
AlarmState improvements
2020-11-12 17:34:44 +02:00
YevhenBondarenko
72a0126e23 AlarmState improvements 2020-11-12 17:07:07 +02:00
YevhenBondarenko
eece6418c3 updated versions 2020-11-12 13:22:32 +02:00
Igor Kulikov
7a13083851 BaseUrl check 2020-11-12 13:06:55 +02:00
Igor Kulikov
3162000889 Use baseUrl from system security service for OAuth 2020-11-12 11:37:54 +02:00
Igor Kulikov
590f3a0a80 Improve tenant creation from OAuth mapper 2020-11-12 10:24:08 +02:00
Igor Kulikov
390c357a77
Merge pull request #3707 from vvlladd28/improvement/profile/validator-topic
Add validator to unique MQTT device topic filter
2020-11-12 10:17:49 +02:00