Browse code Merge branch 'master' of https://github.com/takezoe/gitbucket Conflicts: src/main/scala/app/SettingsController.scala master
commit b42d8205a8491023ef5fbdfca4452601271760ca 2 parents d808233 + f59e852 takezoe authored on 4 Jun 2013

Showing 25 changed files

• lib/scalatra-forms_2.10-0.0.1.jar
• sbt.bat
• src/main/resources/update/1_0.sql
• src/main/scala/ScalatraBootstrap.scala
• src/main/scala/app/CreateRepositoryController.scala
• src/main/scala/app/SettingsController.scala
• src/main/scala/app/SignInController.scala
• src/main/scala/app/UsersController.scala
• src/main/scala/app/WikiController.scala
• src/main/scala/service/AccountService.scala
• src/main/scala/service/RepositoryService.scala
• src/main/scala/view/helpers.scala
• src/main/twirl/admin/useredit.scala.html
• src/main/twirl/admin/userlist.scala.html
• src/main/twirl/header.scala.html
• src/main/twirl/index.scala.html
• src/main/twirl/main.scala.html
• src/main/twirl/newrepo.scala.html
• src/main/twirl/settings/collaborators.scala.html
• src/main/twirl/settings/menu.scala.html
• src/main/twirl/settings/options.scala.html
• src/main/twirl/user.scala.html
• src/main/twirl/wiki/wiki.scala.html
• src/main/twirl/wiki/wikipages.scala.html
• src/main/webapp/assets/common/css/gitbucket.css

Ignore Space Show notes View lib/scalatra-forms_2.10-0.0.1.jar
Not supported

Ignore Space Show notes View sbt.bat

Ignore Space Show notes View src/main/resources/update/1_0.sql

Ignore Space Show notes View src/main/scala/ScalatraBootstrap.scala

Ignore Space Show notes View src/main/scala/app/CreateRepositoryController.scala

Ignore Space Show notes View src/main/scala/app/SettingsController.scala

Ignore Space Show notes View src/main/scala/app/SignInController.scala

Ignore Space Show notes View src/main/scala/app/UsersController.scala

Ignore Space Show notes View src/main/scala/app/WikiController.scala

Ignore Space Show notes View src/main/scala/service/AccountService.scala

Ignore Space Show notes View src/main/scala/service/RepositoryService.scala

Ignore Space Show notes View src/main/scala/view/helpers.scala

Ignore Space Show notes View src/main/twirl/admin/useredit.scala.html 0 → 100644

Ignore Space Show notes View src/main/twirl/admin/userlist.scala.html 0 → 100644

Ignore Space Show notes View src/main/twirl/header.scala.html

Ignore Space Show notes View src/main/twirl/index.scala.html

Ignore Space Show notes View src/main/twirl/main.scala.html

Ignore Space Show notes View src/main/twirl/newrepo.scala.html

Ignore Space Show notes View src/main/twirl/settings/collaborators.scala.html

Ignore Space Show notes View src/main/twirl/settings/menu.scala.html

Ignore Space Show notes View src/main/twirl/settings/options.scala.html

Ignore Space Show notes View src/main/twirl/user.scala.html

Ignore Space Show notes View src/main/twirl/wiki/wiki.scala.html

Ignore Space Show notes View src/main/twirl/wiki/wikipages.scala.html

Ignore Space Show notes View src/main/webapp/assets/common/css/gitbucket.css

Show line notes below