#966 Upgrade bower dependency to higher compatible minor versions

TheHive-Project · May 10, 2019 · 798cc64 · 798cc64
1 parent b43e951
commit 798cc64
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 29 deletions.
diff --git a/ui/app/index.html b/ui/app/index.html
@@ -23,7 +23,6 @@
     <link rel="stylesheet" href="bower_components/dropzone/dist/min/dropzone.min.css" />
     <link rel="stylesheet" href="bower_components/ng-tags-input/ng-tags-input.css" />
     <link rel="stylesheet" href="bower_components/roboto-fontface/css/roboto/roboto-fontface.css" />
-    <link rel="stylesheet" href="bower_components/roboto-fontface/css/roboto-condensed/roboto-condensed-fontface.css" />
     <link rel="stylesheet" href="bower_components/angular-ui-notification/dist/angular-ui-notification.css" />
     <link rel="stylesheet" href="bower_components/c3/c3.css" />
     <link rel="stylesheet" href="bower_components/css-spaces/dist/spaces.css" />
@@ -110,6 +109,7 @@
     <script src="bower_components/angular-bootstrap-colorpicker/js/bootstrap-colorpicker-module.js"></script>
     <script src="bower_components/file-saver/FileSaver.js"></script>
     <script src="bower_components/js-url/url.js"></script>
+    <script src="bower_components/bootstrap-sass/assets/javascripts/bootstrap.js"></script>
     <!-- endbower -->
 
     <script type="text/javascript" src="bower_components/ace-builds/src-min-noconflict/ace.js"></script>

diff --git a/ui/app/scripts/directives/fixed-height.js b/ui/app/scripts/directives/fixed-height.js
@@ -10,15 +10,15 @@
                     var footerHeight = $('.main-footer').outerHeight();
                     var headerHeight = $('.main-header').height();
 
-                    elem.css('min-height', windowHeight - headerHeight - footerHeight);
+                    elem.css('min-height', (windowHeight - headerHeight - footerHeight) + "px");
                 }, 500);
 
                 angular.element($window).bind('resize', function() {
                     var windowHeight = $(window).height();
                     var footerHeight = $('.main-footer').outerHeight();
                     var headerHeight = $('.main-header').height();
 
-                    elem.css('min-height', windowHeight - headerHeight - footerHeight);
+                    elem.css('min-height', (windowHeight - headerHeight - footerHeight) + "px");
                 });
 
             }

diff --git a/ui/bower.json b/ui/bower.json
@@ -10,47 +10,48 @@
     "angular-moment": "~0.10.3",
     "angular-resource": "1.7.8",
     "angular-sanitize": "1.7.8",
-    "angular-timer": "~1.3.4",
+    "angular-timer": "^1.3.5",
     "angular-touch": "1.7.8",
     "angular-ui-router": "~0.4.3",
-    "animate.css": "~3.5.2",
-    "bootstrap": "~3.3.7",
-    "bootstrap-sass-official": "~3.3.7",
+    "animate.css": "^3.7.0",
+    "bootstrap": "^3",
+    "bootstrap-sass-official": "^3",
     "dropzone": "~4.3.0",
     "font-awesome": "fontawesome#^4.7.0",
-    "jquery": "~3.1.0",
-    "moment": "~2.14.1",
+    "jquery": "^3.4.1",
+    "moment": "^2.24.0",
     "ng-csv": "~0.3.6",
-    "ng-tags-input": "~3.1.1",
-    "roboto-fontface": "~0.5.0",
+    "ng-tags-input": "^3.2.0",
+    "roboto-fontface": "^0.10.0",
     "smalot-bootstrap-datetimepicker": "2.4.4",
-    "underscore": "~1.8.3",
+    "underscore": "^1.9.1",
     "cryptojslib": "~3.1.2",
     "angular-ui-notification": "0.3.6",
     "c3": "~0.4.11",
     "css-spaces": "~0.3.5",
     "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",
+    "ng-file-upload-shim": "^12.2.13",
+    "ng-file-upload": "^12.2.13",
+    "es5-shim": "^4.5.13",
+    "es6-shim": "^0.35.5",
+    "angular-clipboard": "^1.7.0",
+    "angular-local-storage": "^0.7.1",
     "angular-markdown-editor-ghiscoding": "1.1.5",
-    "angular-highlightjs": "^0.6.2",
-    "highlight.js.origin": "^9.7.0",
+    "angular-highlightjs": "^0.7.1",
+    "highlight.js.origin": "^9.15.6",
     "angular-ui-ace": "bower",
     "angular-page-loader": "*",
-    "angular-images-resizer": "^2.0.2",
+    "angular-images-resizer": "^2.0.3",
     "angular-base64-upload": "^0.1.19",
-    "angular-ui-sortable": "^0.17.0",
-    "js-base64": "^2.1.9",
-    "angular-scroll": "^1.0.1",
-    "underscore.string": "^3.3.4",
+    "angular-ui-sortable": "^0.19.0",
+    "js-base64": "^2.5.1",
+    "angular-scroll": "^1.0.2",
+    "underscore.string": "^3.3.5",
     "angular-drag-and-drop-lists": "^2.1.0",
-    "angular-bootstrap-colorpicker": "^3.0.31",
+    "angular-bootstrap-colorpicker": "^3.0.32",
     "file-saver": "1.3.4",
-    "js-url": "^2.5.2"
+    "js-url": "^2.5.3",
+    "bootstrap-sass": "bootstrap-sass-official#^3.4.1"
   },
   "devDependencies": {
     "angular-mocks": "1.7.8"

diff --git a/ui/package.json b/ui/package.json
@@ -12,7 +12,6 @@
     "homepage": "https://thehive-project.org/",
     "dependencies": {},
     "devDependencies": {
-        "lodash": "^4.17.11",
         "autoprefixer": "^9.5.1",
         "grunt": "^1.0.4",
         "grunt-angular-templates": "^1.1.0",
@@ -42,7 +41,8 @@
         "jshint-stylish": "^2.2.1",
         "karma-jasmine": "2.0.1",
         "karma-phantomjs-launcher": "1.0.4",
-        "serve-static": "^1.13.2",
+        "lodash": "^4.17.11",
+        "serve-static": "^1.14.0",
         "time-grunt": "^2.0.0"
     },
     "engines": {

diff --git a/ui/test/karma.conf.js b/ui/test/karma.conf.js
@@ -69,6 +69,7 @@ module.exports = function(config) {
       'bower_components/angular-bootstrap-colorpicker/js/bootstrap-colorpicker-module.js',
       'bower_components/file-saver/FileSaver.js',
       'bower_components/js-url/url.js',
+      'bower_components/bootstrap-sass/assets/javascripts/bootstrap.js',
       'bower_components/angular-mocks/angular-mocks.js',
       // endbower
       "bower_components/cryptojslib/components/core-min.js",