From 2e16b8e3f5745d32d1c90041d1583cc175f9ff7e Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Thu, 19 Jan 2017 11:24:22 +0100 Subject: [PATCH 1/2] #95 Fix the bower dependencies and force angular to 1.5.8 version --- README.md | 2 +- project/BuildSettings.scala | 2 +- ui/bower.json | 20 ++++++++++---------- ui/package.json | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 673d0e29f8..f47ca8b6fa 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ TheHive is written in Scala and uses ElasticSearch 2.x for storage. Its REST API ![](images/Architecture.png) ## Analyzers -TheHive 2.9.1 is provided with 8 analyzers: +TheHive 2.9.2 is provided with 8 analyzers: + DNSDB*: leverage Farsight's [DNSDB](https://www.dnsdb.info/) for pDNS. + DomainTools*: look up domain names, IP addresses, WHOIS records, etc. using the popular [DomainTools](http://domaintools.com/) service API. + Hippocampe: query threat feeds through [Hippocampe](https://github.com/CERT-BDF/Hippocampe), a FOSS tool that centralizes feeds and allows you to associate a confidence level to each one of them (that can be changed over time) and get a score indicating the data quality. diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala index b5c0d92356..faf3ac0593 100644 --- a/project/BuildSettings.scala +++ b/project/BuildSettings.scala @@ -7,7 +7,7 @@ object BasicSettings extends AutoPlugin { override def projectSettings = Seq( organization := "org.cert-bdf", licenses += "AGPL-V3" -> url("https://www.gnu.org/licenses/agpl-3.0.html"), - version := "2.9.1", + version := "2.9.2", resolvers += Resolver.bintrayRepo("cert-bdf", "elastic4play"), scalaVersion := Dependencies.scalaVersion, scalacOptions ++= Seq( diff --git a/ui/bower.json b/ui/bower.json index 2ea4e4ab1b..31ed7da6e0 100644 --- a/ui/bower.json +++ b/ui/bower.json @@ -1,19 +1,19 @@ { "name": "thehive", - "version": "2.9.1", + "version": "2.9.2", "license": "AGPL-3.0", "dependencies": { - "angular": "^1.5.8", - "angular-animate": "^1.5.8", + "angular": "1.5.8", + "angular-animate": "1.5.8", "angular-bootstrap": "~0.13.4", - "angular-cookies": "^1.5.8", + "angular-cookies": "1.5.8", "angular-json-human": "~1.2.1", "angular-markdown-directive": "~0.3.1", "angular-moment": "~0.10.3", - "angular-resource": "^1.5.8", - "angular-sanitize": "^1.5.8", + "angular-resource": "1.5.8", + "angular-sanitize": "1.5.8", "angular-timer": "~1.3.4", - "angular-touch": "^1.5.8", + "angular-touch": "1.5.8", "angular-ui-router": "~0.3.1", "animate.css": "~3.5.2", "bootstrap": "~3.3.7", @@ -33,7 +33,7 @@ "c3": "~0.4.11", "angular-base64": "~2.0.5", "css-spaces": "~0.3.5", - "angular-messages": "^1.5.8", + "angular-messages": "1.5.8", "ng-file-upload-shim": "^12.2.5", "ng-file-upload": "^12.2.5", "es5-shim": "^4.5.9", @@ -46,10 +46,10 @@ "highlight.js.origin": "^9.7.0" }, "devDependencies": { - "angular-mocks": "^1.5.8" + "angular-mocks": "1.5.8" }, "resolutions": { - "angular": "^1.5.8", + "angular": "1.5.8", "moment": "~2.14.1", "jquery": "~3.1.0" } diff --git a/ui/package.json b/ui/package.json index e0e7d65c44..0a7e45b11e 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "thehive", - "version": "2.9.1", + "version": "2.9.2", "license": "AGPL-3.0", "repository": { "type": "git", From b4a6e45596ad2bb2767efe46ef7c9dff0512cd56 Mon Sep 17 00:00:00 2001 From: Nabil Adouani Date: Thu, 19 Jan 2017 11:30:09 +0100 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab2ca13705..1e2ccc3cd8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,15 @@ # Change Log -## [2.9.1](https://github.com/CERT-BDF/TheHive/tree/2.9.1) +## [2.9.2](https://github.com/CERT-BDF/TheHive/tree/2.9.2) (2017-01-19) +[Full Changelog](https://github.com/CERT-BDF/TheHive/compare/2.9.1...2.9.2) + +**Fixed bugs:** + +- docker image: $.post\(...\).success is not a function [\#95](https://github.com/CERT-BDF/TheHive/issues/95) + + +## [2.9.1](https://github.com/CERT-BDF/TheHive/tree/2.9.1) (2016-11-28) **Implemented enhancements:** - Update logo and favicon [\#45](https://github.com/CERT-BDF/TheHive/issues/45) @@ -11,8 +19,8 @@ **Fixed bugs:** -- NPE occurs at startup if conf directory doesn't exists [\#41](https://github.com/CERT-BDF/TheHive/issues/41) - Resource not found by Assets controller [\#38](https://github.com/CERT-BDF/TheHive/issues/38) +- NPE occurs at startup if conf directory doesn't exists [\#41](https://github.com/CERT-BDF/TheHive/issues/41) - Systemd startup script does not work [\#29](https://github.com/CERT-BDF/TheHive/issues/29) - MISP event parsing error when it doesn't contain any attribute [\#25](https://github.com/CERT-BDF/TheHive/issues/25) - Phantom tabs [\#18](https://github.com/CERT-BDF/TheHive/issues/18) @@ -27,16 +35,17 @@ - Statistics based on Tags [\#37](https://github.com/CERT-BDF/TheHive/issues/37) - Statistics on a per case template name / prefix basis [\#31](https://github.com/CERT-BDF/TheHive/issues/31) - Observable Viewing Page [\#17](https://github.com/CERT-BDF/TheHive/issues/17) -- Case merging [\#14](https://github.com/CERT-BDF/TheHive/issues/14) - Give us something to work with! [\#2](https://github.com/CERT-BDF/TheHive/issues/2) +- Case merging [\#14](https://github.com/CERT-BDF/TheHive/issues/14) **Merged pull requests:** -- New analyzer to check URL categories [\#24](https://github.com/CERT-BDF/TheHive/pull/24) ([ecapuano](https://github.com/ecapuano)) +- AlienVault OTX Analyzer [\#39](https://github.com/CERT-BDF/TheHive/pull/39) ([ecapuano](https://github.com/ecapuano)) - Fix "Run from Docker" [\#9](https://github.com/CERT-BDF/TheHive/pull/9) ([2xyo](https://github.com/2xyo)) - Fixing a Simple Typo [\#6](https://github.com/CERT-BDF/TheHive/pull/6) ([swannysec](https://github.com/swannysec)) - Fixed broken link to Wiki [\#1](https://github.com/CERT-BDF/TheHive/pull/1) ([Neo23x0](https://github.com/Neo23x0)) +- New analyzer to check URL categories [\#24](https://github.com/CERT-BDF/TheHive/pull/24) ([ecapuano](https://github.com/ecapuano)) -\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* \ No newline at end of file +\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*