5763 Commits

Author SHA1 Message Date
Volodymyr Babak
e32dfcfb31 Code review fixes 2020-12-15 08:49:44 +02:00
Volodymyr Babak
6bc247c0e1 Removed local files 2020-12-14 17:03:24 +02:00
Volodymyr Babak
32b608e10d Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge 2020-12-14 15:45:38 +02:00
Volodymyr Babak
b52d2aae17 Get rid of configuration field 2020-12-14 15:31:58 +02:00
Volodymyr Babak
a1d6cee789 Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge 2020-12-14 14:43:54 +02:00
Volodymyr Babak
846f5ba86b Merge remote-tracking branch 'deaflynx/develop/3.3-edge' into develop/3.3-edge 2020-12-14 12:55:07 +02:00
Volodymyr Babak
64694532db Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge 2020-12-14 12:48:49 +02:00
Volodymyr Babak
230a303156 Fixes incorrect customer user sync 2020-12-14 12:37:21 +02:00
Artem Babak
5a04ebfdad Minor code beautify 2020-12-14 11:39:37 +02:00
Artem Babak
4b08103857 Removed device's methods for edge 2020-12-14 11:35:42 +02:00
Volodymyr Babak
85036d0537 Refactored in sync with ce-3 2020-12-14 11:32:35 +02:00
Artem Babak
525ae47347 run config 2020-12-14 11:28:34 +02:00
Volodymyr Babak
83d56fae4c Translate 2020-12-14 11:21:42 +02:00
Artem Babak
36c992e19e Edge events locales updated 2020-12-14 09:56:11 +02:00
Volodymyr Babak
b48d43f4dd Added support for EDGE entity 2020-12-13 19:28:05 +02:00
Volodymyr Babak
0ce128725d License header fix 2020-12-12 20:03:24 +02:00
Volodymyr Babak
0c7a51242d Tech depts. Added support for Edge entity on push to edge node 2020-12-12 19:08:44 +02:00
Volodymyr Babak
69994adb18 Code review fixes 2020-12-11 18:41:18 +02:00
Artem Babak
ede460c0d5 Edges rule chains: fix for default rule chains icons 2020-12-11 16:20:12 +02:00
Artem Babak
a736701ab8 Edge root rule chains issue fix 2020-12-11 15:32:27 +02:00
Artem Babak
a6a0a65d25 Added route for edge dashboard 2020-12-11 11:31:05 +02:00
Artem Babak
fee5034e46 Edge dashboards cell action buttons 2020-12-11 11:04:19 +02:00
Artem Babak
b285b2b00c Fix for edge rulechains 2020-12-11 10:58:36 +02:00
Artem Babak
c19cf2372e Added findEntityViewByTenantIdAndEdgeIdAndType and findDevicesByTenantIdAndEdgeIdAndDeviceProfileId 2020-12-11 08:48:18 +02:00
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
Artem Babak
3ffa7e3592 Added button unassignFromEdge for entities. Added findAssetsByTenantIdAndEdgeIdAndType() 2020-12-10 16:59:15 +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
04e50696f6 Fix for setRootRuleChains button - for edge scope 2020-12-10 12:36:52 +02:00
Artem Babak
3e67a9ad0e Fix for setDefaultRoot button - only for edges scope 2020-12-10 12:16:57 +02:00
Artem Babak
4d4e4d02b5 Edge rule chains table columns updated 2020-12-10 09:56:00 +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
Artem Babak
f17070ac4f Public edges uncommented 2020-12-08 11:03:49 +02:00
Artem Babak
cf2da5c9b1 Fixed filter edge by type. Added edge to entity-filer/subtype 2020-12-08 10:34:34 +02:00
Artem Babak
91c4affb07 Minor edge changes 2020-12-08 09:23:55 +02:00
Volodymyr Babak
c48315b54c Temporary disabled attributes request test 2020-12-07 13:46:37 +02:00
Volodymyr Babak
2a5097b371 Device processor test fixes 2020-12-07 13:05:28 +02:00
Volodymyr Babak
9f79f83d83 Merge remote-tracking branch 'origin/develop/2.6-edge' into develop/3.3-edge 2020-12-07 11:36:20 +02:00
Volodymyr Babak
d79d00aa87 Merge remote-tracking branch 'upstream/master' into develop/3.3-edge 2020-12-07 10:46:15 +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