1103 Commits

Author SHA1 Message Date
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
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
Artem Babak
e23d2c7465 Edge import finished 2020-12-17 05:40:42 +02:00
deaflynx
6a56607058 Edge hierarchy widget starting implementation 2020-12-16 14:32:50 +02:00
deaflynx
9d4372dc0f Import edge implementation 2020-12-16 14:18:27 +02:00
Artem Babak
65b87cc833 Entities hierarchy edge prototype 2020-12-15 21:39:19 +02:00
VoBa
004d8a7de9
Merge pull request #64 from deaflynx/develop/2.6-edge
Develop/2.6 edge UI updates
2020-12-15 16:22:25 +02:00
Artem Babak
05771cd900 getEdge, getTenantEdges, getCustomerEdges refactored 2020-12-15 15:29:10 +02:00
Artem Babak
00caacf6c2 Delete UI filtering for getEdgeRuleChains 2020-12-15 13:29:17 +02:00
Artem Babak
1463de7c01 Delete UI filtering for getEdgeDashboards 2020-12-15 13:25:27 +02:00
Artem Babak
cb0201e87a Delete UI filtering for getEdge assets/entity-views/devices 2020-12-15 13:22:24 +02:00
VoBa
337fcc2afd
Merge pull request #63 from deaflynx/develop/2.6-edge
Develop/2.6 edge fixed saveEdge, importEdge
2020-12-15 11:39:19 +02:00
Artem Babak
720c89f109 Fix edge import locale 2020-12-15 09:53:16 +02:00
Artem Babak
769428c42e Fix edge import 2020-12-15 09:51:18 +02:00
Volodymyr Babak
83d56fae4c Translate 2020-12-14 11:21:42 +02:00
Volodymyr Babak
b48d43f4dd Added support for EDGE entity 2020-12-13 19:28:05 +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
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
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
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
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
b9cc400a15 base url improvements 2020-10-26 12:55:27 +02:00
YevhenBondarenko
d6c2eefe05 base url improvements 2020-10-26 12:55:27 +02:00
Artem Babak
2836de1bb1 server.js 2020-10-23 05:11:56 +03:00
Artem Babak
032655c839 LoadEdgeInfo() removed 1 usage 2020-10-23 05:09:21 +03:00
Artem Babak
99bd0ece91 fixed isPublic issue with assets and edges 2020-10-22 16:06:20 +03:00
Artem Babak
a0c7e68ee3 Modified edge-fieldset.tpl.html 2020-10-22 15:50:19 +03:00
Artem Babak
7b5060fc81 Removed 2 scope.loadEdgeInfo() lines 2020-10-22 15:32:44 +03:00
Artem Babak
1aa834cca8 Merge remote-tracking branch 'origin/feature/edge' into feature/edge 2020-10-22 15:05:32 +03:00
Volodymyr Babak
cffb9dd52e Icon update. Uppercase for menu 2020-10-22 13:36:39 +03:00
Volodymyr Babak
fd5367b51f Code review changes 2020-10-22 13:10:18 +03:00
Artem Babak
0ef1711b28 Replaced copy edge id and key buttons 2020-10-20 16:08:59 +03:00
Volodymyr Babak
63e29c24cf Revert file 2020-10-20 13:12:49 +03:00
Volodymyr Babak
7af1c86e17 Merge branch 'develop/2.5.5' into feature/edge 2020-10-18 15:33:45 +03:00
Volodymyr Babak
160fd94666 Moved service to base class. Change sync button icon 2020-10-09 15:47:59 +03:00
Kalutka Zhenya
a50368a1ae Refactoring 2020-10-06 18:31:40 +03:00
Kalutka Zhenya
c783a1c604 Fix knob control on 2.5.5 2020-10-06 18:31:40 +03:00