From cb4388046beeb50bc92a1bdbe205fbdcc897671b Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Mon, 6 May 2019 16:52:25 +0200 Subject: [PATCH] #966 Update angularjs version in bower.json and remove reference to unused depedencies --- ui/app/scripts/app.js | 38 +++++++++++++++++++++++++++++--------- ui/bower.json | 20 +++++++++----------- 2 files changed, 38 insertions(+), 20 deletions(-) diff --git a/ui/app/scripts/app.js b/ui/app/scripts/app.js index 8f4ddbc7a2..f2a17fd487 100644 --- a/ui/app/scripts/app.js +++ b/ui/app/scripts/app.js @@ -3,15 +3,35 @@ angular.module('theHiveServices', []); angular.module('theHiveFilters', []); angular.module('theHiveDirectives', []); -angular.module('thehive', ['ngAnimate', 'ngMessages', 'ngSanitize', 'ui.bootstrap', 'ui.router', 'ui.sortable', - 'theHiveControllers', 'theHiveServices', 'theHiveFilters', - 'theHiveDirectives', 'yaru22.jsonHuman', 'timer', 'angularMoment', 'ngCsv', 'ngTagsInput', - // 'btford.markdown', - 'ngResource', 'ui-notification', 'angularjs-dropdown-multiselect', 'angular-clipboard', - 'LocalStorageModule', - 'angular-markdown-editor', - 'hc.marked', 'hljs', 'ui.ace', 'angular-page-loader', 'naif.base64', 'images-resizer', 'duScroll', - 'dndLists', 'colorpicker.module' +angular.module('thehive', [ + 'ngAnimate', + 'ngMessages', + 'ngSanitize', + 'ui.bootstrap', + 'ui.router', + 'ui.sortable', + 'timer', + 'angularMoment', + 'ngCsv', + 'ngTagsInput', + 'ngResource', + 'ui-notification', + 'angular-clipboard', + 'LocalStorageModule', + 'angular-markdown-editor', + 'hc.marked', + 'hljs', + 'ui.ace', + 'angular-page-loader', + 'naif.base64', + 'images-resizer', + 'duScroll', + 'dndLists', + 'colorpicker.module', + 'theHiveControllers', + 'theHiveServices', + 'theHiveFilters', + 'theHiveDirectives' ]) .config(function($resourceProvider) { 'use strict'; diff --git a/ui/bower.json b/ui/bower.json index bc7d1b9bb3..931a3ded31 100644 --- a/ui/bower.json +++ b/ui/bower.json @@ -3,16 +3,15 @@ "version": "3.3.0", "license": "AGPL-3.0", "dependencies": { - "angular": "1.5.8", - "angular-animate": "1.5.8", + "angular": "1.7.8", + "angular-animate": "1.7.8", "angular-bootstrap": "2.5.0", - "angular-cookies": "1.5.8", - "angular-json-human": "~1.2.1", + "angular-cookies": "1.7.8", "angular-moment": "~0.10.3", - "angular-resource": "1.5.8", - "angular-sanitize": "1.5.8", + "angular-resource": "1.7.8", + "angular-sanitize": "1.7.8", "angular-timer": "~1.3.4", - "angular-touch": "1.5.8", + "angular-touch": "1.7.8", "angular-ui-router": "~0.3.1", "animate.css": "~3.5.2", "bootstrap": "~3.3.7", @@ -30,14 +29,13 @@ "angular-ui-notification": "0.3.6", "c3": "~0.4.11", "css-spaces": "~0.3.5", - "angular-messages": "1.5.8", + "angular-messages": "1.7.8", "ng-file-upload-shim": "^12.2.5", "ng-file-upload": "^12.2.5", "es5-shim": "^4.5.9", "es6-shim": "^0.35.1", "angular-clipboard": "^1.5.0", "angular-local-storage": "^0.4.0", - "myforce-angularjs-dropdown-multiselect": "^1.10.2", "angular-markdown-editor-ghiscoding": "1.1.5", "angular-highlightjs": "^0.6.2", "highlight.js.origin": "^9.7.0", @@ -55,10 +53,10 @@ "js-url": "^2.5.2" }, "devDependencies": { - "angular-mocks": "1.5.8" + "angular-mocks": "1.7.8" }, "resolutions": { - "angular": "1.5.8", + "angular": "1.7.8", "moment": "~2.14.1", "jquery": "~3.1.0" }