Merge branch 'master' into newui-for-dashboard

Fork: 0

johnpearcey / gitbucket_jkp

Browse code Merge branch 'master' into newui-for-dashboard Conflicts: src/main/twirl/dashboard/issueslist.scala.html src/main/twirl/dashboard/pullslist.scala.html master
commit 4bc4a16a805b571ed58608ab4e176c30e70c32da 2 parents e6e3786 + d88a105 Naoki Takezoe authored on 31 Oct 2014

Patch

Unified Split

Showing 36 changed files

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Ignore Space Show notes View src/main/twirl/issues/commentlist.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/listparts.scala.html

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

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

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

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

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

Ignore Space Show notes View src/main/twirl/repo/branches.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/tags.scala.html

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

Ignore Space Show notes View src/main/twirl/search/issues.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/webapp/assets/common/css/gitbucket.css

Ignore Space Show notes View src/test/scala/view/GitBucketHtmlSerializerSpec.scala

Show line notes below