Merge branch 'release/3.3.0-RC5'

TheHive-Project · Feb 23, 2019 · c91802b · c91802b
2 parents c9ca6b2 + 752cdbc
commit c91802b
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Change Log
 
+## [3.3.0-RC5](https://github.com/TheHive-Project/TheHive/tree/HEAD) (2019-02-24)
+[Full Changelog](https://github.com/TheHive-Project/TheHive/compare/3.3.0-RC4...3.3.0-RC5)
+
+**Implemented enhancements:**
+
+- Mouseover text for alert preview [\#897](https://github.com/TheHive-Project/TheHive/issues/897)
+
+**Fixed bugs:**
+
+- dashboard clicks are not correctly translated to tag filters [\#896](https://github.com/TheHive-Project/TheHive/issues/896)
+- Search results not visible [\#895](https://github.com/TheHive-Project/TheHive/issues/895)
+
 ## [3.3.0-RC4](https://github.com/TheHive-Project/TheHive/tree/3.3.0-RC4) (2019-02-22)
 [Full Changelog](https://github.com/TheHive-Project/TheHive/compare/3.3.0-RC3...3.3.0-RC4)
 

diff --git a/ui/app/scripts/controllers/SearchCtrl.js b/ui/app/scripts/controllers/SearchCtrl.js
@@ -25,7 +25,7 @@
                     _not: {
                         '_in': {
                             '_field': '_type',
-                            '_values': ['dashboard', 'data', 'user', 'analyzer', 'caseTemplate']
+                            '_values': ['dashboard', 'data', 'user', 'analyzer', 'caseTemplate', 'reportTemplate', 'action']
                         }
                     }
                   }

diff --git a/ui/app/scripts/services/GlobalSearchSrv.js b/ui/app/scripts/services/GlobalSearchSrv.js
@@ -51,7 +51,7 @@
         };
 
         this.buildDefaultFilterValue = function(fieldDef, value) {
-            if(fieldDef.type === 'user' || fieldDef.values.length > 0) {
+            if(fieldDef.name === 'tags' || fieldDef.type === 'user' || fieldDef.values.length > 0) {
                 return {
                     operator: 'any',
                     list: [{text: value.id, label:value.name}]

diff --git a/ui/app/views/partials/alert/event.dialog.html b/ui/app/views/partials/alert/event.dialog.html
@@ -87,19 +87,19 @@ <h4 class="vpad10 text-primary">
                         </tr>
                     </thead>
                     <tbody>
-                        <tr ng-repeat="attribute in dialog.pagination.data">
+                        <tr ng-repeat="attribute in dialog.pagination.data" class="clickable">
                             <td>
                                 <span uib-tooltip="Seen on {{attribute.seen}} existing case(s)" tooltip-popup-delay="500" tooltip-placement="bottom" ng-if="attribute.seen > 0" class="glyphicon glyphicon-eye-open"></span>
                             </td>
                             <td>{{attribute.dataType}}</td>
                             <td class="wrap">
-                              <div class="wrap" ng-if="attribute.dataType !== 'file'">
+                              <div class="wrap" ng-if="attribute.dataType !== 'file'" uib-tooltip="{{attribute.message}}" tooltip-placement="top-left">
                                   {{attribute.data | fang | ellipsis:250}}
                               </div>
-                              <div class="wrap" ng-if="attribute.dataType === 'file' && attribute.attachment">
+                              <div class="wrap" ng-if="attribute.dataType === 'file' && attribute.attachment" uib-tooltip="{{attribute.message}}" tooltip-placement="top-left">
                                   {{attribute.attachment.name}} ({{attribute.attachment.size}} bytes)
                               </div>
-                              <div class="wrap" ng-if="attribute.dataType === 'file' && attribute.remoteAttachment">
+                              <div class="wrap" ng-if="attribute.dataType === 'file' && attribute.remoteAttachment" uib-tooltip="{{attribute.message}}" tooltip-placement="top-left">
                                   {{attribute.remoteAttachment.filename}}
                               </div>
                               <div class="case-tags flexwrap mt-xxs" ng-if="attribute.tags.length > 0">

diff --git a/ui/bower.json b/ui/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "thehive",
-  "version": "3.3.0-RC4",
+  "version": "3.3.0-RC5",
   "license": "AGPL-3.0",
   "dependencies": {
     "angular": "1.5.8",

diff --git a/ui/package.json b/ui/package.json
@@ -1,6 +1,6 @@
 {
     "name": "thehive",
-    "version": "3.3.0-RC4",
+    "version": "3.3.0-RC5",
     "license": "AGPL-3.0",
     "repository": {
         "type": "git",

diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-version in ThisBuild := "3.3.0-RC4"
+version in ThisBuild := "3.3.0-RC5"