Merge branch 'master' into #33_match-by-email
Conflicts:
	src/main/scala/view/helpers.scala
commit ff0af477cbaf15e4d54ab82fd3c7e039995f1c20
2 parents c0713ea + ba70fdd
@takezoe takezoe authored on 15 Oct 2013
Showing 181 changed files
View
README.md
Too large (Show diff)
View
build.xml 0 → 100644
Too large (Show diff)
View
embed-jetty/javax.servlet-3.0.0.v201112011016.jar 0 → 100644
Too large (Show diff)
View
embed-jetty/jetty-continuation-8.1.8.v20121106.jar 0 → 100644
Too large (Show diff)
View
embed-jetty/jetty-http-8.1.8.v20121106.jar 0 → 100644
Too large (Show diff)
View
embed-jetty/jetty-io-8.1.8.v20121106.jar 0 → 100644
Too large (Show diff)
View
embed-jetty/jetty-security-8.1.8.v20121106.jar 0 → 100644
Too large (Show diff)
View
embed-jetty/jetty-server-8.1.8.v20121106.jar 0 → 100644
Too large (Show diff)
View
embed-jetty/jetty-servlet-8.1.8.v20121106.jar 0 → 100644
Too large (Show diff)
View
embed-jetty/jetty-util-8.1.8.v20121106.jar 0 → 100644
Too large (Show diff)
View
embed-jetty/jetty-webapp-8.1.8.v20121106.jar 0 → 100644
Too large (Show diff)
View
embed-jetty/jetty-xml-8.1.8.v20121106.jar 0 → 100644
Too large (Show diff)
View
etc/gitbucket.erd 0 → 100644
Too large (Show diff)
View
etc/icons.svg 0 → 100644
Too large (Show diff)
View
gitbucket.erd 100644 → 0
Too large (Show diff)
View
lib/scalatra-forms_2.10-0.0.1.jar 100644 → 0
Too large (Show diff)
View
project/build.properties 0 → 100644
Too large (Show diff)
View
project/build.scala
Too large (Show diff)
View
project/plugins.sbt
Too large (Show diff)
View
sbt.sh 0 → 100755
Too large (Show diff)
View
src/main/java/JettyLauncher.java 0 → 100644
Too large (Show diff)
View
src/main/resources/logback.xml
Too large (Show diff)
View
src/main/resources/noimage.png
Too large (Show diff)
View
src/main/resources/update/1_4.sql 0 → 100644
Too large (Show diff)
View
src/main/resources/update/1_5.sql 0 → 100644
Too large (Show diff)
View
src/main/resources/update/1_6.sql 0 → 100644
Too large (Show diff)
View
src/main/resources/update/1_7.sql 0 → 100644
Too large (Show diff)
View
src/main/scala/ScalatraBootstrap.scala
Too large (Show diff)
View
src/main/scala/app/AccountController.scala
Too large (Show diff)
View
src/main/scala/app/ControllerBase.scala
Too large (Show diff)
View
src/main/scala/app/CreateRepositoryController.scala
Too large (Show diff)
View
src/main/scala/app/DashboardController.scala 0 → 100644
Too large (Show diff)
View
src/main/scala/app/FileUploadController.scala
Too large (Show diff)
View
src/main/scala/app/IndexController.scala
Too large (Show diff)
View
src/main/scala/app/IssuesController.scala
Too large (Show diff)
View
src/main/scala/app/LabelsController.scala
Too large (Show diff)
View
src/main/scala/app/MilestonesController.scala
Too large (Show diff)
View
src/main/scala/app/PullRequestsController.scala 0 → 100644
Too large (Show diff)
View
src/main/scala/app/RepositorySettingsController.scala
Too large (Show diff)
View
src/main/scala/app/RepositoryViewerController.scala
Too large (Show diff)
View
src/main/scala/app/SearchController.scala 0 → 100644
Too large (Show diff)
View
src/main/scala/app/SignInController.scala
Too large (Show diff)
View
src/main/scala/app/SystemSettingsController.scala
Too large (Show diff)
View
src/main/scala/app/UserManagementController.scala
Too large (Show diff)
View
src/main/scala/app/WikiController.scala
Too large (Show diff)
View
src/main/scala/model/Account.scala
Too large (Show diff)
View
src/main/scala/model/GroupMembers.scala 0 → 100644
Too large (Show diff)
View
src/main/scala/model/Issue.scala
Too large (Show diff)
View
src/main/scala/model/PullRequest.scala 0 → 100644
Too large (Show diff)
View
src/main/scala/model/Repository.scala
Too large (Show diff)
View
src/main/scala/model/WebHook.scala 0 → 100644
Too large (Show diff)
View
src/main/scala/model/package.scala
Too large (Show diff)
View
src/main/scala/service/AccountService.scala
Too large (Show diff)
View
src/main/scala/service/ActivityService.scala
Too large (Show diff)
View
src/main/scala/service/IssuesService.scala
Too large (Show diff)
View
src/main/scala/service/PullRequestService.scala 0 → 100644
Too large (Show diff)
View
src/main/scala/service/RepositorySearchService.scala 0 → 100644
Too large (Show diff)
View
src/main/scala/service/RepositoryService.scala
Too large (Show diff)
View
src/main/scala/service/RequestCache.scala
Too large (Show diff)
View
src/main/scala/service/SystemSettingsService.scala
Too large (Show diff)
View
src/main/scala/service/WebHookService.scala 0 → 100644
Too large (Show diff)
View
src/main/scala/service/WikiService.scala
Too large (Show diff)
View
src/main/scala/servlet/AutoUpdateListener.scala
Too large (Show diff)
View
src/main/scala/servlet/BasicAuthenticationFilter.scala
Too large (Show diff)
View
src/main/scala/servlet/GitRepositoryServlet.scala
Too large (Show diff)
View
src/main/scala/servlet/SessionCleanupListener.scala
Too large (Show diff)
View
src/main/scala/servlet/TransactionFilter.scala
Too large (Show diff)
View
src/main/scala/util/Authenticator.scala
Too large (Show diff)
View
src/main/scala/util/ControlUtil.scala 0 → 100644
Too large (Show diff)
View
src/main/scala/util/Directory.scala
Too large (Show diff)
View
src/main/scala/util/FileUploadUtil.scala 100644 → 0
Too large (Show diff)
View
src/main/scala/util/FileUtil.scala
Too large (Show diff)
View
src/main/scala/util/Implicits.scala
Too large (Show diff)
View
src/main/scala/util/JGitUtil.scala
Too large (Show diff)
View
src/main/scala/util/Keys.scala 0 → 100644
Too large (Show diff)
View
src/main/scala/util/LDAPUtil.scala 0 → 100644
Too large (Show diff)
View
src/main/scala/util/LockUtil.scala 0 → 100644
Too large (Show diff)
View
src/main/scala/util/Notifier.scala 0 → 100644
Too large (Show diff)
View
src/main/scala/util/StringUtil.scala
Too large (Show diff)
View
src/main/scala/util/Validations.scala
Too large (Show diff)
View
src/main/scala/view/AvatarImageProvider.scala
Too large (Show diff)
View
src/main/scala/view/Markdown.scala
Too large (Show diff)
View
src/main/scala/view/helpers.scala
Too large (Show diff)
View
src/main/twirl/account/activity.scala.html
Too large (Show diff)
View
src/main/twirl/account/edit.scala.html
Too large (Show diff)
View
src/main/twirl/account/main.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/account/members.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/account/repositories.scala.html
Too large (Show diff)
View
src/main/twirl/account/tab.scala.html 100644 → 0
Too large (Show diff)
View
src/main/twirl/admin/menu.scala.html
Too large (Show diff)
View
src/main/twirl/admin/system.scala.html
Too large (Show diff)
View
src/main/twirl/admin/users/edit.scala.html 100644 → 0
Too large (Show diff)
View
src/main/twirl/admin/users/group.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/admin/users/list.scala.html
Too large (Show diff)
View
src/main/twirl/admin/users/user.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/dashboard/issues.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/dashboard/pulls.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/dashboard/tab.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/header.scala.html
Too large (Show diff)
View
src/main/twirl/helper/account.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/helper/activities.scala.html
Too large (Show diff)
View
src/main/twirl/helper/copy.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/helper/diff.scala.html
Too large (Show diff)
View
src/main/twirl/helper/dropdown.scala.html
Too large (Show diff)
View
src/main/twirl/helper/paginator.scala.html
Too large (Show diff)
View
src/main/twirl/helper/preview.scala.html
Too large (Show diff)
View
src/main/twirl/helper/uploadavatar.scala.html
Too large (Show diff)
View
src/main/twirl/index.scala.html
Too large (Show diff)
View
src/main/twirl/issues/commentform.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/issues/commentlist.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/issues/create.scala.html
Too large (Show diff)
View
src/main/twirl/issues/editissue.scala.html
Too large (Show diff)
View
src/main/twirl/issues/issue.scala.html
Too large (Show diff)
View
src/main/twirl/issues/issuedetail.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/issues/list.scala.html
Too large (Show diff)
View
src/main/twirl/issues/listparts.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/issues/milestones/edit.scala.html
Too large (Show diff)
View
src/main/twirl/issues/milestones/list.scala.html
Too large (Show diff)
View
src/main/twirl/issues/milestones/progress.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/main.scala.html
Too large (Show diff)
View
src/main/twirl/newrepo.scala.html
Too large (Show diff)
View
src/main/twirl/pulls/commits.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/pulls/compare.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/pulls/discussion.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/pulls/list.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/pulls/listparts.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/pulls/mergecheck.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/pulls/mergeguide.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/pulls/pullreq.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/repo/blob.scala.html
Too large (Show diff)
View
src/main/twirl/repo/branches.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/repo/commit.scala.html
Too large (Show diff)
View
src/main/twirl/repo/commits.scala.html
Too large (Show diff)
View
src/main/twirl/repo/files.scala.html
Too large (Show diff)
View
src/main/twirl/repo/forked.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/repo/guide.scala.html
Too large (Show diff)
View
src/main/twirl/repo/tab.scala.html
Too large (Show diff)
View
src/main/twirl/repo/tags.scala.html
Too large (Show diff)
View
src/main/twirl/search/code.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/search/issues.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/search/menu.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/settings/collaborators.scala.html
Too large (Show diff)
View
src/main/twirl/settings/delete.scala.html
Too large (Show diff)
View
src/main/twirl/settings/hooks.scala.html 0 → 100644
Too large (Show diff)
View
src/main/twirl/settings/menu.scala.html
Too large (Show diff)
View
src/main/twirl/settings/options.scala.html
Too large (Show diff)
View
src/main/twirl/signinform.scala.html
Too large (Show diff)
View
src/main/twirl/wiki/compare.scala.html
Too large (Show diff)
View
src/main/twirl/wiki/edit.scala.html
Too large (Show diff)
View
src/main/twirl/wiki/history.scala.html
Too large (Show diff)
View
src/main/twirl/wiki/page.scala.html
Too large (Show diff)
View
src/main/twirl/wiki/pages.scala.html
Too large (Show diff)
View
src/main/twirl/wiki/tab.scala.html
Too large (Show diff)
View
src/main/webapp/WEB-INF/web.xml
Too large (Show diff)
View
src/main/webapp/assets/common/css/gitbucket.css
Too large (Show diff)
View
src/main/webapp/assets/common/images/activity-branch.png 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/common/images/activity-comment.png 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/common/images/activity-commit.png 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/common/images/activity-create-repository.png 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/common/images/activity-fork.png 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/common/images/activity-issue-close.png 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/common/images/activity-issue-reopen.png 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/common/images/activity-issue.png 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/common/images/activity-merge.png 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/common/images/activity-tag.png 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/common/images/activity-wiki.png 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/common/images/alert.png 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/common/images/alert_mono.png 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/common/images/favicon.png 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/common/images/gitbucket.png 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/common/images/issue-closed.png 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/common/images/issue-open.png 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/common/images/pullreq-closed.png 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/common/images/pullreq-open.png 0 → 100644
Too large (Show diff)
View
src/main/webapp/assets/common/js/gitbucket.js
Too large (Show diff)
View
src/main/webapp/assets/common/js/validation.js
Too large (Show diff)
View
src/main/webapp/assets/elastic/jquery.elastic.source.js 0 → 100644
Too large (Show diff)
View
src/test/scala/util/StringUtilSpec.scala 0 → 100644
Too large (Show diff)
View
src/test/scala/util/ValidationsSpec.scala 0 → 100644
Too large (Show diff)
View
src/test/scala/view/AvatarImageProviderSpec.scala 0 → 100644
Too large (Show diff)
View
src/test/scala/view/PaginationSpec.scala 0 → 100644
Too large (Show diff)