Merging in latest openmctweb master

open74 Had to resolve conflicts
2015-08-20 10:36:41 -07:00
parent c4dd4f5c45 9c578c53db
commit b1e1e85bbd
42 changed files with 1441 additions and 605 deletions
--- a/platform/commonUI/general/res/templates/tree-node.html
+++ b/platform/commonUI/general/res/templates/tree-node.html
@@ -45,10 +45,10 @@
            </span>
        </span>
        <span
-			class="tree-item-subtree"
-			ng-show="toggle.isActive()"
-			ng-if="model.composition !== undefined"
-			>
+            class="tree-item-subtree"
+            ng-show="toggle.isActive()"
+            ng-if="model.composition !== undefined"
+            >

            <mct-representation key="'subtree'"
                                ng-model="ngModel"