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 patch-3 test 4.9 4.8 4.7.1 4.7 4.6 4.5 4.4 4.31.2 4.31.1 4.31.0 4.30.1 4.30.0 4.3 4.29.0 4.28.0 4.27.0 4.26.0 4.25.0 4.24.1 4.24.0 4.23.1 4.23.0 4.22.0 4.21.2 4.21.1 4.21.0 4.20.0 4.2.1 4.2 4.19.3 4.19.2 4.19.1 4.19.0 4.18.0 4.17.0 4.16.0 4.15.0 4.14.1 4.14 4.13 4.12.1 4.12 4.11 4.10 4.1 4.0 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.14 3.13 3.12 3.11 3.10_h2-1.4.180 3.10.1_h2-1.4.180 3.10.1 3.10 3.1.1 3.1 3.0 2.8 2.7 2.6 2.5 2.4.1 2.4 2.3 2.2.1 2.2 2.1 2.0 1.9 1.8 1.7 1.6 1.5 1.13 1.12 1.11.1 1.11 1.10 1.0.0

commit f10f98abf230a8902852078079d17ed2744edd4f 2 parents 2c52a4c + 3a7391f takezoe authored on 24 Jul 2013

Showing 83 changed files

• LICENSE
• README.md
• src/main/resources/update/1_3.sql
• src/main/resources/update/1_4.sql
• src/main/scala/ScalatraBootstrap.scala
• src/main/scala/app/AccountController.scala
• src/main/scala/app/ControllerBase.scala
• src/main/scala/app/CreateRepositoryController.scala
• src/main/scala/app/FileUploadController.scala
• src/main/scala/app/IndexController.scala
• src/main/scala/app/IssuesController.scala
• src/main/scala/app/MilestonesController.scala
• src/main/scala/app/RepositorySettingsController.scala
• src/main/scala/app/SearchController.scala
• src/main/scala/app/SignInController.scala
• src/main/scala/app/UserManagementController.scala
• src/main/scala/model/Account.scala
• src/main/scala/model/GroupMembers.scala
• src/main/scala/model/IssueComment.scala
• src/main/scala/model/package.scala
• src/main/scala/service/AccountService.scala
• src/main/scala/service/IssuesService.scala
• src/main/scala/service/RepositorySearchService.scala
• src/main/scala/service/RepositoryService.scala
• src/main/scala/service/WikiService.scala
• src/main/scala/servlet/AutoUpdateListener.scala
• src/main/scala/servlet/BasicAuthenticationFilter.scala
• src/main/scala/servlet/GitRepositoryServlet.scala
• src/main/scala/servlet/SessionCleanupListener.scala
• src/main/scala/util/Directory.scala
• src/main/scala/util/FileUploadUtil.scala
• src/main/scala/util/FileUtil.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/helpers.scala
• src/main/twirl/account/activity.scala.html
• src/main/twirl/account/main.scala.html
• src/main/twirl/account/members.scala.html
• src/main/twirl/account/repositories.scala.html
• src/main/twirl/account/tab.scala.html
• src/main/twirl/admin/menu.scala.html
• src/main/twirl/admin/users/edit.scala.html
• src/main/twirl/admin/users/group.scala.html
• src/main/twirl/admin/users/list.scala.html
• src/main/twirl/admin/users/user.scala.html
• src/main/twirl/helper/activities.scala.html
• src/main/twirl/helper/paginator.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/edit.scala.html
• src/main/twirl/issues/milestones/list.scala.html
• src/main/twirl/issues/milestones/progress.scala.html
• src/main/twirl/main.scala.html
• src/main/twirl/newrepo.scala.html
• src/main/twirl/repo/blob.scala.html
• src/main/twirl/repo/commit.scala.html
• src/main/twirl/repo/commits.scala.html
• src/main/twirl/repo/files.scala.html
• src/main/twirl/repo/guide.scala.html
• src/main/twirl/repo/tab.scala.html
• src/main/twirl/repo/tags.scala.html
• src/main/twirl/search/code.scala.html
• src/main/twirl/search/issues.scala.html
• src/main/twirl/search/menu.scala.html
• src/main/twirl/settings/collaborators.scala.html
• src/main/twirl/settings/delete.scala.html
• src/main/twirl/settings/options.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/twirl/wiki/tab.scala.html
• src/main/webapp/assets/common/css/gitbucket.css
• src/main/webapp/assets/common/images/alert.png
• src/main/webapp/assets/common/images/alert_mono.png
• src/main/webapp/assets/common/js/gitbucket.js
• src/main/webapp/assets/zclip/ZeroClipboard.min.js
• src/main/webapp/assets/zclip/ZeroClipboard.swf

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