Merge branch 'master' into ent-makeover

This commit is contained in:
Rob H
2014-05-09 15:58:17 +10:00
44 changed files with 196 additions and 1870 deletions

View File

@@ -1,14 +0,0 @@
describe "SidebarCtrl", ->
ctrl = null
scope = null
location = null
beforeEach ->
module("Darkswarm")
location =
path: ->
"/login"
inject ($controller, $rootScope) ->
scope = $rootScope
ctrl = $controller 'SidebarCtrl', {$scope: scope, $location: location}
scope.$apply()