Merge branch '#3_repository-search'

Conflicts:
	src/main/scala/app/UserManagementController.scala
	src/main/scala/service/IssuesService.scala
	src/main/twirl/issues/issue.scala.html
This commit is contained in:
takezoe
2013-07-20 03:00:16 +09:00
36 changed files with 411 additions and 80 deletions

View File

@@ -1,7 +1,7 @@
@(repository: service.RepositoryService.RepositoryInfo, info: Option[Any])(implicit context: app.Context)
@import context._
@import view.helpers._
@html.main("Settings"){
@html.main("Settings", Some(repository)){
@html.header("settings", repository)
@menu("options", repository){
@helper.html.information(info)