(refs #508)Remove repository filter

(refs #508)Basic filter box implementation

(refs #508)Start to add search filter box

(refs #529)Mentioned filter

(refs #529)Organization filter

(refs #529)Visibility filter

(refs #522)Recover user filter in dashboard

Merge branch 'new-issue-ui'

(refs #505)Disable the plugin system in default

(refs #488) Fixed the action for issue and comment content change.

Merge branch 'new-issue-ui' of https://github.com/takezoe/gitbucket into new-issue-ui

(refs #488)Issue label editing is completed

(refs #488) Fixed the action for issue title change.

Simplify query

(refs #498)Reformat counting pull request query

(refs #498) Correct pull request counts

(refs #498)Returns private own repository ...

RepositoryService.getAllRepositories should returns
private own repository too.

(refs $#498)Don't show private repo user doesn't have permission ...

This fix in the dashboard pull request view
But this fix still has a problem show wrong count number pull request.

(refs #488)Exclude pull requests from the issue list

(refs #488)Add link to clear search condition

(refs #488)Merge user filter into IssueSearchCondition

(refs #488)Add service.IssuesService.IssueInfo

(refs #488)Displays the milestone on the issue list.

(refs #464)Improve plugin installing/updating behavior

Merge branch 'master' into scala-plugin ...

Conflicts:
	project/build.scala

(refs #457)Fix the target of updateRef

(refs #464)Fix compilation error

(refs #464)Add PLUGIN table for plugin management

Merge branch 'scala-2.11'

(refs #374) Fix compile error.

Merge branch 'show-author'

(refs #374)Upgrading to Scalatra 2.3 and Slick 2.1. ...

Some compilation errors in Slick code are remaining.

(refs #437)Show author at repo file list view

(refs #437)Show author instead of committer ...

* Explicit classify committer and author
* Use author to render avatar image html
* Support commit view

Improved model package. The details are as follows: ...

* Fix the Profiles class from package object to simple object
* Fix the row case class to model package
* Define the alias of JdbcBackend#Session

Fix incremental compilation problem caused by Slick. ...

This is temporary fix to decrease compilation time in development. Therefore this fix will be reverted in the future to add multiple database support capability.

(refs #444)Fix pull request count in dashboard

Fix #438

Fix TODO.

Merge branch '401-news-feed-of-private-repo' of https://github.com/utensil/gitbucket into utensil-401-news-feed-of-private-repo ...

Conflicts:
	src/main/scala/app/IndexController.scala
	src/main/scala/service/ActivityService.scala

Merge branch 'add-features-to-ldapauth' of https://github.com/yjkony/gitbucket into yjkony-add-features-to-ldapauth ...

Conflicts:
	src/main/scala/app/IndexController.scala
	src/main/scala/service/SystemSettingsService.scala
	src/main/scala/util/LDAPUtil.scala
	src/main/scala/util/Notifier.scala

Merge branch 'master' into slick2 ...

Conflicts:
	project/build.scala
	src/main/scala/app/IndexController.scala
	src/main/scala/app/RepositorySettingsController.scala
	src/main/scala/model/Account.scala
	src/main/scala/model/BasicTemplate.scala
	src/main/scala/model/Issue.scala
	src/main/scala/model/IssueComment.scala
	src/main/scala/model/package.scala
	src/main/scala/service/IssuesService.scala
	src/main/scala/service/PullRequestService.scala
	src/main/scala/service/RepositoryService.scala
	src/main/scala/service/WikiService.scala
	src/main/scala/servlet/TransactionFilter.scala
	src/main/scala/util/Notifier.scala

(refs #341)Add TODO about Slick 2.0 migration

(refs #341)Fix compilation error about date conversion

(refs #341)Fix compilation error of delete statements

Fix CRLF to LF

(refs #341)Fix compilation error other than date mapping and delete statement

(refs #341) Fix compile errors.

(refs #310)Convert all CRLF to LF

(refs #341) Migrate service package.

Show newsfeed of private repo to members of owner group

Show newsfeed of private repo to its owner

(refs #408)Performance improvement for index page.

(refs #406)Fix pull request count in the dashboard

Merge commit Tag 2.0 'db5395d' into add-features-to-ldapauth ...

Conflicts:
	src/main/twirl/account/edit.scala.html

Fix code style

(refs #380)Close stream certainly

Small cleanup using static analysis

(refs #346)Add group members as collaborator when transfer repository to the group.

Improve update pull request query ...

commitIdFrom and commitIdTo columns update by one query.

Merge commit Tag 1.13 ('3e82534') into add-features-to-ldapauth ...

Conflicts:
	src/main/scala/service/AccountService.scala
	src/main/scala/util/LDAPUtil.scala

(refs #324)Update commitIdFrom when pullrequest branch is updated

baseUrl calculation is concentrated to SystemSettings

Refactoring

(refs #13)Commit from AceEditor is available.

(refs #343)Retrieve all commit id from Git repository in pre commit hook instead of COMMIT_LOG table

(refs #335)Revert account updating in LDAP authentication

(refs #335)Add Scaladoc

(refs #335)Fix account updating in LDAP authentication

(refs #335)Fix LDAP authentication

(refs #335)Use string before '@' of mail address if user name is mail address in LDAP authentication.

Fix #334

Merge commit '5317ac5' (tag 1.12) into add-features-to-ldapauth

(refs #326)SSH clone URL includes username for logged-in users and it's hidden for non logged-in users.

(refs #313)Search files which have FileMode.EXECUTABLE_FILE mode not only REGULAR_FILE

Use Context#settings instead of loadSystemSettings()

Merge branch 'master' into add-features-to-ldapauth ...

Conflicts:
	src/main/twirl/account/edit.scala.html

(refs #115)Add button to toggle http/ssh for wiki repository url box

Remove last '/' in base url

(refs #115)Add new method to get sshUrl to RepositoryInfo

Change trigger of "Disalbe mail resolve is enalbed" from "When system settings check-box is ON" to "When mail attribute is empty".

Merge branch 'master' into add-features-to-ldapauth

(refs #115)Start and stop sshd at the system settings

(refs #115)Fix account registration page and add public key deletion

(refs #115)Adding SSH Key form is available

(refs #303)Submodule support

(refs #241)Modify AccountService#getGroupMembers() to returns list of GroupMember instead of Tuple2

(refs #241)Allow group manager to use repository settings

Merge branch 'improve-group'

Merge branch 'master' into add-features-to-ldapauth

Remove unnecessary import.

(refs #292) Fix to limit issue result before joins issue labels.

Revert line separator from LF to CRLF

(refs #241)Work for specifying group manager

Sync upstream/maste to master and Merge branch 'master' into add-features-to-ldapauth ...

Conflicts:
	src/main/scala/app/IndexController.scala
	src/main/scala/service/SystemSettingsService.scala
	src/main/twirl/admin/system.scala.html

(refs #218)Separate StringUtil#extractCloseId() to add unit test.

Merge branch 'closing-issues-via-commit-messages' of https://github.com/odz/gitbucket into odz-closing-issues-via-commit-messages

Merge pull request #290 from lefou/compare-email-caseinsensitive ...

Compare email adresses case-insensitive.

(refs #279)Fix webhook URL to use the configured base URL.

Compare email adresses case-insensitive.

Add features (additional filter condition / disable mail resolve) to LDAP authentication.

Merge branch 'master' into closing-issues-via-commit-messages ...

Conflicts:
	src/main/scala/app/PullRequestsController.scala
	src/main/scala/servlet/GitRepositoryServlet.scala

(refs #279)Add configuration to specify the base URL. But still one problem has not been resolved.

(refs #268)Fix label filter bug when label contains whitespaces.

(refs #256)If account is already registered but disabled, authentication fails.

(refs #251)Remove BOM from UTF-8 string.

(refs #245)Add full name attribute for LDAP authentication.

(refs #102)Experimental implementation of transfer repository ownership

(refs #102)Change for transfer repository owner.

(refs #101)Update links in activity message also.

(refs #101)Modification to add rename repository name.

Remove some functions from ControlUtil.

Close issues via commit messages

Merge branch 'pullreq-update-in-push' of https://github.com/odz/gitbucket into odz-pullreq-update-in-push ...

Conflicts:
	src/main/scala/app/PullRequestsController.scala

Fetch pull request from source repository after updating repository.

Resolves error when deleting repsository with PR.

Merge pull request #190 from jtyr/master ...

Adding LDAP StartTLS support

Use the system keystore by default ...

Default system keystore is in:
$JAVA_HOME/lib/security/jssecacerts
or in:
$JAVA_HOME/lib/security/cacerts

Custom keystore can be set either in /etc/sysconfig/gitbucket by
specifying the following option:
GITBUCKET_JVM_OPTS="-Djavax.net.ssl.trustStore=/path/to/your/cacerts"
or in Gitbucket's System Settings.

Moving keystore definition into settings

Fix test case.

(refs #114)Add group deletion.

(refs #114)Remove user related data when user is removed.

(refs #114)Add remove option to user management.

Adding LDAP StartTLS support ...

Some LDAP server do not allow authenticate with unencrypted password.
This patch is adding the StartTLS support which takes care of the
encryption.

In order to enable the StartTLS, go to "System Settings" and select the
"Enable StartTLS" in the Authentication section. Then make sure that you
add your LDAP certificate into the Java keystore:

$ keytool -import \
          -file /etc/pki/tls/certs/cacert.pem \
          -alias myName \
          -keystore /var/lib/gitbucket/keystore

You can list all keys from the keystore like this:

$ keytool -list -keystore /var/lib/gitbucket/keystore

(refs #114)Add logical remove flag to ACCOUNT.

(refs #186)Show private repositories in the account page.

(refs #179)Fetch from the source repository before pull request is referred.

(refs #167)Add pusher info to WebHook

Improve repository creation to not use the working repository.

(refs #180)Fix compilation error.

(refs #180)Remove Directory#getWikiWorkDir()

(refs #180)Reverting from history without working repository is completed.

(refs #180)Implementing reverting from history without ApplyCommand.

(refs #180)Fix saving and deleting Wiki page.

(refs #180)Eliminating the working repository cloning in Wiki.

(refs #174)Fix commit hook for DELETE command.

Merge pull request #147 from xuwei-k/AccountServiceSpec ...

add AccountServiceSpec

(refs #103) Add issue comment deletion.

Merge branch 'master' into #33_match-by-email ...

Conflicts:
	src/main/scala/view/helpers.scala

fix deprecation warning. use HttpClientBuilder ...

https://github.com/apache/httpclient/blob/4.3/httpclient/src/main/java-deprecated/org/apache/http/impl/client/DefaultHttpClient.java#L113

Merge branch 'account-full-name' of https://github.com/robinst/gitbucket into robinst-account-full-name ...

Conflicts:
	src/main/scala/app/PullRequestsController.scala

avoid NumberFormatException

refactoring. avoid Option#get

add AccountServiceSpec

(refs #99) Improved to configure the FROM field of the email.

(refs #139) Add info log for debugging LDAP Auth

Resolve length issue in Slick. ...

https://github.com/slick/slick/issues/170

Add full name to account and use it to create commits (#125) ...

The Git practice is to use the full name when creating commits, not a
user name. This commit fixes that by introducing a fullName field to
Account and using it when creating commits.

For migrating from earlier versions, the user name is used as an initial
value for the full name field.

(refs #121)Create WebHookPayload only when web hook has been registered.

(refs #121)Optimize push performance for a lot of commit.

(refs #73)Add Wiki conflict detection and some fix.

Clone Wiki working repository if it does not exist before reverting.

Fix commit message for Wiki editing.

(refs #38)Add reverting wiki from history.

Bug fix caused by path splitting.

Replace trace log with debug log.

Add trace log to WebHookService to check future execution.

Use ControlUtil.

Introduce ControlUtil which provides control facilities such as using() or defining().

(refs #74)Remove an auxiliary constructor from case class because json4s can't serialize correctly if case class have that.

(refs #74)Add "Test Hook" button.

Add ExecutionContext for Future.

(refs #74)Web hook request is sent asynchronously.

(refs #74)Web hook is completed.

(refs #74)JSON conversion test.

(refs #74)Added case classes for payload of web hook.

Delete from WEB_HOOK before deleting repository.

Merge branch 'master' into webhook

Delete from PULL_REQUEST before deleting repository.

(refs #74)Add web hook URL addition.

Fix default smtp port in constant.

Merge pull request #86 from odz/chardet ...

Add encoding detection

bindDN and bindPassword became optional for OpenLDAP.

Add encoding detection

Merge branch 'ldap-auth'

LDAP authentication by using bind account

Remove unused import statements.

(refs #78)Authentication moved to AccountService.

(refs #77)Display issue count and pull request count on the global nav.

(refs #78)LDAP port is optional.

(refs #78)Fix for LDAP authentication.

(refs #78)Implementing LDAP authentication.

Improved the list of forked repositories presentation.

(refs #69)Forked repositories tree is changed to flat list. ...

Because it can't render forked tree correctly if parent repository has been removed.

Add "View the diff" link to the edit wiki page activity.

Upgrade scalatra-forms.

Merge branch 'master' of https://github.com/takezoe/gitbucket.git

(refs #10) Add notification email form.

Add icon for create tag activity.

Add icons for activity.

(refs #2)Fix comment to pull request activity.

(refs #2)'Pull Requests' tab in dashboard has been completed.

(refs #2)Implementing 'Pull Requests' tab in the dashboard.

Merge branch 'master' into toggle_gravatar ...

Conflicts:
	src/main/scala/view/AvatarImageProvider.scala

Remove unnecessary comment and format code.

(refs #2)Add opened user filter and count to the pull request list.

(refs #2)Limit of pull request list is 25.

(refs #2)Implementing pull request list.

(refs #2)Add flag for identifying whether it's a pull request.

Merge branch 'master' into fork-and-pullreq ...

Conflicts:
	src/main/scala/app/RepositoryViewerController.scala
	src/main/scala/service/RepositoryService.scala

Fix an error that occurs when a new user accesses to dashboard/issues/repos

(refs #26) Fix splitWith condition.

(refs #26) Implements repository filter.

Fix query in RepositoryService#getVisibleRepositories fluently :-)

Merge branch 'master' of https://github.com/takezoe/gitbucket.git ...

Conflicts:
	src/main/scala/app/DashboardController.scala

(refs #26) Implements the dashboard issue display.

The method of RepositoryService was cleaned up.

Merge branch 'master' into fork-and-pullreq ...

Conflicts:
	src/main/scala/app/CreateRepositoryController.scala
	src/main/scala/util/JGitUtil.scala

Remove unused code.

Add lock for repository operation.

Use ISSUE_OUTLINE_VIEW to retrieve comment count.

(refs #2)Add forked count and repository tree view.

Add view ISSUE_OUTLINE_VIEW.

Toggle Gravatar support at the system settings.

Use JGitUtil.isEmpty() to check whether repository is empty.

(refs #2)Fix pull request. Basic pattern had been tested but it's still unstable.

(refs #50)Fix search logic in empty repository

(refs #26) Add Dashboard controller. Uses a common design at issue.

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

(refs #8)Some fix for group management.

(refs #8)Group repository creation is completed.

(refs #8)Implementing repository creation for group.

(refs #8)Implementing group register/edit form.

(refs #8)Start to implement group management.

(refs #3)Separate search actions to SearchController.

Exclude some actions from comment count at the repository search result.

Merge branch '#3_repository-search' ...

Conflicts:
	src/main/scala/app/UserManagementController.scala
	src/main/scala/service/IssuesService.scala
	src/main/twirl/issues/issue.scala.html

Add paginator and separate search code in controller to service.

Fix resource leak.

Move Implicit && to model package object.

Merge branch 'master' into #3_repository-search

(refs #33)Use RequestCache instead of AccountService directly.

Small fix and add TODO.

(refs #3)Apply likeEncode to search keyword.

(refs #3)Fix issue search condition.

(refs #3)Cleanup

(refs #3)Issue search is temporary available.

Remove unused import statement.

(refs #11) Fix comments to display.

Change action(IssueComment) to String type.

(refs #2)Fix comparing diffs before sending pull request.

(refs #2)Add columns MERGE_START_ID and MERGE_END_ID to PULL_REQUEST.

(refs #2)Experimental implementation of merge pull request.

(refs #2)Add merge pull request form.

(refs #2)Record 'open pull request' activity.

Fix typo.

(refs #2)Create pull request is available.

(refs #2)Implementing the comparing view.

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

(refs #34)Link conversion checks existence of accounts and issues.

Use StringUtil#urlEncode() instead of URLEncode#encode().

Fix activity message.

Improve Git repository creation.

(refs #2)Experimental implementation of forking repository.

(refs #2)Experimental implementation of forking repository.

(refs #11) Implemented the batch update.

(refs #28)Implementing avatar image uploading.

(refs #31)Make it possible to create empty repository.

Remove commit log before repository.

Remove activities before repository.

Improve mapping of custom column type.

(refs #4)Add 'News Feed' to the index page.

(refs #4)The base of activity timeline is completed.

(refs #4)Implementing activity recording for git push.

(refs #4)Record wiki activity.

(refs #4)Add issue close, reopen and comment activity.

(refs #4)Record issue creation activity.

(refs #4)Add 'Public Activity' tab to the account information page.

Remove unnecessary code.

Display the commit count at the repository viewer.

(refs #19)Add unique checking for mail address.

(refs #16)Fixed foreign key constraint problem in repository deletion.

Add Slick issue url in TODO comment.

Remove TODO.

Fix repository list of the index page.

Refactor authentication(issue controller).

Fix the inefficient query.

Rename general variable name isWritable to hasWritePermission.

Implemented the label edit process.

Merge remote-tracking branch 'origin/master'

Add deleteIssueLabel method.

Add methods to update assignedUserName and milestoneId.

Implemented the issue label display.

Fix the merge mistake.

Merge remote-tracking branch 'origin/master'

Fix model usage rules.

Assign, milestone and labels are available in Issue creation.

Reverse display order of milestones to ascending.

Add close and re-open of the issue.

Add action to model 'issue comment'.

Bug fix.

Fix typo.

Fix services to use shortcut method for primary key and foreign keys.

Add System Settings page.

Move userName and repositoryName to the base table class.

Use searchIssueQuery() in countIssueGroupByLabels().

Merge remote-tracking branch 'origin/master'

Add search condition 'Issue with no milestone'.

Implemented the issue stub.

Add comment count sorting and displaying.

MilestonesService provides a method which returns milestones with issue count.

Label search is available.

Change limit of issue pagination to 30.

Add issue pagination.

Delete LABEL_ISSUE before deleting LABEL.

Merge remote-tracking branch 'origin/master'

Replace native SQL which contains group by clause with type safe DSL.

Temporary fix for Slick 1.0.1. ...

Simple count query does not work on Slick 1.0.1 (but worked on Slick 1.0.0). Hmm...

Small fix for MilestonesService.

Add issue update in stub.

Replace native SQL which retrieves issue count with type safe DSL.

Add issue count for each labels.

Retrieve open and closed issue count from DB.

Implementing conditional issue searching.

Add user filter to issue search condition.

Add link to clear issue filter.

Implementing search condition behavior.

IssueSearchCondition.state is changed to String from Option[String] ...

because it has a default value 'open'.

Merge branch 'master' of https://github.com/takezoe/gitbucket.git

Fix to submit form when creating issue comment.

Merge branch 'master' of https://github.com/takezoe/gitbucket

Add search condition behavior to the issues page.

Add comments to issue.

Label editing is available!

Implementing label editing form.

Fix added issue comment layout.

Merge branch 'master' of https://github.com/takezoe/gitbucket

Issue label creation is available.

Create issue comment.

Start to implement issue labels.

Separate milestones from IssuesController / IssuesService.

Remove currentDate from controller.

Remove currentDate from controller.

Fix wiki repository creation.

Remove unnecessary import statements.

Create java.util.Date TypeMapper. And add the currentDate method.

Milestone completed.

Milestone deletion is available.

Add TODO to retrieving the current timestamp.

Update database schema. ...

Change MILESTONE.CLOSED to MILESTONE.CLOSED_DATE.

Start to implement milestone pages.

Move isWritable to RepositoryService.

Change java.sql.Date to java.sql.Timestamp.

Change java.sql.Date to java.sql.Timestamp.

Implemented the issue list.

Merge remote-tracking branch 'origin/master'

Hide private repositories at the account page.

Add CLOSED column to issue model.

Update flag columns to BOOLEAN.

Implemented the reference of the issue.

Implemented the registration of the issue.

Creates issue service.

Enhance repository creation / deletion for issues: ...

- Insert initial record into ISSUE_ID in repository creation
- Delete all records of ISSUE_ID and ISSUES in repository deletion

Fix the repository url.

Pull to the working copy of the wiki repository before modifying.

Remove debug code.

Synchronization of modification to the working repository for Wiki.

Delete Repository page has been implemented.

Fix the account page to display repositories which is registered as collaborator.

Collaborators became removable.

Fix updating in AccountService.

Save repository options.

Add RepositoryService#updateLastActivityDate().

Add AccountService#updateLastLoginDate().

Add AccountService#updateAccount()

Add new user creation stuff.

Implementing add collaborator stuff.

Define the static values for the user type.

Rename ProjectService to RepositoryService.

Remove unused code and add TODO comment.

Refactor database schema.

Define static values for the project type.

Fix the index page.

Implementing authentication.

Refactor to use ProjectService instead of JGitUtil directly to retrieve project information.

Move case classes in RepositoryViewerController to JGitUtil.

Retrieve project information from DB at the repository list.

Insert project info into database before actual git repository creation.

Add AccountService and ProjectService.

Remove unused code.

Remove unused import statements.

WikiUtil moved to WikiService and applied cake pattern to ...

WikiController.