3766 Commits

Author SHA1 Message Date
Volodymyr Babak
ba14bc11e7 Merge branch 'develop/2.6-edge' of github.com:volodymyr-babak/thingsboard into develop/2.6-edge 2020-12-10 18:51:41 +02:00
Volodymyr Babak
3a46cbe5d8 Refactored edge event process. Code review fixes 2020-12-10 18:51:26 +02:00
VoBa
d0bff3d6eb
Merge pull request #61 from deaflynx/develop/2.6-edge
Develop/2.6 edge UI updates
2020-12-10 17:57:56 +02:00
Volodymyr Babak
57adec670b Formatting 2020-12-10 17:26:20 +02:00
Volodymyr Babak
193cccf123 Refactored Edge session message poll mechanism. Removed tech dept - Integer.MAX_INTEGER. Code refactoring 2020-12-10 16:18:12 +02:00
Artem Babak
77e73516e6 Edge's dashboards - fix for card buttons 2020-12-09 17:46:23 +02:00
Artem Babak
850b338943 Edge's rule chains - fix for card buttons 2020-12-09 17:33:16 +02:00
deaflynx
2c360f5221 Added buttons to entities' cards for edge scope except Dashboards 2020-12-09 13:29:20 +02:00
deaflynx
a79b7678ee Added buttons to rule chain cards for edge/edges/tenant scopes 2020-12-09 12:58:17 +02:00
deaflynx
ffd50e0baf 'Root' rc changed into 'Default root' 2020-12-09 10:29:26 +02:00
Artem Babak
6d354af815 Added edge locale 2020-12-09 06:14:19 +02:00
Artem Babak
79567951b2 Updated edge breadcrumb 2020-12-08 15:20:16 +02:00
Artem Babak
8c05171dc3 Minor ruleChainType code refactor 2020-12-08 11:53:12 +02:00
Volodymyr Babak
36f6ad2a62 Merge branch 'develop/2.6-edge' of github.com:volodymyr-babak/thingsboard into develop/2.6-edge 2020-12-05 16:54:34 +02:00
Volodymyr Babak
79929c995b Merge remote-tracking branch 'upstream/develop/2.5.5' into develop/2.6-edge 2020-12-05 16:53:56 +02:00
Volodymyr Babak
74fe82a091 Fix license header 2020-12-03 16:32:19 +02:00
Volodymyr Babak
144891b393 Fixed RPC call edge test 2020-12-03 11:11:11 +02:00
Volodymyr Babak
075bc7a40c Merge remote-tracking branch 'upstream/develop/2.5.5' into develop/2.6-edge 2020-12-03 10:43:59 +02:00
Volodymyr Babak
80daf266c9 License fix 2020-12-03 10:16:58 +02:00
Volodymyr Babak
ed85d3de3e Refactored RPC request 2020-12-01 18:58:58 +02:00
Volodymyr Babak
e1a6c1c43c Added shutdown of executor on destroy 2020-11-27 17:42:56 +02:00
Volodymyr Babak
9d359a8047 Fixed inactivitiy timeout for gw sessions 2020-11-23 11:39:33 +02:00
Volodymyr Babak
3bdb7bb5ad SERVER_SCOPE by default, if not provided in metadata 2020-11-19 17:26:07 +02:00
Volodymyr Babak
5023d63e59 Merge branch 'develop/2.6-edge' of github.com:volodymyr-babak/thingsboard into develop/2.6-edge 2020-11-19 15:55:00 +02:00
Volodymyr Babak
fe53158b82 Merge remote-tracking branch 'upstream/develop/2.5.5' into develop/2.6-edge 2020-11-19 15:54:39 +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
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
YevhenBondarenko
eece6418c3 updated versions 2020-11-12 13:22:32 +02:00
VoBa
95476b6c0c
Merge pull request #59 from deaflynx/develop/2.6-edge
edgeEvents refactored
2020-11-11 17:10:51 +02:00
Artem Babak
7582d503fb edgeEvents refactoring 2020-11-11 15:52:14 +02:00
zbeacon
580c8aef51 Added handler for too long payload exception in MQTT transport 2020-11-11 11:23:50 +02:00
zbeacon
92ba5907b0 Added validation for deviceName/attribute key contains only spaces situation 2020-11-11 11:05:07 +02:00
Volodymyr Babak
c5e33e48f0 Set SERVER_SCOPE by default if not provided 2020-11-10 17:44:44 +02:00
Volodymyr Babak
905273ea3d Merge remote-tracking branch 'upstream/develop/2.5.5' into develop/2.6-edge 2020-11-10 16:10:48 +02:00
Artem Babak
9ee792cac3 Edge events fixed queueStartTs attribute 2020-11-05 09:31:05 +02:00
YevhenBondarenko
eeec6bac9f sqs producer improvements 2020-11-04 17:59:42 +02:00
YevhenBondarenko
938588c5bc sqs producer improvements 2020-11-04 17:59:42 +02:00
YevhenBondarenko
84ca08d36c added new line 2020-11-04 17:59:04 +02:00
YevhenBondarenko
91e13a69bc removed TB_QUEUE_KAFKA_JE_TOPIC_PROPERTIES from queue-kafka.env 2020-11-04 17:59:04 +02:00
Artem Babak
94437d84fb Merge remote-tracking branch 'origin/feature/edge' into feature/edge 2020-11-04 16:01:16 +02:00
Volodymyr Babak
efaca8e7f2 Code clean up 2020-10-28 19:33:42 +02:00
YevhenBondarenko
c2a2b8cc4f base url improvements 2020-10-28 12:13:28 +02:00
ShvaykaD
606ae2e534 fix typo 2020-10-27 18:21:50 +02:00
ShvaykaD
b78d9ca189 fix AlarmNodeTests 2020-10-27 18:21:50 +02:00
ShvaykaD
702a091329 fix/AlarmActionEvents 2020-10-27 18:21:50 +02:00
YevhenBondarenko
8bd617e3b5 created tests for rule chain metadata validator 2020-10-27 18:18:46 +02:00
YevhenBondarenko
44a700e89a rule chain circles validation improvements 2020-10-27 18:18:46 +02:00
YevhenBondarenko
174570610b added circles validation in BaseRuleChainService 2020-10-27 18:18:46 +02:00