6793 Commits

Author SHA1 Message Date
ShvaykaD
6bfc1b8930 Merge branch 'master' of github.com:thingsboard/thingsboard 2020-12-21 17:23:55 +02:00
Viacheslav Kukhtyn
8e279bbbd7 Methods findInfoByTo() and findInfoByQuery() should return EntityRelationInfo but no EntityRelation 2020-12-21 17:07:44 +02:00
Andrii Shvaika
2ea3b18738 partitions cache improvements 2020-12-21 17:06:10 +02:00
ShvaykaD
0a2255d055 move SettableFuture.create() to the else block 2020-12-21 17:06:10 +02:00
ShvaykaD
724df48f79 added default value for .yml parameter & rename params names 2020-12-21 17:06:10 +02:00
ShvaykaD
aede1af6f9 improvements after review 2020-12-21 17:06:10 +02:00
ShvaykaD
0de5868bc5 added Caffeine cache for Cassandra ts partitions saving 2020-12-21 17:06:10 +02:00
Andrii Shvaika
be84a0fc20 Version set to 2.5.6-SNAPSHOT 2020-12-21 16:42:45 +02:00
ShvaykaD
12667d89ea Merge branch 'master' of github.com:thingsboard/thingsboard 2020-12-21 15:19:26 +02:00
VoBa
0ddfdee12a
Merge pull request #70 from deaflynx/develop/3.3-edge
Fix fetch rule nodes for EDGE/CORE rule chains scope
2020-12-21 13:33:53 +02:00
Artem Babak
223d0423bb Fetch edge/core rule nodes cleanup 2020-12-21 13:30:43 +02:00
Artem Babak
4b5ade990e Added Manage edge for customers and filter by type 2020-12-21 13:28:53 +02:00
Artem Babak
2ba04f868c Added edge ruleNode scope 2020-12-21 11:46:02 +02:00
Igor Kulikov
8fe13a2c7a
Merge pull request #3870 from vvlladd28/fixed/translate/sl
UI: Fixed Slovenian locale after merge
2020-12-21 09:57:02 +02:00
Volodymyr Babak
f17acd5a5a Merge branch 'feature/hide-edge-on-ui' into develop/3.3-edge 2020-12-20 19:47:54 +02:00
Volodymyr Babak
b1f4e43e8f Introduced SysParamsState. Refactored hide menu approach 2020-12-20 19:47:26 +02:00
Vladyslav_Prykhodko
ba3e779cc0 UI: Fixed Slovenian locale after merge 2020-12-19 14:40:36 +02:00
Volodymyr Babak
3b909f6e47 Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge 2020-12-18 19:22:11 +02:00
Volodymyr Babak
79089ad642 Do not fetch entity by ID. Cache should be introduced 2020-12-18 19:14:12 +02:00
Volodymyr Babak
119be4c4bb Improved DELETE action - push notification only to related edges 2020-12-18 19:12:01 +02:00
Volodymyr Babak
053d265430 Merge branch 'develop/3.3-edge' of github.com:volodymyr-babak/thingsboard into develop/3.3-edge 2020-12-18 18:08:42 +02:00
Volodymyr Babak
96dfc0691b Added device profile rule node to default edge root. Fixed notification event 2020-12-18 18:08:29 +02:00
fdrobnic
c910597f62
Added Slovenian locale (#3855)
* Add files via upload

Added Slovenian locale

* Add files via upload

* Delete locale-sl_SI.json

* Added Slovenian locale

* Delete locale-sl_SI.json
2020-12-18 17:38:25 +02:00
Volodymyr Babak
9089163880 Hide edge menu if disabled 2020-12-18 16:29:12 +02:00
VoBa
c24cf59980
Merge pull request #68 from deaflynx/develop/3.3-edge
Added edge_name_unq_key in saveEdge
2020-12-18 15:03:48 +02:00
deaflynx
4f6ad3263f Added edge_name_unq_key in saveEdge 2020-12-18 14:58:34 +02:00
Volodymyr Babak
f8981638b1 Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge 2020-12-18 14:43:04 +02:00
Volodymyr Babak
6d716d1ca4 Fixed edges enabled test property 2020-12-18 14:42:34 +02:00
VoBa
77ad519a10
Merge pull request #67 from deaflynx/develop/3.3-edge
Develop/3.3 edge Fix rule chain type, customerIsPublic for edges. Added EdgeInfo
2020-12-18 14:40:44 +02:00
deaflynx
1ab1a8e085 Code cleaning 2020-12-18 14:39:55 +02:00
deaflynx
8ef786acbf Code cleaning 2020-12-18 14:39:03 +02:00
deaflynx
f9e2d128a2 Import refactor 2020-12-18 14:36:05 +02:00
Volodymyr Babak
005b802c17 Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge 2020-12-18 14:31:56 +02:00
deaflynx
ceadc391f3 Added EdgeInfo, fix for CustomerIsPublic 2020-12-18 14:15:39 +02:00
Volodymyr Babak
aabaada198 Added edges enabled endpoint. Refactored yml edges config 2020-12-18 13:25:42 +02:00
VoBa
966f149c08
Merge pull request #66 from deaflynx/develop/2.6-edge
Develop/2.6 edge fix import rule chains, added button, locale for edge
2020-12-18 12:01:48 +02:00
deaflynx
00a40e63ba Deleted edges hierarchy widget 2020-12-18 11:56:24 +02:00
deaflynx
b1011f43a5 Fix for import rule chains without type 2020-12-18 10:59:52 +02:00
deaflynx
4c2effd9be Fix import with rule chain type 2020-12-18 10:58:34 +02:00
deaflynx
785ac98355 Added Make edge public, locale for edge types 2020-12-18 10:28:34 +02:00
deaflynx
5b340c33f3 Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/2.6-edge 2020-12-18 08:27:50 +02:00
VoBa
a63d6af6ba
Merge pull request #65 from deaflynx/develop/2.6-edge
Develop/2.6 edge Import edge
2020-12-18 08:24:05 +02:00
Volodymyr Babak
a52b88802b Use default rule chain and queue from device profile in edge session 2020-12-17 18:57:26 +02:00
Volodymyr Babak
b63087d53f Moved edge rule chains and edges to edge management page 2020-12-17 16:00:23 +02:00
Vladyslav_Prykhodko
3aa97eec06 UI: Improvement autocomplete data keys in datasource widget 2020-12-17 13:32:03 +02:00
Volodymyr Babak
ead9fd9e5d Code review fixes 2020-12-17 10:54:07 +02:00
Artem Babak
e23d2c7465 Edge import finished 2020-12-17 05:40:42 +02:00
Volodymyr Babak
af8562c3a0 Added support for device profile entity on edge 2020-12-16 19:35:22 +02:00
Dmitriymush
65027b9c17 Additions to fixes after review 2020-12-16 18:42:55 +02:00
Dmitriymush
96ff9ddedd Fixes after review 2020-12-16 17:36:08 +02:00