Merge pull request #29 from vrockai/master

Added alerts dep - d3 plugin to scripts
hawkular · Feb 25, 2015 · 50515ce · 50515ce
2 parents 9d524bf + 5ec859a
commit 50515ce
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/ui/console/src/main/scripts/bower.json b/ui/console/src/main/scripts/bower.json
@@ -16,7 +16,7 @@
     "hawtio-core-navigation": "2.0.17",
     "hawtio-utilities": "2.0.16",
     "hawtio-template-cache": "2.0.1",
-    "hawkular-ui-components": "https://github.com/hawkular/hawkular-ui-components.git"
+    "hawkular-ui-components": "hawkular/hawkular-ui-components#master"
   },
   "devDependencies": {
     "bootstrap": "3.3.2",

diff --git a/ui/console/src/main/webapp/index.html b/ui/console/src/main/webapp/index.html
@@ -22,6 +22,11 @@
     <!-- bower:js -->
     <!-- endbower -->
 
+    <!-- Remove this line once the eventDrops package is fixed
+         https://github.com/marmelab/EventDrops/issues/21#issuecomment-75988799
+    -->
+    <script src="libs/event-drops/src/eventDrops.js"></script>
+
     <script src="libs/bootstrap/dist/js/bootstrap.js"></script>
     <script src="libs/patternfly/dist/js/patternfly.js"></script>