diff --git a/bower.json b/bower.json index eb93a754..7eb2d51f 100755 --- a/bower.json +++ b/bower.json @@ -30,5 +30,8 @@ "angular-permission": "~0.3.1", "angular-input-stars": "*", "file-saver.js": "~1.20150507.2" + }, + "resolutions": { + "angular": "~1.3.17" } } diff --git a/karma.conf.js b/karma.conf.js index 50e408dd..dd6b2be1 100755 --- a/karma.conf.js +++ b/karma.conf.js @@ -3,10 +3,7 @@ /** * Module dependencies. */ -var applicationConfiguration = require('./config/config'), - bowerFiles = require('main-bower-files'); - -var bowerDep = bowerFiles('**/**.js'); +var applicationConfiguration = require('./config/config'); // Karma configuration module.exports = function(config) { diff --git a/public/humans.txt b/public/humans.txt index 5b037cf2..08d7ac69 100755 --- a/public/humans.txt +++ b/public/humans.txt @@ -3,13 +3,14 @@ # TEAM - -- -- + David Baldwynn -- Developer -- @davidbaldwynn # THANKS - + Grace Lam + # TECHNOLOGY COLOPHON - HTML5, CSS3 - jQuery, Modernizr + HTML5, CSS3, AngularJS + jQuery, Modernizr, ExpressJS