Merge branch 'master' into fork-and-pullreq

Fork: 0

johnpearcey / gitbucket_jkp

Browse code Merge branch 'master' into fork-and-pullreq Conflicts: src/main/resources/update/1_3.sql src/main/resources/update/1_4.sql src/main/scala/app/CreateRepositoryController.scala src/main/scala/service/WikiService.scala src/main/twirl/account/repositories.scala.html master
commit f10f98abf230a8902852078079d17ed2744edd4f 2 parents 2c52a4c + 3a7391f takezoe authored on 24 Jul 2013

Browse code

Conflicts:
	src/main/resources/update/1_3.sql
	src/main/resources/update/1_4.sql
	src/main/scala/app/CreateRepositoryController.scala
	src/main/scala/service/WikiService.scala
	src/main/twirl/account/repositories.scala.html

master

commit f10f98abf230a8902852078079d17ed2744edd4f

2 parents 2c52a4c + 3a7391f

takezoe authored on 24 Jul 2013

Patch

Unified Split

Showing 83 changed files

Ignore Space Show notes View LICENSE 0 → 100644

Ignore Space Show notes View README.md

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View src/main/scala/app/SearchController.scala 0 → 100644

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

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

Ignore Space Show notes View src/main/scala/model/Account.scala

Ignore Space Show notes View src/main/scala/model/GroupMembers.scala 0 → 100644

Ignore Space Show notes View src/main/scala/model/IssueComment.scala

Ignore Space Show notes View src/main/scala/model/package.scala

Ignore Space Show notes View src/main/scala/service/AccountService.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/RepositoryService.scala

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

Ignore Space Show notes View src/main/scala/servlet/AutoUpdateListener.scala

Ignore Space Show notes View src/main/scala/servlet/BasicAuthenticationFilter.scala

Ignore Space Show notes View src/main/scala/servlet/GitRepositoryServlet.scala

Ignore Space Show notes View src/main/scala/servlet/SessionCleanupListener.scala

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

Show notes View src/main/scala/util/FileUploadUtil.scala 100644 → 0

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

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

Ignore Space Show notes View src/main/scala/util/JGitUtil.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/scala/view/AvatarImageProvider.scala

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

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

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

Ignore Space Show notes View src/main/twirl/account/members.scala.html 0 → 100644

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

Show notes View src/main/twirl/account/tab.scala.html 100644 → 0

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

Show notes View src/main/twirl/admin/users/edit.scala.html 100644 → 0

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

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

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

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

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/issues/milestones/progress.scala.html 0 → 100644

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/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/tab.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/twirl/wiki/tab.scala.html

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

Ignore Space Show notes View src/main/webapp/assets/common/images/alert.png 0 → 100644

Ignore Space Show notes View src/main/webapp/assets/common/images/alert_mono.png 0 → 100644

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

Ignore Space Show notes View src/main/webapp/assets/zclip/ZeroClipboard.min.js 0 → 100644

Ignore Space Show notes View src/main/webapp/assets/zclip/ZeroClipboard.swf 0 → 100644
Not supported

Show line notes below