Merge branch '#3_repository-search'

Fork: 0

johnpearcey / gitbucket_jkp

Browse code 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 master
commit 91d94de1d2d106a9ba32c327def495e820509516 2 parents 0c131ec + 54280d5 takezoe authored on 19 Jul 2013

Patch

Unified Split

Showing 36 changed files

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

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

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

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

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

Ignore Space Show notes View src/main/scala/service/RepositorySearchService.scala 0 → 100644

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

Ignore Space Show notes View src/main/scala/util/Directory.scala

Ignore Space Show notes View src/main/scala/util/FileUtil.scala

Ignore Space Show notes View src/main/scala/util/StringUtil.scala

Ignore Space Show notes View src/main/scala/util/Validations.scala

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

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

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View src/main/twirl/search/code.scala.html 0 → 100644

Ignore Space Show notes View src/main/twirl/search/issues.scala.html 0 → 100644

Ignore Space Show notes View src/main/twirl/search/menu.scala.html 0 → 100644

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

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

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

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

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

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

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

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

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

Show line notes below