From 0753ac473047b559ce8845690e78b76b0d1cd85c Mon Sep 17 00:00:00 2001
From: Gunther Brunner <gunta85@gmail.com>
Date: Mon, 18 Aug 2014 20:04:42 +0900
Subject: [PATCH] Updated bower dependencies. Added default hotkeys title.

---
 bower.json     | 18 +++++++++---------
 res/app/app.js | 23 ++++++++++++-----------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/bower.json b/bower.json
index b1932c85..4db98912 100644
--- a/bower.json
+++ b/bower.json
@@ -2,11 +2,11 @@
   "name": "stf",
   "version": "0.1.0",
   "dependencies": {
-    "angular": "~1.3.0-beta.17",
-    "angular-route": "~1.3.0-beta.17",
-    "angular-sanitize": "~1.3.0-beta.17",
-    "angular-animate": "~1.3.0-beta.17",
-    "angular-touch": "~1.3.0-beta.17",
+    "angular": "~1.3.0-beta.18",
+    "angular-route": "~1.3.0-beta.18",
+    "angular-sanitize": "~1.3.0-beta.18",
+    "angular-animate": "~1.3.0-beta.18",
+    "angular-touch": "~1.3.0-beta.18",
     "se7en-bootstrap-3": "~0.2.1",
     "lodash": "~2.4.1",
     "oboe": "~1.15.1",
@@ -23,7 +23,7 @@
     "angular-bootstrap": "~0.11.0",
     "angular-dialog-service": "~5.1.1",
     "ng-file-upload": "~1.6.5",
-    "angular-growl-v2": "JanStevens/angular-growl-2#~0.6.1",
+    "angular-growl-v2": "JanStevens/angular-growl-2#~0.7.0",
     "bluebird": "~2.1.3",
     "angular-tree-control": "~0.2.2",
     "angular-loading-bar": "~0.5.0",
@@ -37,15 +37,15 @@
     "quick-ng-repeat": "~0.0.1",
     "angular-vs-repeat": "~1.0.0-rc5",
     "checklist-model": "~0.1.3",
-    "angular-hotkeys": "chieffancypants/angular-hotkeys#~1.4.2",
+    "angular-hotkeys": "chieffancypants/angular-hotkeys#~1.4.3",
     "angular-borderlayout": "https://github.com/filearts/angular-borderlayout.git",
     "angular-ui-bootstrap": "~0.11.0",
     "angular-ladda": "~0.1.6"
   },
   "private": true,
   "resolutions": {
-    "angular": "~1.3.0-beta.17",
-    "angular-sanitize": "~1.3.0-beta.17",
+    "angular": "~1.3.0-beta.18",
+    "angular-sanitize": "~1.3.0-beta.18",
     "bootstrap": "~3.2.0"
   }
 }
diff --git a/res/app/app.js b/res/app/app.js
index 951986d0..ce026d2f 100644
--- a/res/app/app.js
+++ b/res/app/app.js
@@ -20,17 +20,18 @@ require.ensure([], function (require) {
     require('./menu').name,
     require('./settings').name,
     require('./help').name,
-    require('./../common/lang').name,
-    require('./../test/samples/vs-repeat').name
+    require('./../common/lang').name
   ])
-    .config(['$routeProvider', '$locationProvider',
-      function ($routeProvider, $locationProvider) {
-        $locationProvider.hashPrefix('!');
-        $routeProvider
-          .otherwise({
-            redirectTo: '/devices'
-          })
-      }
-    ])
+    .config(function ($routeProvider, $locationProvider) {
+      $locationProvider.hashPrefix('!');
+      $routeProvider
+        .otherwise({
+          redirectTo: '/devices'
+        })
+    }
+  )
+    .config(function (hotkeysProvider) {
+      hotkeysProvider.templateTitle = 'Keyboard Shortcuts:'
+    })
 
 })