(refs #1286) Bugfix

(refs #1286) Update collaborators setting form

(refs #1286) Update controllers

(refs #1286) Update the repository settings form

(refs #1286) Add columns: ISSUES_OPTION and WIKI_OPTION

(refs #1286) Show group marker when collaborator is added

(refs #1286) Refactoring

(refs #1286) Show whether group account on the collaborators proposal

(refs #1286) Update collaborators setting form

(refs #1286) Fix services and beat compilation errors

(refs #1286) Prototyping of new permission system

(refs #1325) Prepend one more empty line when the first line is an empty line.

(refs #1334) Indicate who is group manager

Suppress noisy transition animation on load in IE11 ...

http://stackoverflow.com/a/25674229

(refs #1312)Fix badge position on the side menu

(refs #1316)Add "Page History" button to the wiki page view

(refs #1292)Add new option to disable repository forking

(refs #1206)Display commit count on the history button

(refs #1206)Display find and history icon in mobile view

(refs #1293)Restore dashboard issues / pull requests switcher

(refs #1290)Always show “Download ZIP” button

(refs #1288)Dropping files is also available in textarea, not only in the bottom bar.

Remove unnecessary style class

Tweak branch list presentation

(refs #1239)Add toggle sidebar button

(refs #1275, #1239)Fix CSS

(refs #1278) Bump to AdminLTE 2.3.6

(refs #1230) Apply table-hover class for the commit history

(refs #1259) Add SQL import capability and remove XML export / import

(refs #769) Output go-import meta tag in all repositories for go get

(refs #1264) BugFix: File attachment does not work on the issue comment

(refs #1255) Display the newest version as plugin version because if migration was failed, plugin is not registered.

(fix #1246) cannot see the blame

Fix message of plugin version

(refs #1245) Display migrated plugin version if migration is failing

Rename CompletionProposalProvider to SuggestionProvider

(refs #1242) Bugfix in branch protection for branches which contain /

Purge Emoji support because it will be provided as plugin

Fix error in creating and merging pull request

(refs #1241) Update CompletionProposalProvider interface

(refs #1241) Filter CompletionProposalProvider by the completion context

Update TextDecorator interface

(refs #1241) Add new extension point to add completion proposals provider for the textarea

(refs #1237) Fix broken layout

Fix emoji conversion

Change import to resolve resolving error in IntelliJ

Change import to resolve resolving error in IntelliJ

Change import to resolve resolving error in IntelliJ

Change import to resolve resolving error in IntelliJ

Change import to resolve resolving error in IntelliJ

Change import to resolve resolving error in IntelliJ

Use completion is disabled in the Wiki editor

Add user name completion in the textarea

Emoji completion in textarea

Fix file attachement area in Wiki page editing form

Add a missing ul tag

fix: can't show the user profile when joining any groups

Fix badge position in the sidebar

Fix sidebar scrolling

Rename octicons directory

Remove AdminLTEOptions

Content is scrollable

Fix displayed version

Fix styles for AdminLTE

Fix styles of account pages

Remove unnecessary overflow: hidden;

Apply AdminLTE sidemenu to dashboard

Introduce AdminLTE

Remove link to the commit from the commit message because there are an other link to the commit.

Add option to allow non-contributors to edit Wiki pages

(refs #80) Add options to turn-off Wiki and Issues

Fix invalid margin of the plugin list

(refs #1216) Add sending test mail capability

Fix system settings page

(refs #1212) GC button was finished

(refs #1212) Add GC button to the danger zone

(refs #1215) Open H2 console in new window

(refs #1217) Fix permission toggle button in the group editing page

(refs #1196)Fix search results paging for Wiki

Merge pull request #1211 from gitbucket/pull-request-title ...

Default value of pull request title

Default value of pull request title

Fix presentation of pull request page

Fix presentation of branch list

Fix top margin of titles

Format

Fix pull request status styles

fix #1192 Cannot disable option "Require status checks to pass before merging"

Fix style

Merge remote-tracking branch 'origin/master'

(refs #1195)Fix date in the commit list

Fix a missing ctype from test hook

(refs #533)Add checking for the last one administrator.

(refs #533)Add remove user checking for the last one administrator.

Fix layout

Merge pull request #1185 from dariko/system_admin_typo ...

typo: DAT(A)BASE_URL

typo: DAT(A)BASE_URL

Tweak branch list presentation

(refs #1172)Fix: Some of issue filters has been impossible to turn off

(refs #1178)Check group member isn't group account

Fix use type selection buttons

Fix error checking

Add error checking for data import

Export supports both of XML and SQL

Merge branch 'master' into mysql_support

(refs #1154)Fix path of request to the branch protection API

Merge branch 'master' into mysql_support ...

# Conflicts:
#	src/main/resources/update/3_13.sql
#	src/main/scala/gitbucket/core/servlet/AutoUpdate.scala

Merge branch 'webhook-content-type' of https://github.com/McFoggy/gitbucket into McFoggy-webhook-content-type ...

# Conflicts:
#	src/main/scala/gitbucket/core/service/WebHookService.scala
#	src/main/twirl/gitbucket/core/settings/edithooks.scala.html

Display database url at the system setting console

Data import is available

Working for data import tool

Add data import form

Database export tool is available

Merge branch 'master' into solidbase-integration ...

# Conflicts:
#	build.sbt
#	src/main/twirl/gitbucket/core/main.scala.html

correct empty security token usage, fixes #1168

Fix CSS style

(refs #1166)BugFix: Show more pages link of Wiki does not work

(refs #1160)Fix mobile view

(refs #1161)Add new extension point to add dashboard tab

(refs #1161)Add new extension point to add system setting menu and account setting menu

(refs #1161)Add new extension point to add repository setting tab

(refs #1161)Add new extension point to add repository menu

Tweak some styles in Wiki

(refs #1161)Add new extension point to add a tab to the profile page

(refs #1161)Add new extension point to add global menu

Attach image to wiki is progressing

Merged branch master into master

(refs #79)Wiki page search is available

use row-fluid class instead of row for full-width layout.

(refs #1152)Fix label and milestone editing

Fix layout of wiki editing form and history

BugFix for "Show more repositories" link

Fix dashboard and search layout

Tweak CSS styles

Move the repository menu to the sidebar

Fix Branches, Tags and Milestones presentaion

Move Branches and Tags link to repository navigation tab

Fix editor styles

Update dropdown UI

Simplify dashboard UI

Separate labels and milestones from issues

Simplify issue and pull request creation form

Fix broken commits link in the repository header

Update file browser and commit list UI

Adjust top margin of comment preview tab

Remove tab icons

Fix issues and pull request title editing form

Fix styles of diff view

Fix styles of account setting pages

Adjust sidebar of issues

Simplify commit list

Small fix for UI styles

Move repository status to right of the header

Change Fork button to tab

Simplify file list table

Adjust styles

Adjust styles

Move to raw Bootstrap3 from GitHub like theme for Bootstrap3

(refs #1146)BugFix for choosing user type in grpup

Fix special character encoding for blob links

add possibility to choose content type for repository webhooks

Merge branch 'master' into solidbase-integration ...

# Conflicts:
#	build.sbt
#	src/main/scala/gitbucket/core/controller/SystemSettingsController.scala
#	src/main/scala/gitbucket/core/servlet/AutoUpdate.scala

Merge pull request #1127 from McFoggy/issue-1117 ...

add X-Hub-Signature security to wekhooks

Merge UserManagementController to SystemSettingsController to reduce filter mapping

Fix typo in issue comment list

integrate xhub4j, fixes #1117

Fix comment editing in pull request diff view

Fix width of previewable editing forms

(fixes #1118)Remove duplicated <script>

Fix width of wiki page editing form

Fix broken presentation

Merge some controllers because a large amount mapping causes performance issue

Disable new pull request button if user does not signed-in

Replace new issue button with new pull request button

Fix pull request guide

Merge pull request #1112 from oohira/fix/margin-after-octicon ...

Add margin after octicon

(fixes #1114)Add Colorpicker options that to force hex format

Add margin after octicon

Adjust issue / comment form

Mobile view improvement

Tweak header buttons

Implement repository url selector

Adjust new file, new pull request button and others

Remove unused code

Tweak top margin of contents

Implementing new header parts

Fix header style

Move sidemenu to header

(refs #1084)Remove RepositoryUrls

Merge branch 'wip/baseurl' of https://github.com/ritschwumm/gitbucket into ritschwumm-wip/baseurl

remove RepoBase by moving RepositoryUrls construction into Context

(refs #982)Provide fixed url for pull request tabs

Fix bug that border of review comment box is not shown

Merge pull request #1095 from oohira/link-avatar-image-to-profile-page ...

Link avatar image to the user's profile page

Link avatar image to the user's profile page

Fix repository owner link URL

feature: add settings for the ssh host

cleanup: wiki urls could have been simpler

preparation: move url generation from RepositoryInfo towards the gui

cleanup: don't repeat yourself, calculate effective ssh port in one place only

(refs #1080)Fix commit count presentation when over 10000

Merge branch 'master' ...

Conflicts:
	project/build.scala

Fix margin of icon and caret of dowpdown menu in the global header

Merge branch 'master' ...

Conflicts:
	src/main/scala/gitbucket/core/servlet/AutoUpdate.scala

Merge pull request #1050 from x-way/limit_recent_repositories ...

Limit recent updated repositories list. #1011

(fixes #1062) Remove a wrong link

Merged branch master into solidbase-integration

Fix styles

Merge pull request #1052 from team-lab/change-issue-action-comment-style ...

Change action-comment styles that follow github.

Merge branch 'master' into solidbase-integration ...

Conflicts:
	src/main/scala/gitbucket/core/model/Profile.scala
	src/main/scala/gitbucket/core/servlet/AutoUpdate.scala

Change action-comment styles that follow github.

Limit recent updated repositories list. #1011

Merge branch 'master' into solidbase-integration

Small fix about code style

Fix version and view

Merge branch 'feature/protected-branch' of https://github.com/team-lab/gitbucket into team-lab-feature/protected-branch

Fix preview bug in online editor of repository viewer

(refs #984)Fix special character problem in repository viewer

(refs #1035)Fixup

Replace migration system with Solidbase

fix long file name text-overflow

Merge pull request #1032 from cubdesign/issues-badge ...

show side menu badge

fix pagination layout

show badge

Merge pull request #1030 from team-lab/fix/image-diff ...

Fix/image diff

Merge pull request #1027 from moccos/add_path_to_title ...

Add path and branch name to the page title

remove debug info

Use repository.repository.defaultBranch instead of "master"

Add path and branch name to the page title

move MergeStatus to service

fix typo

updete bootstrap 3

for bootstrap 3

update button

add protected-branch feature on pull-request page ...

* show commit-status if context is require status checks to pass.
  * disable merge if new commit-id has not `commit-status` ok on `Status-checkes`.
  * if some status includes required is not success, merge button is disabled.
  * if any required status is success, and some status not includes required, merge button is active, but button color is white.
  * if any required status is success, merge button is active, and button color is green.

Protected mark(octicon-shield) on Branches page

Readonly on online-editor

add protected branch list on branch setting page.

Add git proection api and form

create `repository setting branches` page and move default branch setting to there.

(refs #970)Display permission change

Merge branch 'wiki-sidebar' of https://github.com/viliamjr/gitbucket into viliamjr-wiki-sidebar ...

# Conflicts:
#	src/main/twirl/gitbucket/core/wiki/page.scala.html

Fix dropdown bug

(refs #990)Provides path for raw contents instead of ?raw=true

(refs #1004)Fix edit webhook link url

Fix branch control dropdown

Don't break lines in Wiki or markdown files on the repository viewer

Fix global header style

Fix styles in file editing form in the repository viewer

Fix fork button group style

Fix width and font of the dropzone

Fix modal dialog

Fix button size

Fixup

Use bootstrap panel instead of custom box styles

Fix style of issue comment form and more

Fix right margin of account search box

Fixup

Use Bootstrap panel instead of custom CSS

Fix buttons of webhook list

Use Bootstrap panel instead of custom CSS

Fix milestone list and progress bar

Fix milestone creation / editing form

Fix label editing form

Use Bootstrap panels instead of GitBucket original styles

Fix styles

Fix tables and some pages

Fix typo

Fix issue search box

Fix borderd table style

A simple wiki page (markdown file "_Footer.md") is used as footer for the wiki. ...

Github specification:
https://help.github.com/articles/creating-a-footer/

- the footer is rendered below the wiki page content.
- a direct link to edit the footer.

Fix ZeroClipboard button

Fix styles of repository setting pages

Fix sidebar style

Fix styles of plugins page

Fix styles of account and group creation page

Merge branch 'master' into css_bootstrap3 ...

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

Fix box style

Fix styles of system administration page

Fix styles of the repository creation page and more

Fix styles

Merge branch 'master' into css_bootstrap3

Disable auto completion in the select user field

Merge branch 'master' into feature/webhook-review-comment

Fix styles

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

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

Fix fork button

Fix styles of issues and pull requests

Fix diff styles

Fix commit list style

Fix pull request creation form style

Fix issue styles

Fix styles

Fix branch list styles

Fix styles

Fix markdown header style

Fix repository setting pages presentation

Fix webhook editing presentation and performance issue

Once delete editHooks.scala.html to rename

A sidebar page for the wiki ...

A simple wiki page (markdown file "_Sidebar.md") is used as a sidebar menu for the wiki.

Github specification:
https://help.github.com/articles/creating-a-sidebar/

- the sidebar is rendered below the pages index.
- if you click on page index "counter" you can collapse or expand the
  page list.

Fix global header style

Adjust styles for Bootstrap3

Fix sidebar style

Merge branch 'master' into feature/webhook-review-comment

Fix header styles

Merge branch 'master' into css_bootstrap3

Add bootstrap-theme-github

Merge pull request #973 from gitbucket/commit_comment_count ...

Count COMMIT_COMMENT as issue comment

Drop PULL_REQUEST column from COMMIT_COMMENT table

Moving to Bootstrap3

add webhook pull-request-review-comment

(refs #974)Not hide add-comment icon when adding comment form is active.

Fix markdown preview style

Fix styles

Merge pull request #968 from justinpitts/master ...

Correct typo on system administration page.

Merge branch 'master' into feature/webhook-scope

Correct typo on system administration page.

Fix the default number of displayed repositories

Merge pull request #939 from nus/feature/upload-pdf ...

Support uploading PDF files

Change messages about file types in the comment form.

Add document file formats for upload ...

The following extension is added.
- .docx
- .pptx
- .txt
- .xlsx

(refs #947)Fix referenced link from pull request

Merge pull request #944 from lefou/t943-url-in-repo-desc ...

Detect links and render them as HTML links in repo description

Detect links and render them as HTML links in repo description

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

(refs #907)Omit the compare view for large diffs

feature/can select webhook events

Change the upload form for PDF files

Change a path for uploading a file

Enable to upload a PDF file

Set tabindex for the comment form.

Change place of Comment button and Close button.

Fix commit comment style

(refs #918)Fix pull request comment

Merge branch 'chazmuzz-master'

(refs #906)Shrink range which is applied style

Expatnd wiki page width

(refs #896)Add description and migration for separation of notification and SMTP configuration

Merge branch 'issue-893' of https://github.com/McFoggy/gitbucket into McFoggy-issue-893

Remove last committer from the file list

Update octicons

Merge branch 'SupportCloneInDesktop' of https://github.com/hikaruworld/gitbucket into hikaruworld-SupportCloneInDesktop

split SMTP & notification, fixes #893

(refs #864)Fix blame

Fix broken blame

Change a limit of initial amount of the repositories list

BugFix and improvement for pull request

Add show more link for repositories and wiki pages

Fix merge checking

Fix presentation of commit list in the pull request detail view

Merge pull request #886 from noc06140728/fix-octicon ...

Replace some icon to octicon

Fix merge guide to display ssh url

Replace some icon to octicon ...

- replace some of the non-octicon to octicon.
- adjust the color of octicon on the button.

modified icon is as follows.

- .icon-home          -> .octicon-home
- .icon-time          -> .octicon-clock
- .icon-ok            -> .octicon-check
- .icon-lock          -> .octicon-lock
- .icon-envelope      -> .octicon-mail
- .icon-pencil        -> .octicon-pencil
- .icon-remove-circle -> .octicon-x
- .icon-check         -> .octicon-clippy
- .icon-calendar      -> .octicon-calendar
- .icon-cog           -> .octicon-gear
- .icon-th-list       -> .octicon-list-unordered
- .icon-trash         -> .octicon-trashcan
- .icon-arrow-right   -> .octicon-arrow-right
- .icon-retweet       -> .octicon-git-compare
- .icon-comment       -> .octicon-comment

Improve issue and pull request creation form

Improve issue creation form

Merge pull request #882 from garygreen/shorten-commit-message ...

File listing and sidebar display improvements

Update merge guide

File listing and sidebar display improvements

Improve the pull request creation form

Remove unused code

Improve comparing view

Merge pull request #880 from garygreen/issues-gui ...

Improved design of issue

(refs #878)Hide the Delete button for other than the head of branch

Improved design of issue

Update main.scala.html ...

fix header plus dropdown menu display bug in safari and add 'Your profile' in user dropdown menu

(refs #865)Fix styles for repository viewer

(refs #865)Fix paginator of the commit list

(refs #865)Update commit list presentation

(refs #865)Fix presentation of file finder and blow view

(refs #865)Apply the flat style to box headers

Merge pull request #862 from McFoggy/plugins-info ...

list installed plugins in the system administration menu

add a comprehensive message when no plugin is detected on the installation

list installed plugins in the system administration menu

give an id to system admin menu container to allow plugin extension

(refs #848)Additional fix for header width

(refs #844)Improve global header menu

Merge branch 'beraboris-implement-668'

(refs #810)Some fix about pull request

Fix position of fork-form

Merge branch 'implement-668' of https://github.com/beraboris/gitbucket into beraboris-implement-668

Redirect to the repository after sign-in by clicking fork button

Small fix about icons

(refs #409)Fix icons

Merge branch 'master' of https://github.com/sapk/gitbucket into sapk-master

(refs #811)Remove html tags from title of atom feed

Atom feed now puts the activity message in title ...

Originally it used to put the activity type in the message. This gave
no useful information. The user had to open the news item to see what
was going on. Now, the title is the activity's message rendered to html.
Note that this is the same as the content of the news item.

This fixes #481

Fixed url generated by pull request/compare button ...

The `:` character was getting escaped leading to an ugly url. This is
different from the urls generated when editing the branches in a pull
request. In that case the url did not have `:` escaped.

Pullreqs in forks now use upstream master as origin ...

This implements #668.

Fix delete branch confirmation message

Add option to disable anchor for headline in markdown

Fix Wiki font style of Wiki editing form

(refs #769)go-import meta tag is generated for only public repos

(refs #769)Add go-import meta tag

(refs #775)Move isRenderable() to helpers from PluginRepository

(refs #775)Add new extension point to add markup render

(refs #773)Fix url processing in the blame view

add file finder button on blob view.

(refs #762)Add meta-tag to disable IE backward compatibility mode

Merge branch 'featuer/image-on-diff' of https://github.com/team-lab/gitbucket into team-lab-featuer/image-on-diff ...

# Conflicts:
#	src/main/webapp/assets/common/js/gitbucket.js

Merge branch 'feature/blame' of https://github.com/team-lab/gitbucket into team-lab-feature/blame ...

# Conflicts:
#	src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
#	src/main/webapp/assets/common/css/gitbucket.css

Merge pull request #696 from team-lab/feature/file-finder ...

add file finder

Merge remote-tracking branch 'upstream/master'

add image diff

Merge pull request #731 from ndarilek/master ...

Implement additional accessibility fixes

jQuery updated to v1.11.1

Merge pull request #716 from expf/fallback_message ...

Fix style of message for browsers that do not support drag'n'drop file u...

(refs #441)Add limit of activity log configuration

Add autofocus to forms at strategic places.

Label additional icons.

Label unlabelled icons for accessibility.

Fix style of message for browsers that do not support drag'n'drop file uploads

(refs #666)Remove html5shiv.js reference

(refs #712) Fix problems of showing inline notes.

add file finder

Merge branch 'feature/#422-compare-link-near-branch-selector' of https://github.com/team-lab/gitbucket into team-lab-feature/#422-compare-link-near-branch-selector ...

Conflicts:
	src/main/twirl/gitbucket/core/repo/files.scala.html

(#536) Browse commits for directory

(refs #442)show compare/pull request link near branch link.

Merge branch 'master' into feature/blame ...

Conflicts:
	src/main/scala/gitbucket/core/util/JGitUtil.scala

(refs #677)Fix Fork button for non group users

follow rename

fix link

fix for ie 7,8,9

fix for ie 5

fix for ie 7

Merge remote-tracking branch 'origin/api-support'

Fix layout

(refs #649) Fix condition of filtering issues from milestone view.

Merge pull request #643 from team-lab/feature/diff-ignore-space ...

Improvement diff

Merge remote-tracking branch 'origin/master' into api-support ...

Conflicts:
	src/main/scala/ScalatraBootstrap.scala
	src/main/scala/gitbucket/core/controller/AccountController.scala
	src/main/scala/gitbucket/core/controller/ControllerBase.scala
	src/main/scala/gitbucket/core/controller/IssuesController.scala
	src/main/scala/gitbucket/core/controller/PullRequestsController.scala
	src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala
	src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
	src/main/scala/gitbucket/core/model/Profile.scala
	src/main/scala/gitbucket/core/service/PullRequestService.scala
	src/main/scala/gitbucket/core/service/WebHookService.scala
	src/main/scala/gitbucket/core/servlet/InitializeListener.scala
	src/main/scala/gitbucket/core/view/helpers.scala
	src/main/twirl/gitbucket/core/pulls/conversation.scala.html
	src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html
	src/main/twirl/issues/listparts.scala.html

(refs #646)Add autocomplete="true" to password field

add diff stat bar

(refs #642)Fix markdown rendering style

Rebase + Remove all unused image

add filename for syntax highlight hint

Implements ignore-whitespace and hilight-syntax on diff. ...

Improvement experience speed
 * lazy diff rendering ( it is effective if tha diff has a lot of files ).
 * some feature implemented by javascript, to implement by css.
 * some javascript event handlers on each elements move to on parent elements.

Completely moved to octicon

...

Moved to octicon

implove source-line-num performance. ...

and Stop scroll when click line number.

add blame

Merge branch 'master' into profile_generalization

Change package name