diff --git a/README.md b/README.md index eea8d21e..2722799c 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -![](./docs/images/logo_white_framed.png "Slicebox") Slicebox +![](src/main/public/images/logo_white_framed_small.png "Slicebox") Slicebox ===================================================== Service | Status | Description ------- | ------ | ----------- Bintray | [![Download](https://api.bintray.com/packages/slicebox/slicebox/installers/images/download.svg) ](https://bintray.com/slicebox/slicebox/installers/_latestVersion) | Latest Version on Bintray -Travis | [![Build Status](https://travis-ci.org/slicebox/slicebox.svg?branch=develop)](https://travis-ci.org/slicebox/slicebox.svg?branch=develop) | [Tests](https://travis-ci.org/slicebox/slicebox/) -Coveralls | [![Coverage Status](https://coveralls.io/repos/github/slicebox/slicebox/badge.svg?branch=develop)](https://coveralls.io/github/slicebox/slicebox?branch=develop) | Code coverage +Travis | [![Build Status](https://travis-ci.org/slicebox/slicebox.svg?branch=master)](https://travis-ci.org/slicebox/slicebox.svg?branch=master) | [Tests](https://travis-ci.org/slicebox/slicebox/) +Coveralls | [![Coverage Status](https://coveralls.io/repos/github/slicebox/slicebox/badge.svg?branch=master)](https://coveralls.io/github/slicebox/slicebox?branch=master) | Code coverage Gitter | [![Join the chat at https://gitter.im/slicebox/slicebox](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/slicebox/slicebox?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) | Chatroom Documentation | - | [Wiki](https://github.com/slicebox/slicebox/wiki) API Documentation | - | [REST API](http://slicebox.github.io/slicebox-api) diff --git a/build.sbt b/build.sbt index 576ec792..18cd0cb5 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,5 @@ name := "slicebox" -version := "1.5-SNAPSHOT" +version := "1.4.1" organization := "se.nimsa" scalaVersion := "2.12.4" scalacOptions := Seq("-encoding", "UTF-8", "-Xlint", "-deprecation", "-unchecked", "-feature", "-target:jvm-1.8") diff --git a/src/main/public/images/logo_white_framed_small.png b/src/main/public/images/logo_white_framed_small.png new file mode 100644 index 00000000..516b1c4f Binary files /dev/null and b/src/main/public/images/logo_white_framed_small.png differ diff --git a/src/main/scala/se/nimsa/sbx/app/Slicebox.scala b/src/main/scala/se/nimsa/sbx/app/Slicebox.scala index 7704801b..e541cd79 100644 --- a/src/main/scala/se/nimsa/sbx/app/Slicebox.scala +++ b/src/main/scala/se/nimsa/sbx/app/Slicebox.scala @@ -52,7 +52,7 @@ import scala.util.{Failure, Success} trait SliceboxBase extends SliceboxRoutes with DicomStreamOps with JsonFormats with PlayJsonSupport { - val systemInformation: SystemInformation = SystemInformation("1.5-SNAPSHOT") + val systemInformation: SystemInformation = SystemInformation("1.4.1") val appConfig: Config = ConfigFactory.load() val sliceboxConfig = appConfig.getConfig("slicebox")