mhop/ha-bridge
1
0
Fork 0
mirror of https://github.com/bwssytems/ha-bridge.git synced 2025-12-18 16:17:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refs/heads/pr/785' into FeaturesfFor5.0

Browse Source 
# Conflicts:
#	src/main/resources/public/scripts/app.js
This commit is contained in:
Admin
2017-11-14 13:13:22 -06:00
parent 548da932ad 31fe05fe2b
commit feee22dbac
35 changed files with 1518 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/public/views/configuration.html
View File

@@ -8,6 +8,10 @@
href="#!/veradevices">Vera Devices</a></li>
<li ng-if="bridge.showVera" role="presentation"><a
href="#!/verascenes">Vera Scenes</a></li>
<li ng-if="bridge.showFibaro" role="presentation"><a
href="#!/fibarodevices">Fibaro Devices</a></li>
<li ng-if="bridge.showFibaro" role="presentation"><a
href="#!/fibaroscenes">Fibaro Scenes</a></li>
<li ng-if="bridge.showHarmony" role="presentation"><a
href="#!/harmonyactivities">Harmony Activities</a></li>
<li ng-if="bridge.showHarmony" role="presentation"><a