Naoki Takezoe 539751a1d9 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

2016-03-06 13:07:03 +09:00

..

account

Fix broken presentation

2016-02-22 02:17:41 +09:00

admin

Merge UserManagementController to SystemSettingsController to reduce filter mapping

2016-03-05 11:31:59 +09:00

dashboard

Tweak top margin of contents

2016-02-15 09:11:57 +09:00

helper

Fix width of previewable editing forms

2016-02-27 02:56:22 +09:00

issues

Fix typo in issue comment list

2016-03-03 15:38:10 -05:00

pulls

Fix comment editing in pull request diff view

2016-02-27 04:48:46 +09:00

repo

Fix comment editing in pull request diff view

2016-02-27 04:48:46 +09:00

search

Add margin after octicon

2016-02-17 23:42:51 +09:00

settings

integrate xhub4j, fixes #1117

2016-03-02 22:25:21 +01:00

wiki

(fixes #1118)Remove duplicated <script>

2016-02-22 11:55:31 +09:00

error.scala.html

Change package name

2015-03-02 22:15:56 +09:00

index.scala.html

Tweak top margin of contents

2016-02-15 09:11:57 +09:00

main.scala.html

(refs #1084)Remove RepositoryUrls

2016-02-13 10:16:11 +09:00

menu.scala.html

Mobile view improvement

2016-02-16 02:51:09 +09:00

signin.scala.html

Change package name

2015-03-02 22:15:56 +09:00

signinform.scala.html

Use Bootstrap panels instead of GitBucket original styles

2015-12-09 18:29:41 +09:00