Browse code Merge branch 'master' into fork-and-pullreq Conflicts: src/main/scala/app/CreateRepositoryController.scala src/main/scala/service/WikiService.scala src/main/scala/util/JGitUtil.scala master
commit 0760b6a89c7077eff7d15272898d91aca906d04c 2 parents 07cdc60 + f34f60b takezoe authored on 12 Jul 2013

Showing 41 changed files

• src/main/resources/noimage.png
• src/main/scala/app/AccountController.scala
• src/main/scala/app/CreateRepositoryController.scala
• src/main/scala/app/IndexController.scala
• src/main/scala/app/IssuesController.scala
• src/main/scala/app/LabelsController.scala
• src/main/scala/app/MilestonesController.scala
• src/main/scala/app/RepositorySettingsController.scala
• src/main/scala/app/RepositoryViewerController.scala
• src/main/scala/app/WikiController.scala
• src/main/scala/service/ActivityService.scala
• src/main/scala/service/IssuesService.scala
• src/main/scala/service/RequestCache.scala
• src/main/scala/servlet/AutoUpdateListener.scala
• src/main/scala/servlet/TransactionFilter.scala
• src/main/scala/util/Directory.scala
• src/main/scala/util/FileUploadUtil.scala
• src/main/scala/util/Implicits.scala
• src/main/scala/util/JGitUtil.scala
• src/main/scala/util/StringUtil.scala
• src/main/scala/util/Validations.scala
• src/main/scala/view/AvatarImageProvider.scala
• src/main/scala/view/LinkConverter.scala
• src/main/scala/view/Markdown.scala
• src/main/scala/view/helpers.scala
• src/main/twirl/helper/activities.scala.html
• src/main/twirl/helper/preview.scala.html
• src/main/twirl/issues/create.scala.html
• src/main/twirl/issues/issue.scala.html
• src/main/twirl/issues/list.scala.html
• src/main/twirl/issues/milestones/list.scala.html
• src/main/twirl/repo/blob.scala.html
• src/main/twirl/repo/commits.scala.html
• src/main/twirl/repo/files.scala.html
• src/main/twirl/wiki/compare.scala.html
• src/main/twirl/wiki/edit.scala.html
• src/main/twirl/wiki/history.scala.html
• src/main/twirl/wiki/page.scala.html
• src/main/twirl/wiki/pages.scala.html
• src/main/webapp/assets/common/css/gitbucket.css
• src/main/webapp/assets/common/js/validation.js

Ignore Space Show notes View src/main/resources/noimage.png

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

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/IssuesController.scala

Ignore Space Show notes View src/main/scala/app/LabelsController.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/RepositoryViewerController.scala

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

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

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

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

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

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

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

Ignore Space Show notes View src/main/scala/util/FileUploadUtil.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 0 → 100644

Ignore Space Show notes View src/main/scala/view/LinkConverter.scala 0 → 100644

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/helper/activities.scala.html

Ignore Space Show notes View src/main/twirl/helper/preview.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/list.scala.html

Ignore Space Show notes View src/main/twirl/repo/blob.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/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

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

Show line notes below