5533 Commits

Author SHA1 Message Date
Viacheslav Kukhtyn
c03356e944 Merge branch 'master' into feature/log-telemetry-updated 2020-11-13 13:10:09 +02:00
YevhenBondarenko
4eccf7f916 fix validateCreate from UserServiceImpl 2020-11-13 13:00:33 +02:00
Viacheslav Kukhtyn
6ccb9d6036 Send array of KV entry grouped by timestamp to rule chain 2020-11-13 12:47:07 +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
Viacheslav Kukhtyn
f4bec22a61 Send to rule chain a timestamp when KV entries were updated 2020-11-12 19:15:40 +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
Andrii Shvaika
0dd9450b92 Fix for ApiStats security checks 2020-11-12 09:55:18 +02:00
Vladyslav_Prykhodko
671dfa7668 Add validator to unique MQTT device topic filter 2020-11-11 19:53:45 +02:00
ShvaykaD
4ee38a15d3 change regex for # filter 2020-11-11 19:31:21 +02:00
Igor Kulikov
df21ce8043 Fix validate credentials method 2020-11-11 19:02:01 +02:00
ShvaykaD
4725ad1451 fix typo 2020-11-11 18:29:16 +02:00
ShvaykaD
18a57d638d merge with master 2020-11-11 18:25:29 +02:00
Igor Kulikov
7c70eaa71d
Merge pull request #3705 from kalutkaz/MapMarker2
Fix marker move and marker point
2020-11-11 18:20:44 +02:00
Vladyslav_Prykhodko
724b6c5247 Refactoring 2020-11-11 18:14:56 +02:00
Kalutka Zhenya
60de89015a Refactoring 2020-11-11 18:14:24 +02:00
Kalutka Zhenya
a06c835497 Fix marker move and marker point 2020-11-11 18:14:14 +02:00
Kalutka Zhenya
2ccaa095cb Fix marker move 2020-11-11 18:14:04 +02:00
Andrii Shvaika
81585f04c8 Improvements 2020-11-11 18:02:10 +02:00
ShvaykaD
46e2ebe3a4 moved DeviceController proto schema check to DeviceProfileServiceImpl 2020-11-11 17:58:45 +02:00
ShvaykaD
a52fee3aa1 fix typos, remove unused imports 2020-11-11 16:59:24 +02:00
ShvaykaD
53de94410c clean up code 2020-11-11 16:48:28 +02:00
Andrii Shvaika
3d8b2cbbbf Merge branch 'master' of github.com:thingsboard/thingsboard 2020-11-11 16:41:19 +02:00
Andrii Shvaika
b02cbec0ee Minor logging improvements 2020-11-11 16:41:07 +02:00
Igor Kulikov
7fb442b9c3
Merge pull request #3703 from YevhenBondarenko/feature/api-usage-state
apiUsageState improvements
2020-11-11 16:33:35 +02:00
YevhenBondarenko
5de0059eb7 apiUsageState improvements 2020-11-11 16:25:25 +02:00
ShvaykaD
4babb07fd6 added # filter topic handling 2020-11-11 16:22:57 +02:00
Igor Kulikov
9db0e5aac4
Merge pull request #3702 from kalutkaz/widgetMargin
Fix widget margin
2020-11-11 16:21:35 +02:00
ShvaykaD
78c06be350 change protobuf-dynamic dependency 2020-11-11 16:00:04 +02:00
Kalutka Zhenya
91aa144ae5 Fix widget margin 2020-11-11 15:13:59 +02:00
Dmitriymush
2e624994da additional fix to component html 2020-11-11 14:38:24 +02:00
Igor Kulikov
a5e8cab5e0
Merge pull request #3700 from YevhenBondarenko/feature/api-usage-state-tmp
api usage state alias improvements
2020-11-11 14:03:40 +02:00
Dmitriymush
33b1cee2d0 bug-fix: trip animation for multiple devices 2020-11-11 13:27:18 +02:00
Dmitriymush
643563ec6a bug-fix: trip animation for multiple devices 2020-11-11 13:24:10 +02:00
YevhenBondarenko
b76ec50123 refactored 2020-11-11 13:03:22 +02:00
YevhenBondarenko
ebf10b55c8 api usage state alias improvements 2020-11-11 12:59:22 +02:00