Merge branch 'master' into docker

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,15 @@
+<!-- Please fill out these fields: -->
+
+* Browser: `Google Chrome`
+
+* Operating System: `Windows 10`
+
+* Error message (if applicable): `404`
+
+* Page link: `https://ore.spongepowered.org/YOUR_LINK`
+
+* Steps to reproduce:
+
+    * Step 1
+    * Step 2
+    * Step 3

.travis.yml

@@ -0,0 +1,25 @@
+sudo: false
+notifications:
+  email: false
+
+language: scala
+jdk:
+  - oraclejdk8
+  - openjdk8
+
+scala:
+  - 2.12.6
+
+# Caching taken from https://www.scala-sbt.org/1.0/docs/Travis-CI-with-sbt.html#Caching
+cache:
+  directories:
+    - $HOME/.ivy2/cache
+    - $HOME/.sbt
+
+before_cache:
+  # Cleanup the cached directories to avoid unnecessary cache updates
+  - find $HOME/.ivy2/cache -name "ivydata-*.properties" -print -delete
+  - find $HOME/.sbt        -name "*.lock"               -print -delete
+
+script:
+  - sbt ++$TRAVIS_SCALA_VERSION compile

OreTestPlugin/build.gradle

@@ -21,7 +21,7 @@ apply plugin: 'signing'
 //    id 'org.spongepowered.plugin' version '0.8.2-SNAPSHOT'
 //}
 
-group = 'se.walkercrou'
+group = 'org.spongepowered.ore'
 version = '1.0.1'
 description = 'Ore test plugin'
 
@@ -60,5 +60,5 @@ oreDeploy {
 }
 
 dependencies {
-    compile 'org.spongepowered:spongeapi:6.0.0-SNAPSHOT'
+    compile 'org.spongepowered:spongeapi:7.0.0'
 }

README.md

@@ -1,4 +1,4 @@
-Ore
+Ore [![Build Status](https://travis-ci.org/SpongePowered/Ore.svg?branch=master)](https://travis-ci.org/SpongePowered/Ore)
 ===
 
 Repository software for Sponge plugins and Forge mods https://ore.spongepowered.org/
@@ -9,10 +9,6 @@ Ore is written in Scala using the [Play](https://www.playframework.com/) framewo
 
 Running Ore is relatively simple.
 
-**With Activator**
-* Download and install the latest [Activator](https://www.lightbend.com/activator/download) distribution.
-* Execute `activator run` in the project root.
-
 **With SBT**
 * Download and install the latest [SBT](http://www.scala-sbt.org/download.html) version.
 * Execute `sbt run` in the project root.

app/Bootstrap.scala

@@ -6,7 +6,6 @@ import discourse.OreDiscourseApi
 import javax.inject.{Inject, Singleton}
 import ore.OreConfig
 import ore.project.ProjectTask
-import ore.user.UserSyncTask
 import org.bouncycastle.jce.provider.BouncyCastleProvider
 
 /**
@@ -17,21 +16,18 @@ trait Bootstrap {
   val modelService: ModelService
   val forums: OreDiscourseApi
   val config: OreConfig
-  val userSync: UserSyncTask
   val projectTask: ProjectTask
 
   val Logger = play.api.Logger("Bootstrap")
 
   Logger.info("Initializing Ore...")
-  val time = System.currentTimeMillis()
+  val time: Long = System.currentTimeMillis()
 
   this.modelService.start()
 
   this.forums.projects = this.modelService.getModelBase(classOf[ProjectBase])
   this.forums.start()
 
-  this.userSync.start()
-
   this.projectTask.start()
 
   if (this.config.security.get[Boolean]("requirePgp"))
@@ -45,5 +41,4 @@ trait Bootstrap {
 class BootstrapImpl @Inject()(override val modelService: ModelService,
                               override val forums: OreDiscourseApi,
                               override val config: OreConfig,
-                              override val userSync: UserSyncTask,
                               override val projectTask: ProjectTask) extends Bootstrap

app/ErrorHandler.scala

@@ -25,10 +25,10 @@ class ErrorHandler @Inject()(env: Environment,
                              extends DefaultHttpErrorHandler(env, conf, sourceMapper, router)
                                with I18nSupport {
 
-  override def onProdServerError(request: RequestHeader, exception: UsefulException) = {
-    implicit val session = request.session
-    implicit val requestImpl = request
-    implicit val headerData = HeaderData() // Empty HeaderData on error
+  override def onProdServerError(request: RequestHeader, exception: UsefulException): Future[Result] = {
+    implicit val session: Session = request.session
+    implicit val requestImpl: RequestHeader = request
+    implicit val headerData: HeaderData = HeaderData() // Empty HeaderData on error
 
     Future.successful {
       if (exception.cause.isInstanceOf[TimeoutException])
@@ -39,9 +39,9 @@ class ErrorHandler @Inject()(env: Environment,
   }
 
   override def onNotFound(request: RequestHeader, message: String): Future[Result] = {
-    implicit val session = request.session
-    implicit val requestImpl = request
-    implicit val headerData = HeaderData() // Empty HeaderData on error
+    implicit val session: Session = request.session
+    implicit val requestImpl: RequestHeader = request
+    implicit val headerData: HeaderData = HeaderData() // Empty HeaderData on error
 
     Future.successful(NotFound(views.html.errors.notFound()))
   }

app/Module.scala

@@ -12,7 +12,7 @@ import security.spauth.{SingleSignOnConsumer, SpongeAuth, SpongeAuthApi, SpongeS
 /** The Ore Module */
 class Module(environment: Environment, configuration: Configuration) extends AbstractModule {
 
-  def configure() = {
+  def configure(): Unit = {
     bind(classOf[OreRestfulApi]).to(classOf[OreRestfulServer])
     bind(classOf[StatTracker]).to(classOf[OreStatTracker])
     bind(classOf[ProjectFactory]).to(classOf[OreProjectFactory])

app/assets/stylesheets/_topbar.scss

@@ -173,3 +173,13 @@ $sp_logo_width: 200px;
     left: 0;
   }
 }
+
+.ore-nav {
+  display: inline-block;
+  width: 15px !important;
+  height: auto;
+  margin: 0;
+  padding: 0 12px 4px 7px;
+  background-color: transparent;
+  border-radius: 0;
+}

app/assets/stylesheets/main.scss

@@ -548,3 +548,25 @@ select.form-control, input.form-control {
 .no-padding {
   padding: 0;
 }
+
+.filter-user {
+  background-color: rgba(250, 250, 10, 0.4);
+}
+.filter-project {
+  background-color: rgba(10, 10, 250, 0.4);
+}
+.filter-version {
+  background-color: rgba(10, 250, 10, 0.4);
+}
+.filter-page {
+  background-color: rgba(250, 10, 250, 0.4);
+}
+.filter-action {
+  background-color: rgba(10, 250, 250, 0.4);
+}
+.filter-subject {
+  background-color: rgba(175, 150, 250, 0.4);
+}
+.table-super-condensed td {
+  padding: 2px !important;
+}