From 28a9225757ea396ebd7ff20315d2934648abf0f8 Mon Sep 17 00:00:00 2001
From: David Baldwynn <david.baldwin@alumni.ubc.ca>
Date: Thu, 21 Apr 2016 16:53:03 -0400
Subject: [PATCH] added angular busy back to bower

---
 bower.json       | 5 +++--
 public/config.js | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/bower.json b/bower.json
index 4c151fda..0d795f86 100755
--- a/bower.json
+++ b/bower.json
@@ -33,10 +33,11 @@
     "angular-scroll": "^1.0.0",
     "ui-select": "angular-ui-select#^0.16.1",
     "angular-sanitize": "^1.5.3",
-    "v-button": "^1.1.1"
+    "v-button": "^1.1.1",
+    "angular-busy": "^4.1.3"
   },
   "resolutions": {
     "angular-bootstrap": "^0.14.0",
-    "angular": "1.4.10"
+    "angular": "1.4.x"
   }
 }
diff --git a/public/config.js b/public/config.js
index dcbdd040..79d9fd18 100755
--- a/public/config.js
+++ b/public/config.js
@@ -4,7 +4,7 @@
 var ApplicationConfiguration = (function() {
 	// Init module configuration options
 	var applicationModuleName = 'NodeForm';
-	var applicationModuleVendorDependencies = ['duScroll', 'ngSanitize', 'vButton', 'ngResource', 'NodeForm.templates', 'ui.router', 'ui.bootstrap', 'ui.utils', 'ngRaven'];
+	var applicationModuleVendorDependencies = ['duScroll', 'cgBusy', 'ngSanitize', 'vButton', 'ngResource', 'NodeForm.templates', 'ui.router', 'ui.bootstrap', 'ui.utils', 'ngRaven'];
 
 	// Add a new vertical module
 	var registerModule = function(moduleName, dependencies) {