diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index af5030f..45b7853 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,8 +1,8 @@ ### Description -### Expected behaviour +### Expected behavior -### Actual behaviour +### Actual behavior ### Environment Details diff --git a/app/scripts/services/auth.js b/app/scripts/services/auth.js index 96f0c7b..3f9014e 100644 --- a/app/scripts/services/auth.js +++ b/app/scripts/services/auth.js @@ -254,12 +254,18 @@ angular.module('FlyveMDM') break; default: var errorMsg = rejection.data[1]; - var docMsg = errorMsg.toString().indexOf(';'); - if (docMsg !== -1) { - errorMsg = errorMsg.split(';'); - Notifications.error(errorMsg[0]); + if (Array.isArray(errorMsg)) { + errorMsg.forEach(function (errorById) { + Notifications.error(errorById.message); + }); } else { - Notifications.error(errorMsg); + var docMsg = errorMsg.toString().indexOf(';'); + if (docMsg !== -1) { + errorMsg = errorMsg.split(';'); + Notifications.error(errorMsg[0]); + } else { + Notifications.error(errorMsg); + } } } } diff --git a/bower.json b/bower.json index 9dcfec0..ba10c8d 100644 --- a/bower.json +++ b/bower.json @@ -53,14 +53,14 @@ }, "private": true, "dependencies": { - "angular": "^1.6.0", - "angular-animate": "^1.6.0", - "angular-cookies": "^1.6.0", - "angular-resource": "^1.6.0", - "angular-route": "^1.6.0", - "angular-sanitize": "^1.6.0", + "angular": "^1.6.1", + "angular-animate": "^1.6.1", + "angular-cookies": "^1.6.1", + "angular-resource": "^1.6.1", + "angular-route": "^1.6.1", + "angular-sanitize": "^1.6.1", "angular-material": "^1.1.1", - "angular-ui-router": "^0.3.2", + "angular-ui-router": "^0.4.2", "angular-smart-table": "^2.1.8", "components-font-awesome": "^4.7.0", "ng-file-upload": "^12.2.13", @@ -72,9 +72,9 @@ "dexie": "^1.5.1" }, "devDependencies": { - "angular-mocks": "^1.6.0" + "angular-mocks": "^1.6.1" }, "resolutions": { "angular": "1.6.0" } -} +} \ No newline at end of file diff --git a/package.json b/package.json index 73a3f1d..1c9af1d 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "grunt-contrib-connect": "^1.0.2", "grunt-contrib-copy": "^1.0.0", "grunt-contrib-cssmin": "^1.0.2", - "grunt-contrib-htmlmin": "^2.0.0", + "grunt-contrib-htmlmin": "^2.1.0", "grunt-contrib-imagemin": "^1.0.1", "grunt-contrib-jshint": "^1.1.0", "grunt-contrib-uglify": "^2.0.0", @@ -33,12 +33,12 @@ "jasmine-core": "^2.5.2", "jit-grunt": "^0.10.0", "jshint-stylish": "^2.2.1", - "karma": "^1.3.0", + "karma": "^1.4.0", "karma-coverage": "^1.1.1", "karma-jasmine": "^1.1.0", "karma-phantomjs-launcher": "^1.0.2", "markdownlint": "^0.3.1", - "newman": "^3.3.0", + "newman": "^3.4.2", "phantomjs-prebuilt": "^2.1.14", "sass-lint": "^1.10.2", "serve-static": "^1.11.1", @@ -98,4 +98,4 @@ }, "private": true, "dependencies": {} -} +} \ No newline at end of file