Commit 9efc1143 authored by To-om's avatar To-om

Merge branch 'release/3.3.0'

parents 63d694af efaae053
# Change Log
## [3.3.0-RC6](https://github.com/TheHive-Project/TheHive/tree/3.3.0-RC6) (2019-02-07)
## [3.3.0](https://github.com/TheHive-Project/TheHive/tree/3.3.0) (2019-03-19)
[Full Changelog](https://github.com/TheHive-Project/TheHive/compare/3.3.0-RC6...3.3.0)
**Fixed bugs:**
- Merge case by CaseID Broken [\#930](https://github.com/TheHive-Project/TheHive/issues/930)
## [3.3.0-RC6](https://github.com/TheHive-Project/TheHive/tree/3.3.0-RC6) (2019-03-07)
[Full Changelog](https://github.com/TheHive-Project/TheHive/compare/3.3.0-RC5...3.3.0-RC6)
**Implemented enhancements:**
......@@ -849,4 +856,4 @@
\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*
\ No newline at end of file
......@@ -20,7 +20,7 @@ object Dependencies {
val reflections = "org.reflections" % "reflections" % "0.9.11"
val zip4j = "net.lingala.zip4j" % "zip4j" % "1.3.2"
val elastic4play = "org.thehive-project" %% "elastic4play" % "1.9.0"
val elastic4play = "org.thehive-project" %% "elastic4play" % "1.10.0"
val akkaCluster = "com.typesafe.akka" %% "akka-cluster" % "2.5.19"
val akkaClusterTools = "com.typesafe.akka" %% "akka-cluster-tools" % "2.5.19"
}
......
......@@ -90,8 +90,8 @@ object ActionOperation {
content (json \ "content").validate[String]
owner (json \ "owner").validateOpt[String]
} yield AddLogToTask(content, owner)
case "AddTagToAlert" => (json \ "tag").validate[String].map(tag AddTagToAlert(tag))
case other JsError(s"Unknown operation $other")
case "AddTagToAlert" (json \ "tag").validate[String].map(tag AddTagToAlert(tag))
case other JsError(s"Unknown operation $other")
})
implicit val actionOperationWrites: Writes[ActionOperation] = Writes[ActionOperation] {
case a: AddTagToCase addTagToCaseWrites.writes(a)
......@@ -205,7 +205,7 @@ class ActionOperationSrv @Inject() (
task findTaskEntity(entity)
_ logSrv.create(task, Fields.empty.set("message", content).set("owner", owner.map(JsString)))
} yield operation.updateStatus(ActionOperationStatus.Success, "")
case AddTagToAlert(tag, _, _) =>
case AddTagToAlert(tag, _, _)
entity match {
case initialAlert: Alert
for {
......
{
"name": "thehive",
"version": "3.3.0-RC6",
"version": "3.3.0",
"license": "AGPL-3.0",
"dependencies": {
"angular": "1.5.8",
......
{
"name": "thehive",
"version": "3.3.0-RC6",
"version": "3.3.0",
"license": "AGPL-3.0",
"repository": {
"type": "git",
......
version in ThisBuild := "3.3.0-RC6"
version in ThisBuild := "3.3.0-1"
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment