GitBucket 3.5.0 release

(refs #844 )Improve global header menu
Remove unnecessary spec
2026-05-07 23:25:51 +02:00 · 2015-08-01 01:30:32 +09:00 · 2015-07-28 21:53:51 +09:00 · 2015-07-28 11:16:02 +09:00 · 2015-07-28 11:13:51 +09:00 · 2015-07-28 11:12:11 +09:00
133 changed files with 1911 additions and 391 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
 *.class
 *.log
+.ensime
+.ensime_cache

 # sbt specific
 dist/*
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,5 @@
 language: scala
-scala:
-  - 2.11.6
+sudo: false
+script:
+  - . env.sh
+  - sbt test
--- a/README.md
+++ b/README.md
@@ -54,20 +54,22 @@ For Installation on Windows Server with IIS see [this wiki page](https://github.
 ### Mac OS X
 #### Installing Via Homebrew

-    $ brew install gitbucket
-    ==> Downloading https://github.com/takezoe/gitbucket/releases/download/1.10/gitbucket.war
-    ######################################################################## 100.0%
-    ==> Caveats
-    Note: When using launchctl the port will be 8080.
+```
+$ brew install gitbucket
+==> Downloading https://github.com/takezoe/gitbucket/releases/download/1.10/gitbucket.war
+######################################################################## 100.0%
+==> Caveats
+Note: When using launchctl the port will be 8080.

-    To have launchd start gitbucket at login:
-        ln -sfv /usr/local/opt/gitbucket/*.plist ~/Library/LaunchAgents
-    Then to load gitbucket now:
-        launchctl load ~/Library/LaunchAgents/homebrew.mxcl.gitbucket.plist
-    Or, if you don't want/need launchctl, you can just run:
-        java -jar /usr/local/opt/gitbucket/libexec/gitbucket.war
-    ==> Summary
-    /usr/local/Cellar/gitbucket/1.10: 3 files, 42M, built in 11 seconds
+To have launchd start gitbucket at login:
+    ln -sfv /usr/local/opt/gitbucket/*.plist ~/Library/LaunchAgents
+Then to load gitbucket now:
+    launchctl load ~/Library/LaunchAgents/homebrew.mxcl.gitbucket.plist
+Or, if you don't want/need launchctl, you can just run:
+    java -jar /usr/local/opt/gitbucket/libexec/gitbucket.war
+==> Summary
+/usr/local/Cellar/gitbucket/1.10: 3 files, 42M, built in 11 seconds
+```

 #### Manual Installation
 On OS X, copy the [gitbucket.plist](https://raw.github.com/takezoe/gitbucket/master/contrib/macosx/gitbucket.plist) file to `~/Library/LaunchAgents/`
@@ -79,6 +81,17 @@ Run the following commands in `Terminal` to

 Release Notes
 --------
+### 3.5 - 1 Aug 2015
+- Octicons has been applied
+- Global header has been enhanced. Now it's further similar to GitHub.
+- Default compare / pull request target has been changed to the parent repository
+- A lot of updates for [gitbucket-gist-plugin](https://github.com/takezoe/gitbucket-gist-plugin)
+
+### 3.4 - 27 Jun 2015
+- Declarative style plug-in definition
+- New extension point to add markup render
+- go-import support
+
 ### 3.3 - 31 May 2015
 - Rich graphical diff for images
 - File finder is available in the repository viewer
@@ -286,3 +299,7 @@ Release Notes

 ### 1.0 - 04 Jul 2013
 - This is a first public release
+
+Sponsors
+--------
+[![IntelliJ IDEA](https://www.jetbrains.com/idea/docs/logo_intellij_idea.png)](https://www.jetbrains.com/idea/)
--- a/doc/how_to_run.md
+++ b/doc/how_to_run.md
@@ -16,6 +16,8 @@ for Developers
 --------
 If you want to modify source code and confirm it, you can run GitBucket in auto reloading mode as following:

+Windows:
+
 ```
 C:\gitbucket> sbt
 ...
@@ -24,15 +26,38 @@ C:\gitbucket> sbt
 > ~ ;copy-resources;aux-compile
 ```

+Linux:
+
+```
+~/gitbucket$ ./sbt.sh
+...
+> container:start
+...
+> ~ ;copy-resources;aux-compile
+```
+
 Build war file
 --------

 To build war file, run the following command:

+Windows:
+
 ```
 C:\gitbucket> sbt package
 ```

+Linux:
+
+```
+~/gitbucket$ ./sbt.sh package
+```
+
 `gitbucket_2.11-x.x.x.war` is generated into `target/scala-2.11`.

-To build executable war file, run Ant at the top of the source tree. It generates executable `gitbucket.war` into `target/scala-2.11`. We release this war file as release artifact. Please note the current build.xml works on Windows only. Replace `sbt.bat` with `sbt.sh` in build.xml if you want to run it on Linux.
+To build executable war file, run
+
+*  Windows: Not available
+*  Linux: `./release/make-release-war.sh`
+
+at the top of the source tree. It generates executable `gitbucket.war` into `target/scala-2.11`. We release this war file as release artifact.
--- a/doc/icons.svg
+++ b/doc/icons.svg
@@ -379,21 +379,21 @@
      <path d="M588.909,926.673 L560.094,910.545 L564.713,935.73 L588.909,926.673 z" fill-opacity="0" stroke="#B3B3B3" stroke-width="1.313" stroke-linecap="round"/>
    </g>
    <g id="rect3075-11">
-      <path d="M779.562,898.094 C779.396,912.75 779.229,927.406 779.062,942.062 C781.26,942.084 783.458,942.104 785.656,942.125 C784.104,943.688 782.552,945.25 781,946.813 C801.708,967.521 822.417,988.229 843.125,1008.938 C858.531,993.531 873.938,978.125 889.344,962.719 C868.635,942 847.927,921.281 827.219,900.563 C825.49,902.302 823.76,904.042 822.031,905.781 C822.052,903.386 822.073,900.99 822.094,898.594 C807.917,898.427 793.74,898.261 779.563,898.094 z" fill="#FFFFFF"/>
-      <path d="M779.562,898.094 C779.396,912.75 779.229,927.406 779.062,942.062 C781.26,942.084 783.458,942.104 785.656,942.125 C784.104,943.688 782.552,945.25 781,946.813 C801.708,967.521 822.417,988.229 843.125,1008.938 C858.531,993.531 873.938,978.125 889.344,962.719 C868.635,942 847.927,921.281 827.219,900.563 C825.49,902.302 823.76,904.042 822.031,905.781 C822.052,903.386 822.073,900.99 822.094,898.594 C807.917,898.427 793.74,898.261 779.563,898.094 z" fill-opacity="0" stroke="#B3B3B3" stroke-width="9" stroke-linecap="round"/>
+      <path d="M1389.845,733.625 C1389.679,748.281 1389.512,762.937 1389.345,777.593 C1391.543,777.615 1393.741,777.635 1395.939,777.656 C1394.387,779.219 1392.835,780.781 1391.283,782.344 C1411.991,803.052 1432.7,823.76 1453.408,844.469 C1468.814,829.062 1484.221,813.656 1499.627,798.25 C1478.918,777.531 1458.21,756.812 1437.502,736.094 C1435.773,737.833 1434.043,739.573 1432.314,741.312 C1432.335,738.917 1432.356,736.521 1432.377,734.125 C1418.2,733.958 1404.023,733.792 1389.846,733.625 z" fill="#FFFFFF"/>
+      <path d="M1389.845,733.625 C1389.679,748.281 1389.512,762.937 1389.345,777.593 C1391.543,777.615 1393.741,777.635 1395.939,777.656 C1394.387,779.219 1392.835,780.781 1391.283,782.344 C1411.991,803.052 1432.7,823.76 1453.408,844.469 C1468.814,829.062 1484.221,813.656 1499.627,798.25 C1478.918,777.531 1458.21,756.812 1437.502,736.094 C1435.773,737.833 1434.043,739.573 1432.314,741.312 C1432.335,738.917 1432.356,736.521 1432.377,734.125 C1418.2,733.958 1404.023,733.792 1389.846,733.625 z" fill-opacity="0" stroke="#B3B3B3" stroke-width="9" stroke-linecap="round"/>
    </g>
    <path d="M606.483,964.91 L606.483,951.243 L672.089,951.243 L672.089,964.91 z" fill="#B3B3B3" id="rect2995-0-2-8-6"/>
    <g id="rect3075-11-7">
-      <path d="M786.383,905.075 C786.256,916.229 786.129,927.383 786.003,938.537 C787.675,938.553 789.348,938.568 791.021,938.584 C789.839,939.773 788.658,940.963 787.477,942.152 C803.237,957.911 818.997,973.671 834.756,989.431 C846.481,977.706 858.206,965.982 869.93,954.257 C854.171,938.489 838.411,922.722 822.651,906.954 C821.335,908.278 820.019,909.602 818.703,910.926 C818.719,909.102 818.734,907.279 818.751,905.456 C807.961,905.329 797.172,905.202 786.383,905.075 z" fill="#FFFFFF"/>
-      <path d="M786.383,905.075 C786.256,916.229 786.129,927.383 786.003,938.537 C787.675,938.553 789.348,938.568 791.021,938.584 C789.839,939.773 788.658,940.963 787.477,942.152 C803.237,957.911 818.997,973.671 834.756,989.431 C846.481,977.706 858.206,965.982 869.93,954.257 C854.171,938.489 838.411,922.722 822.651,906.954 C821.335,908.278 820.019,909.602 818.703,910.926 C818.719,909.102 818.734,907.279 818.751,905.456 C807.961,905.329 797.172,905.202 786.383,905.075 z" fill-opacity="0" stroke="#FFFFFF" stroke-width="6.849" stroke-linecap="round"/>
+      <path d="M1396.666,740.606 C1396.539,751.76 1396.412,762.914 1396.286,774.068 C1397.958,774.084 1399.631,774.099 1401.304,774.115 C1400.122,775.304 1398.941,776.494 1397.76,777.683 C1413.52,793.442 1429.28,809.202 1445.039,824.962 C1456.764,813.237 1468.489,801.513 1480.213,789.788 C1464.454,774.02 1448.694,758.253 1432.934,742.485 C1431.618,743.809 1430.302,745.133 1428.986,746.457 C1429.002,744.633 1429.017,742.81 1429.034,740.987 C1418.244,740.86 1407.455,740.733 1396.666,740.606 z" fill="#FFFFFF"/>
+      <path d="M1396.666,740.606 C1396.539,751.76 1396.412,762.914 1396.286,774.068 C1397.958,774.084 1399.631,774.099 1401.304,774.115 C1400.122,775.304 1398.941,776.494 1397.76,777.683 C1413.52,793.442 1429.28,809.202 1445.039,824.962 C1456.764,813.237 1468.489,801.513 1480.213,789.788 C1464.454,774.02 1448.694,758.253 1432.934,742.485 C1431.618,743.809 1430.302,745.133 1428.986,746.457 C1429.002,744.633 1429.017,742.81 1429.034,740.987 C1418.244,740.86 1407.455,740.733 1396.666,740.606 z" fill-opacity="0" stroke="#FFFFFF" stroke-width="6.849" stroke-linecap="round"/>
    </g>
    <g id="path3100-2">
-      <path d="M813.748,916.688 C818.255,921.195 818.255,928.501 813.748,933.008 C809.242,937.514 801.935,937.514 797.429,933.008 C792.922,928.501 792.922,921.195 797.429,916.688 C801.935,912.182 809.242,912.182 813.748,916.688 z" fill="#FFFFFF"/>
-      <path d="M813.748,916.688 C818.255,921.195 818.255,928.501 813.748,933.008 C809.242,937.514 801.935,937.514 797.429,933.008 C792.922,928.501 792.922,921.195 797.429,916.688 C801.935,912.182 809.242,912.182 813.748,916.688 z" fill-opacity="0" stroke="#B3B3B3" stroke-width="7.585" stroke-linecap="round"/>
+      <path d="M1424.031,752.219 C1428.538,756.726 1428.538,764.032 1424.031,768.539 C1419.525,773.045 1412.218,773.045 1407.712,768.539 C1403.205,764.032 1403.205,756.726 1407.712,752.219 C1412.218,747.713 1419.525,747.713 1424.031,752.219 z" fill="#FFFFFF"/>
+      <path d="M1424.031,752.219 C1428.538,756.726 1428.538,764.032 1424.031,768.539 C1419.525,773.045 1412.218,773.045 1407.712,768.539 C1403.205,764.032 1403.205,756.726 1407.712,752.219 C1412.218,747.713 1419.525,747.713 1424.031,752.219 z" fill-opacity="0" stroke="#B3B3B3" stroke-width="7.585" stroke-linecap="round"/>
    </g>
    <g id="rect4114">
-      <path d="M813.845,955.107 L834.888,934.064 L864.012,963.188 L842.969,984.231 z" fill="#FFFFFF"/>
-      <path d="M813.845,955.107 L834.888,934.064 L864.012,963.188 L842.969,984.231 z" fill-opacity="0" stroke="#B3B3B3" stroke-width="7.133"/>
+      <path d="M1424.128,790.638 L1445.171,769.595 L1474.295,798.719 L1453.252,819.762 z" fill="#FFFFFF"/>
+      <path d="M1424.128,790.638 L1445.171,769.595 L1474.295,798.719 L1453.252,819.762 z" fill-opacity="0" stroke="#B3B3B3" stroke-width="7.133"/>
    </g>
    <g id="path2991-7-6">
      <path d="M969.889,84.636 C969.889,122.652 939.072,153.469 901.056,153.469 C863.04,153.469 832.223,122.652 832.223,84.636 C832.223,46.62 863.04,15.803 901.056,15.803 C939.072,15.803 969.889,46.62 969.889,84.636 z" fill="#A0A0A0"/>
@@ -750,5 +750,45 @@
    </g>
    <path d="M1396.792,592.168 C1426.908,592.168 1450.613,610.989 1450.613,639.54" fill-opacity="0" stroke="#A0A0A0" stroke-width="20" stroke-linecap="round"/>
    <path d="M1397.792,545.653 C1453.613,544.493 1499.627,588.735 1499.627,636.54" fill-opacity="0" stroke="#A0A0A0" stroke-width="20" stroke-linecap="round"/>
+    <path d="M871.125,1039.025 C871.125,1039.025 873.794,1016.889 908.043,1011.524 C919.748,1009.691 945.861,1005.107 945.861,978.522" fill-opacity="0" stroke="#A0A0A0" stroke-width="17.059" id="path3207"/>
+    <g id="rect3818-4-8-4">
+      <path d="M869.474,950.497 L871.997,950.497 L871.997,1031.308 L869.474,1031.308 z" fill="#A0A0A0"/>
+      <g>
+        <path d="M869.474,950.497 L871.997,950.497 L871.997,1031.308 L869.474,1031.308 z" fill="#A0A0A0"/>
+        <path d="M869.474,950.497 L871.997,950.497 L871.997,1031.308 L869.474,1031.308 z" fill-opacity="0" stroke="#A0A0A0" stroke-width="15"/>
+      </g>
+    </g>
+    <g id="path3795-4-8-7-8">
+      <path d="M888.074,1051.656 C888.074,1060.906 880.5,1068.405 871.159,1068.405 C861.817,1068.405 854.243,1060.906 854.243,1051.656 C854.243,1042.406 861.817,1034.908 871.159,1034.908 C880.5,1034.908 888.074,1042.406 888.074,1051.656 z" fill="#FFFFFF"/>
+      <path d="M888.074,1051.656 C888.074,1060.906 880.5,1068.405 871.159,1068.405 C861.817,1068.405 854.243,1060.906 854.243,1051.656 C854.243,1042.406 861.817,1034.908 871.159,1034.908 C880.5,1034.908 888.074,1042.406 888.074,1051.656 z" fill-opacity="0" stroke="#A0A0A0" stroke-width="7.989"/>
+    </g>
+    <g id="path3795-8-4-8">
+      <path d="M886.883,935.155 C886.883,944.404 879.31,951.903 869.968,951.903 C860.626,951.903 853.054,944.404 853.054,935.155 C853.054,925.904 860.626,918.405 869.968,918.405 C879.31,918.405 886.883,925.904 886.883,935.155 z" fill="#FFFFFF"/>
+      <path d="M886.883,935.155 C886.883,944.404 879.31,951.903 869.968,951.903 C860.626,951.903 853.054,944.404 853.054,935.155 C853.054,925.904 860.626,918.405 869.968,918.405 C879.31,918.405 886.883,925.904 886.883,935.155 z" fill-opacity="0" stroke="#A0A0A0" stroke-width="7.989"/>
+    </g>
+    <g id="path3795-8-4-8-2">
+      <path d="M965.046,971.602 C965.046,980.852 957.472,988.351 948.13,988.351 C938.789,988.351 931.215,980.852 931.215,971.602 C931.215,962.352 938.789,954.854 948.13,954.854 C957.472,954.854 965.046,962.352 965.046,971.602 z" fill="#FFFFFF"/>
+      <path d="M965.046,971.602 C965.046,980.852 957.472,988.351 948.13,988.351 C938.789,988.351 931.215,980.852 931.215,971.602 C931.215,962.352 938.789,954.854 948.13,954.854 C957.472,954.854 965.046,962.352 965.046,971.602 z" fill-opacity="0" stroke="#A0A0A0" stroke-width="7.989"/>
+    </g>
+    <path d="M1114.353,1042.412 C1114.353,1042.412 1117.022,1020.275 1151.271,1014.91 C1162.976,1013.077 1189.089,1008.493 1189.089,981.909" fill-opacity="0" stroke="#000000" stroke-width="17.059" id="path3207"/>
+    <g id="rect3818-4-8-4">
+      <path d="M1112.701,953.884 L1115.225,953.884 L1115.225,1034.695 L1112.701,1034.695 z" fill="#A0A0A0"/>
+      <g>
+        <path d="M1112.701,953.884 L1115.225,953.884 L1115.225,1034.695 L1112.701,1034.695 z" fill="#A0A0A0"/>
+        <path d="M1112.701,953.884 L1115.225,953.884 L1115.225,1034.695 L1112.701,1034.695 z" fill-opacity="0" stroke="#000000" stroke-width="15"/>
+      </g>
+    </g>
+    <g id="path3795-4-8-7-8">
+      <path d="M1131.302,1055.043 C1131.302,1064.293 1123.728,1071.791 1114.386,1071.791 C1105.045,1071.791 1097.471,1064.293 1097.471,1055.043 C1097.471,1045.792 1105.045,1038.294 1114.386,1038.294 C1123.728,1038.294 1131.302,1045.792 1131.302,1055.043 z" fill="#FFFFFF"/>
+      <path d="M1131.302,1055.043 C1131.302,1064.293 1123.728,1071.791 1114.386,1071.791 C1105.045,1071.791 1097.471,1064.293 1097.471,1055.043 C1097.471,1045.792 1105.045,1038.294 1114.386,1038.294 C1123.728,1038.294 1131.302,1045.792 1131.302,1055.043 z" fill-opacity="0" stroke="#000000" stroke-width="7.989"/>
+    </g>
+    <g id="path3795-8-4-8">
+      <path d="M1130.111,938.542 C1130.111,947.791 1122.537,955.29 1113.196,955.29 C1103.854,955.29 1096.282,947.791 1096.282,938.542 C1096.282,929.291 1103.854,921.792 1113.196,921.792 C1122.537,921.792 1130.111,929.291 1130.111,938.542 z" fill="#FFFFFF"/>
+      <path d="M1130.111,938.542 C1130.111,947.791 1122.537,955.29 1113.196,955.29 C1103.854,955.29 1096.282,947.791 1096.282,938.542 C1096.282,929.291 1103.854,921.792 1113.196,921.792 C1122.537,921.792 1130.111,929.291 1130.111,938.542 z" fill-opacity="0" stroke="#000000" stroke-width="7.989"/>
+    </g>
+    <g id="path3795-8-4-8-2">
+      <path d="M1208.274,974.989 C1208.274,984.239 1200.7,991.738 1191.358,991.738 C1182.016,991.738 1174.443,984.239 1174.443,974.989 C1174.443,965.739 1182.016,958.241 1191.358,958.241 C1200.7,958.241 1208.274,965.739 1208.274,974.989 z" fill="#FFFFFF"/>
+      <path d="M1208.274,974.989 C1208.274,984.239 1200.7,991.738 1191.358,991.738 C1182.016,991.738 1174.443,984.239 1174.443,974.989 C1174.443,965.739 1182.016,958.241 1191.358,958.241 C1200.7,958.241 1208.274,965.739 1208.274,974.989 z" fill-opacity="0" stroke="#000000" stroke-width="7.989"/>
+    </g>
  </g>
 </svg>
--- a/doc/release.md
+++ b/doc/release.md
@@ -12,7 +12,7 @@ Note to update version number in files below:
 object MyBuild extends Build {
  val Organization = "gitbucket"
  val Name = "gitbucket"
-  val Version = "3.2.0" // <---- update here!!
+  val Version = "3.3.0" // <---- update version!!
  val ScalaVersion = "2.11.6"
  val ScalatraVersion = "2.3.1"
 ```
@@ -26,25 +26,8 @@ object AutoUpdate {
   * The history of versions. A head of this sequence is the current BitBucket version.
   */
  val versions = Seq(
-    new Version(3, 2), // <---- add this!!
-    new Version(3, 1),
-    ...
-```
-
-### deploy-assembly/deploy-assembly-jar.sh
-
-```bash
-#!/bin/sh
-./sbt.sh assembly
-
-mvn deploy:deploy-file \
-  -DgroupId=gitbucket\
-  -DartifactId=gitbucket-assembly\
-  -Dversion=3.2.0\ # <---- update here!!
-  -Dpackaging=jar\
-  -Dfile=../target/scala-2.11/gitbucket-assembly-x.x.x.jar\ # <---- update here!!
-  -DrepositoryId=sourceforge.jp\
-  -Durl=scp://shell.sourceforge.jp/home/groups/a/am/amateras/htdocs/mvn/
+    new Version(3, 3), // <---- add this line!!
+    new Version(3, 2),
 ```

 Generate release files
@@ -54,15 +37,18 @@ Note: Release operation requires [Ant](http://ant.apache.org/) and [Maven](https

 ### Make release war file

-Run ant with `build.xml` in the root directory. The release war file is generated into `target/scala-2.11/gitbucket.war`.
+Run `release/make-release-war.sh`. The release war file is generated into `target/scala-2.11/gitbucket.war`.

-### Deploy assemnbly jar file
-
-For plug-in development, we have to publish the assembly jar file to the public Maven repository.
-
-```
-cd deploy-assembly/
-./deploy-assembly-jar.sh
+```bash
+$ cd release
+$ ./make-release-war.sh
 ```

-This script runs `sbt assembly` and `mvn deploy`.
+### Deploy assembly jar file
+
+For plug-in development, we have to publish the assembly jar file to the public Maven repository by `release/deploy-assembly-jar.sh`.
+
+```bash
+$ cd release/
+$ ./deploy-assembly-jar.sh
+```
--- a/env.sh
+++ b/env.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+export GITBUCKET_VERSION=`cat project/build.scala | grep 'val Version' | cut -d \" -f 2`
+echo "GITBUCKET_VERSION: $GITBUCKET_VERSION"
--- a/project/build.scala
+++ b/project/build.scala
@@ -10,7 +10,7 @@ import sbtassembly.AssemblyKeys._
 object MyBuild extends Build {
  val Organization = "gitbucket"
  val Name = "gitbucket"
-  val Version = "3.3.0"
+  val Version = "3.5.0"
  val ScalaVersion = "2.11.6"
  val ScalatraVersion = "2.3.1"

@@ -50,7 +50,7 @@ object MyBuild extends Build {
      "org.json4s" %% "json4s-jackson" % "3.2.11",
      "jp.sf.amateras" %% "scalatra-forms" % "0.1.0",
      "commons-io" % "commons-io" % "2.4",
-      "org.pegdown" % "pegdown" % "1.4.1", // 1.4.2 has incompatible APi changes
+      "org.pegdown" % "pegdown" % "1.5.0",
      "org.apache.commons" % "commons-compress" % "1.9",
      "org.apache.commons" % "commons-email" % "1.3.3",
      "org.apache.httpcomponents" % "httpclient" % "4.3.6",
@@ -64,9 +64,8 @@ object MyBuild extends Build {
      "junit" % "junit" % "4.12" % "test",
      "com.mchange" % "c3p0" % "0.9.5",
      "com.typesafe" % "config" % "1.2.1",
-      "com.typesafe.play" %% "twirl-compiler" % "1.0.4",
      "com.typesafe.akka" %% "akka-actor" % "2.3.10",
-      "com.enragedginger" %% "akka-quartz-scheduler" % "1.3.0-akka-2.3.x"
+      "com.enragedginger" %% "akka-quartz-scheduler" % "1.3.0-akka-2.3.x"  exclude("c3p0","c3p0")
    ),
    play.twirl.sbt.Import.TwirlKeys.templateImports += "gitbucket.core._",
    EclipseKeys.withSource := true,
--- a/release/build.xml
+++ b/release/build.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<project name="gitbucket" default="all" basedir=".">
+<project name="gitbucket" default="all" basedir="..">

+  <property environment="env"/>
  <property name="target.dir" value="target"/>
  <property name="embed.classes.dir" value="${target.dir}/embed-classes"/>
  <property name="jetty.dir" value="embed-jetty"/>
  <property name="scala.version" value="2.11"/>
-  <property name="gitbucket.version" value="3.2.0"/>
+  <property name="gitbucket.version" value="${env.GITBUCKET_VERSION}"/>
  <property name="jetty.version" value="8.1.16.v20140903"/>
  <property name="servlet.version" value="3.0.0.v201112011016"/>

--- a/deploy-assembly/deploy-assembly-jar.sh
+++ b/deploy-assembly/deploy-assembly-jar.sh
@@ -1,11 +1,15 @@
 #!/bin/sh
+. ../env.sh
+
+cd ../
 ./sbt.sh clean assembly

+cd release
 mvn deploy:deploy-file \
  -DgroupId=gitbucket\
  -DartifactId=gitbucket-assembly\
-  -Dversion=3.2.0\
+  -Dversion=$GITBUCKET_VERSION\
  -Dpackaging=jar\
-  -Dfile=../target/scala-2.11/gitbucket-assembly-3.3.0.jar\
+  -Dfile=../target/scala-2.11/gitbucket-assembly-$GITBUCKET_VERSION.jar\
  -DrepositoryId=sourceforge.jp\
  -Durl=scp://shell.sourceforge.jp/home/groups/a/am/amateras/htdocs/mvn/
--- a/release/make-release-war.sh
+++ b/release/make-release-war.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+D="$(dirname "$0")"
+D="$(cd "${D}"; pwd)"
+DD="$(dirname "${D}")"
+(
+  for f in "${DD}/env.sh" "${D}/build.xml"; do
+    if [ ! -s "${f}" ]; then
+      echo >&2 "$0: Unable to access file '${f}'"
+      exit 1
+    fi
+  done
+  cd "${DD}"
+  . "${DD}/env.sh"
+  ant -f "${D}/build.xml" all
+)
--- a/deploy-assembly/pom.xml
+++ b/deploy-assembly/pom.xml
--- a/src/main/scala/gitbucket/core/controller/AccountController.scala
+++ b/src/main/scala/gitbucket/core/controller/AccountController.scala
@@ -91,7 +91,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {

  val newRepositoryForm = mapping(
    "owner"        -> trim(label("Owner"          , text(required, maxlength(40), identifier, existsAccount))),
-    "name"         -> trim(label("Repository name", text(required, maxlength(40), identifier, uniqueRepository))),
+    "name"         -> trim(label("Repository name", text(required, maxlength(40), repository, uniqueRepository))),
    "description"  -> trim(label("Description"    , optional(text()))),
    "isPrivate"    -> trim(label("Repository Type", boolean())),
    "createReadme" -> trim(label("Create README"  , boolean()))
@@ -467,6 +467,14 @@ trait AccountControllerBase extends AccountManagementControllerBase {
          parentUserName       = Some(repository.owner)
        )

+        // Add collaborators for group repository
+        val ownerAccount = getAccountByUserName(accountName).get
+        if(ownerAccount.isGroupAccount){
+          getGroupMembers(accountName).foreach { member =>
+            addCollaborator(accountName, repository.name, member.userName)
+          }
+        }
+
        // Insert default labels
        insertDefaultLabels(accountName, repository.name)

--- a/src/main/scala/gitbucket/core/controller/IssuesController.scala
+++ b/src/main/scala/gitbucket/core/controller/IssuesController.scala
@@ -348,9 +348,12 @@ trait IssuesControllerBase extends ControllerBase {

  private def createReferComment(owner: String, repository: String, fromIssue: Issue, message: String) = {
    StringUtil.extractIssueId(message).foreach { issueId =>
+      val content = fromIssue.issueId + ":" + fromIssue.title
      if(getIssue(owner, repository, issueId).isDefined){
-        createComment(owner, repository, context.loginAccount.get.userName, issueId.toInt,
-                      fromIssue.issueId + ":" + fromIssue.title, "refer")
+        // Not add if refer comment already exist.
+        if(!getComments(owner, repository, issueId.toInt).exists { x => x.action == "refer" && x.content == content }) {
+          createComment(owner, repository, context.loginAccount.get.userName, issueId.toInt, content, "refer")
+        }
      }
    }
  }
--- a/src/main/scala/gitbucket/core/controller/PullRequestsController.scala
+++ b/src/main/scala/gitbucket/core/controller/PullRequestsController.scala
@@ -281,12 +281,18 @@ trait PullRequestsControllerBase extends ControllerBase {
    val (forkedOwner, forkedId) = parseCompareIdentifie(forked, forkedRepository.owner)

    (for(
-      originRepositoryName <- if(originOwner == forkedOwner){
+      originRepositoryName <- if(originOwner == forkedOwner) {
+        // Self repository
        Some(forkedRepository.name)
+      } else if(Some(originOwner) == forkedRepository.repository.originUserName){
+        // Original repository
+        forkedRepository.repository.originRepositoryName
      } else {
-        forkedRepository.repository.originRepositoryName.orElse {
-          getForkedRepositories(forkedRepository.owner, forkedRepository.name).find(_._1 == originOwner).map(_._2)
-        }
+        // Sibling repository
+        getUserRepositories(originOwner, context.baseUrl).find { x =>
+          x.repository.originUserName == forkedRepository.repository.originUserName &&
+            x.repository.originRepositoryName == forkedRepository.repository.originRepositoryName
+        }.map(_.repository.repositoryName)
      };
      originRepository <- getRepository(originOwner, originRepositoryName, context.baseUrl)
    ) yield {
--- a/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
+++ b/src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala
@@ -1,6 +1,7 @@
 package gitbucket.core.controller

 import gitbucket.core.api._
+import gitbucket.core.plugin.PluginRegistry
 import gitbucket.core.repo.html
 import gitbucket.core.helper
 import gitbucket.core.service._
@@ -435,10 +436,16 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   * Displays branches.
   */
  get("/:owner/:repository/branches")(referrersOnly { repository =>
-    val branches = JGitUtil.getBranches(repository.owner, repository.name, repository.repository.defaultBranch)
-      .sortBy(br => (br.mergeInfo.isEmpty, br.commitTime))
-      .map(br => br -> getPullRequestByRequestCommit(repository.owner, repository.name, repository.repository.defaultBranch, br.name, br.commitId))
-      .reverse
+    val branches = JGitUtil.getBranches(
+      owner         = repository.owner,
+      name          = repository.name,
+      defaultBranch = repository.repository.defaultBranch,
+      origin        = repository.repository.originUserName.isEmpty
+    )
+    .sortBy(br => (br.mergeInfo.isEmpty, br.commitTime))
+    .map(br => br -> getPullRequestByRequestCommit(repository.owner, repository.name, repository.repository.defaultBranch, br.name, br.commitId))
+    .reverse
+
    html.branches(branches, hasWritePermission(repository.owner, repository.name, context.loginAccount), repository)
  })

@@ -546,7 +553,9 @@ trait RepositoryViewerControllerBase extends ControllerBase {
  }


-  private val readmeFiles = view.helpers.renderableSuffixes.map(suffix => s"readme${suffix}") ++ Seq("readme.txt", "readme")
+  private val readmeFiles = PluginRegistry().renderableExtensions.map { extension =>
+    s"readme.${extension}"
+  } ++ Seq("readme.txt", "readme")

  /**
   * Provides HTML of the file list.
--- a/src/main/scala/gitbucket/core/plugin/GitRepositoryRouting.scala
+++ b/src/main/scala/gitbucket/core/plugin/GitRepositoryRouting.scala
@@ -0,0 +1,42 @@
+package gitbucket.core.plugin
+
+import gitbucket.core.model.Session
+import gitbucket.core.service.SystemSettingsService.SystemSettings
+
+/**
+ * Define the Git repository routing.
+ *
+ * @param urlPattern the regular expression which matches the repository path (e.g. "gist/(.+?)/(.+?)\\.git")
+ * @param localPath the string to assemble local file path of repository (e.g. "gist/$1/$2")
+ * @param filter the filter for request to the Git repository which is defined by this routing
+ */
+case class GitRepositoryRouting(urlPattern: String, localPath: String, filter: GitRepositoryFilter){
+
+  def this(urlPattern: String, localPath: String) = {
+    this(urlPattern, localPath, new GitRepositoryFilter(){
+      def filter(repositoryName: String, userName: Option[String], settings: SystemSettings, isUpdating: Boolean)
+                (implicit session: Session): Boolean = true
+    })
+  }
+
+}
+
+/**
+ * Filters request to plug-in served repository. This is used to provide authentication mainly.
+ */
+trait GitRepositoryFilter {
+
+  /**
+   * Filters request to Git repository. If this method returns true then request is accepted.
+   *
+   * @param path the repository path which starts with '/'
+   * @param userName the authenticated user name or None
+   * @param settings the system settings
+   * @param isUpdating true if update request, otherwise false
+   * @param session the database session
+   * @return true if allow accessing to repository, otherwise false.
+   */
+  def filter(path: String, userName: Option[String], settings: SystemSettings, isUpdating: Boolean)
+            (implicit session: Session): Boolean
+
+}
--- a/src/main/scala/gitbucket/core/plugin/Plugin.scala
+++ b/src/main/scala/gitbucket/core/plugin/Plugin.scala
@@ -1,7 +1,9 @@
 package gitbucket.core.plugin

 import javax.servlet.ServletContext
+import gitbucket.core.controller.ControllerBase
 import gitbucket.core.service.SystemSettingsService.SystemSettings
+import gitbucket.core.util.ControlUtil._
 import gitbucket.core.util.Version

 /**
@@ -15,16 +17,92 @@ trait Plugin {
  val description: String
  val versions: Seq[Version]

+  /**
+   * Override to declare this plug-in provides images.
+   */
+  val images: Seq[(String, Array[Byte])] = Nil
+
+  /**
+   * Override to declare this plug-in provides images.
+   */
+  def images(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(String, Array[Byte])] = Nil
+
+  /**
+   * Override to declare this plug-in provides controllers.
+   */
+  val controllers: Seq[(String, ControllerBase)] = Nil
+
+  /**
+   * Override to declare this plug-in provides controllers.
+   */
+  def controllers(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(String, ControllerBase)] = Nil
+
+  /**
+   * Override to declare this plug-in provides JavaScript.
+   */
+  val javaScripts: Seq[(String, String)] = Nil
+
+  /**
+   * Override to declare this plug-in provides JavaScript.
+   */
+  def javaScripts(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(String, String)] = Nil
+
+  /**
+   * Override to declare this plug-in provides renderers.
+   */
+  val renderers: Seq[(String, Renderer)] = Nil
+
+  /**
+   * Override to declare this plug-in provides renderers.
+   */
+  def renderers(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[(String, Renderer)] = Nil
+
+  /**
+   * Override to add git repository routings.
+   */
+  val repositoryRoutings: Seq[GitRepositoryRouting] = Nil
+
+  /**
+   * Override to add git repository routings.
+   */
+  def repositoryRoutings(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Seq[GitRepositoryRouting] = Nil
+
  /**
   * This method is invoked in initialization of plugin system.
   * Register plugin functionality to PluginRegistry.
   */
-  def initialize(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Unit
+  def initialize(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Unit = {
+    (images ++ images(registry, context, settings)).foreach { case (id, in) =>
+      registry.addImage(id, in)
+    }
+    (controllers ++ controllers(registry, context, settings)).foreach { case (path, controller) =>
+      registry.addController(path, controller)
+    }
+    (javaScripts ++ javaScripts(registry, context, settings)).foreach { case (path, script) =>
+      registry.addJavaScript(path, script)
+    }
+    (renderers ++ renderers(registry, context, settings)).foreach { case (extension, renderer) =>
+      registry.addRenderer(extension, renderer)
+    }
+    (repositoryRoutings ++ repositoryRoutings(registry, context, settings)).foreach { routing =>
+      registry.addRepositoryRouting(routing)
+    }
+  }

  /**
   * This method is invoked in shutdown of plugin system.
   * If the plugin has any resources, release them in this method.
   */
-  def shutdown(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Unit
+  def shutdown(registry: PluginRegistry, context: ServletContext, settings: SystemSettings): Unit = {}
+
+  /**
+   * Helper method to get a resource from classpath.
+   */
+  protected def fromClassPath(path: String): Array[Byte] =
+    using(getClass.getClassLoader.getResourceAsStream(path)){ in =>
+      val bytes = new Array[Byte](in.available)
+      in.read(bytes)
+      bytes
+    }

 }
--- a/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala
+++ b/src/main/scala/gitbucket/core/plugin/PluginRegistory.scala
@@ -24,6 +24,11 @@ class PluginRegistry {
  private val javaScripts = new ListBuffer[(String, String)]
  private val controllers = new ListBuffer[(ControllerBase, String)]
  private val images = mutable.Map[String, String]()
+  private val renderers = mutable.Map[String, Renderer]()
+  renderers ++= Seq(
+    "md" -> MarkdownRenderer, "markdown" -> MarkdownRenderer
+  )
+  private val repositoryRoutings = new ListBuffer[GitRepositoryRouting]

  def addPlugin(pluginInfo: PluginInfo): Unit = {
    plugins += pluginInfo
@@ -31,34 +36,68 @@ class PluginRegistry {

  def getPlugins(): List[PluginInfo] = plugins.toList

+  def addImage(id: String, bytes: Array[Byte]): Unit = {
+    val encoded = StringUtils.newStringUtf8(Base64.encodeBase64(bytes, false))
+    images += ((id, encoded))
+  }
+
+  @deprecated("Use addImage(id: String, bytes: Array[Byte]) instead", "3.4.0")
  def addImage(id: String, in: InputStream): Unit = {
    val bytes = using(in){ in =>
      val bytes = new Array[Byte](in.available)
      in.read(bytes)
      bytes
    }
-    val encoded = StringUtils.newStringUtf8(Base64.encodeBase64(bytes, false))
-    images += ((id, encoded))
+    addImage(id, bytes)
  }

  def getImage(id: String): String = images(id)

-  def addController(controller: ControllerBase, path: String): Unit = {
+  def addController(path: String, controller: ControllerBase): Unit = {
    controllers += ((controller, path))
  }

-  def getControllers(): List[(ControllerBase, String)] = controllers.toList
-
-  def addJavaScript(path: String, script: String): Unit = {
-    javaScripts += Tuple2(path, script)
+  @deprecated("Use addController(path: String, controller: ControllerBase) instead", "3.4.0")
+  def addController(controller: ControllerBase, path: String): Unit = {
+    addController(path, controller)
  }

-  //def getJavaScripts(): List[(String, String)] = javaScripts.toList
+  def getControllers(): Seq[(ControllerBase, String)] = controllers.toSeq
+
+  def addJavaScript(path: String, script: String): Unit = {
+    javaScripts += ((path, script))
+  }

  def getJavaScript(currentPath: String): List[String] = {
    javaScripts.filter(x => currentPath.matches(x._1)).toList.map(_._2)
  }

+  def addRenderer(extension: String, renderer: Renderer): Unit = {
+    renderers += ((extension, renderer))
+  }
+
+  def getRenderer(extension: String): Renderer = {
+    renderers.get(extension).getOrElse(DefaultRenderer)
+  }
+
+  def renderableExtensions: Seq[String] = renderers.keys.toSeq
+
+  def addRepositoryRouting(routing: GitRepositoryRouting): Unit = {
+    repositoryRoutings += routing
+  }
+
+  def getRepositoryRoutings(): Seq[GitRepositoryRouting] = {
+    repositoryRoutings.toSeq
+  }
+
+  def getRepositoryRouting(repositoryPath: String): Option[GitRepositoryRouting] = {
+    PluginRegistry().getRepositoryRoutings().find {
+      case GitRepositoryRouting(urlPath, _, _) => {
+        repositoryPath.matches("/" + urlPath + "(/.*)?")
+      }
+    }
+  }
+
  private case class GlobalAction(
    method: String,
    path: String,
--- a/src/main/scala/gitbucket/core/plugin/Renderer.scala
+++ b/src/main/scala/gitbucket/core/plugin/Renderer.scala
@@ -0,0 +1,45 @@
+package gitbucket.core.plugin
+
+import gitbucket.core.controller.Context
+import gitbucket.core.service.RepositoryService
+import gitbucket.core.view.Markdown
+import play.twirl.api.Html
+
+/**
+ * A render engine to render content to HTML.
+ */
+trait Renderer {
+
+  /**
+   * Render the given request to HTML.
+   */
+  def render(request: RenderRequest): Html
+
+}
+
+object MarkdownRenderer extends Renderer {
+  override def render(request: RenderRequest): Html = {
+    import request._
+    Html(Markdown.toHtml(fileContent, repository, enableWikiLink, enableRefsLink, enableAnchor)(context))
+  }
+}
+
+object DefaultRenderer extends Renderer {
+  override def render(request: RenderRequest): Html = {
+    import request._
+    Html(
+      s"<tt>${
+        fileContent.split("(\\r\\n)|\\n").map(xml.Utility.escape(_)).mkString("<br/>")
+      }</tt>"
+    )
+  }
+}
+
+case class RenderRequest(filePath: List[String],
+   fileContent: String,
+   branch: String,
+   repository: RepositoryService.RepositoryInfo,
+   enableWikiLink: Boolean,
+   enableRefsLink: Boolean,
+   enableAnchor: Boolean,
+   context: Context)
--- a/src/main/scala/gitbucket/core/servlet/AccessTokenAuthenticationFilter.scala
+++ b/src/main/scala/gitbucket/core/servlet/AccessTokenAuthenticationFilter.scala
@@ -33,7 +33,7 @@ class AccessTokenAuthenticationFilter extends Filter with AccessTokenService {
      case None => chain.doFilter(req, res)
      case Some(Left(_)) => {
        response.setStatus(HttpServletResponse.SC_UNAUTHORIZED)
-        response.setContentType("Content-Type: application/json; charset=utf-8")
+        response.setContentType("application/json; charset=utf-8")
        val w = response.getWriter()
        w.print("""{ "message": "Bad credentials" }""")
        w.close()
--- a/src/main/scala/gitbucket/core/servlet/AutoUpdate.scala
+++ b/src/main/scala/gitbucket/core/servlet/AutoUpdate.scala
@@ -21,6 +21,8 @@ object AutoUpdate {
   * The history of versions. A head of this sequence is the current BitBucket version.
   */
  val versions = Seq(
+    new Version(3, 5),
+    new Version(3, 4),
    new Version(3, 3),
    new Version(3, 2),
    new Version(3, 1),
@@ -165,4 +167,4 @@ object AutoUpdate {
    } else Version(0, 0)
  }

-}
+}
--- a/src/main/scala/gitbucket/core/servlet/BasicAuthenticationFilter.scala
+++ b/src/main/scala/gitbucket/core/servlet/BasicAuthenticationFilter.scala
@@ -2,11 +2,12 @@ package gitbucket.core.servlet

 import javax.servlet._
 import javax.servlet.http._
+import gitbucket.core.plugin.{GitRepositoryFilter, GitRepositoryRouting, PluginRegistry}
+import gitbucket.core.service.SystemSettingsService.SystemSettings
 import gitbucket.core.service.{RepositoryService, AccountService, SystemSettingsService}
-import gitbucket.core.util.{ControlUtil, Keys, Implicits}
+import gitbucket.core.util.{Keys, Implicits}
 import org.slf4j.LoggerFactory
 import Implicits._
-import ControlUtil._

 /**
 * Provides BASIC Authentication for [[GitRepositoryServlet]].
@@ -20,7 +21,7 @@ class BasicAuthenticationFilter extends Filter with RepositoryService with Accou
  def destroy(): Unit = {}
  
  def doFilter(req: ServletRequest, res: ServletResponse, chain: FilterChain): Unit = {
-    implicit val request  = req.asInstanceOf[HttpServletRequest]
+    val request  = req.asInstanceOf[HttpServletRequest]
    val response = res.asInstanceOf[HttpServletResponse]

    val wrappedResponse = new HttpServletResponseWrapper(response){
@@ -31,47 +32,13 @@ class BasicAuthenticationFilter extends Filter with RepositoryService with Accou
    val settings = loadSystemSettings()

    try {
-      defining(request.paths){
-        case Array(_, repositoryOwner, repositoryName, _*) =>
-          getRepository(repositoryOwner, repositoryName.replaceFirst("\\.wiki\\.git$|\\.git$", ""), "") match {
-            case Some(repository) => {
-              if(!isUpdating && !repository.repository.isPrivate && settings.allowAnonymousAccess){
-                chain.doFilter(req, wrappedResponse)
-              } else {
-                request.getHeader("Authorization") match {
-                  case null => requireAuth(response)
-                  case auth => decodeAuthHeader(auth).split(":", 2) match {
-                    case Array(username, password) => {
-                      authenticate(settings, username, password) match {
-                        case Some(account) => {
-                          if (isUpdating || repository.repository.isPrivate) {
-                            if(hasWritePermission(repository.owner, repository.name, Some(account))){
-                              request.setAttribute(Keys.Request.UserName, account.userName)
-                              chain.doFilter(req, wrappedResponse)
-                            } else {
-                              requireAuth(response)
-                            }
-                          } else {
-                            chain.doFilter(req, wrappedResponse)
-                          }
-                        }
-                        case _ => requireAuth(response)
-                      }
-                    }
-                    case _ => requireAuth(response)
-                  }
-                }
-              }
-            }
-            case None => {
-              logger.debug(s"Repository ${repositoryOwner}/${repositoryName} is not found.")
-              response.sendError(HttpServletResponse.SC_NOT_FOUND)
-            }
-          }
-        case _ => {
-          logger.debug(s"Not enough path arguments: ${request.paths}")
-          response.sendError(HttpServletResponse.SC_NOT_FOUND)
-        }
+      PluginRegistry().getRepositoryRouting(request.gitRepositoryPath).map { case GitRepositoryRouting(_, _, filter) =>
+        // served by plug-ins
+        pluginRepository(request, wrappedResponse, chain, settings, isUpdating, filter)
+
+      }.getOrElse {
+        // default repositories
+        defaultRepository(request, wrappedResponse, chain, settings, isUpdating)
      }
    } catch {
      case ex: Exception => {
@@ -81,6 +48,67 @@ class BasicAuthenticationFilter extends Filter with RepositoryService with Accou
    }
  }

+  private def pluginRepository(request: HttpServletRequest, response: HttpServletResponse, chain: FilterChain,
+                               settings: SystemSettings, isUpdating: Boolean, filter: GitRepositoryFilter): Unit = {
+    implicit val r = request
+
+    val account = for {
+      auth <- Option(request.getHeader("Authorization"))
+      Array(username, password) = decodeAuthHeader(auth).split(":", 2)
+      account <- authenticate(settings, username, password)
+    } yield {
+      request.setAttribute(Keys.Request.UserName, account.userName)
+      account
+    }
+
+    if(filter.filter(request.gitRepositoryPath, account.map(_.userName), settings, isUpdating)){
+      chain.doFilter(request, response)
+    } else {
+      requireAuth(response)
+    }
+  }
+
+  private def defaultRepository(request: HttpServletRequest, response: HttpServletResponse, chain: FilterChain,
+                                settings: SystemSettings, isUpdating: Boolean): Unit = {
+    implicit val r = request
+
+    request.paths match {
+      case Array(_, repositoryOwner, repositoryName, _*) =>
+        getRepository(repositoryOwner, repositoryName.replaceFirst("\\.wiki\\.git$|\\.git$", ""), "") match {
+          case Some(repository) => {
+            if(!isUpdating && !repository.repository.isPrivate && settings.allowAnonymousAccess){
+              chain.doFilter(request, response)
+            } else {
+              val passed = for {
+                auth <- Option(request.getHeader("Authorization"))
+                Array(username, password) = decodeAuthHeader(auth).split(":", 2)
+                account <- authenticate(settings, username, password)
+              } yield if(isUpdating || repository.repository.isPrivate){
+                  if(hasWritePermission(repository.owner, repository.name, Some(account))){
+                    request.setAttribute(Keys.Request.UserName, account.userName)
+                    true
+                  } else false
+                } else true
+
+              if(passed.getOrElse(false)){
+                chain.doFilter(request, response)
+              } else {
+                requireAuth(response)
+              }
+            }
+          }
+          case None => {
+            logger.debug(s"Repository ${repositoryOwner}/${repositoryName} is not found.")
+            response.sendError(HttpServletResponse.SC_NOT_FOUND)
+          }
+        }
+      case _ => {
+        logger.debug(s"Not enough path arguments: ${request.paths}")
+        response.sendError(HttpServletResponse.SC_NOT_FOUND)
+      }
+    }
+  }
+
  private def requireAuth(response: HttpServletResponse): Unit = {
    response.setHeader("WWW-Authenticate", "BASIC realm=\"GitBucket\"")
    response.sendError(HttpServletResponse.SC_UNAUTHORIZED)
--- a/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
+++ b/src/main/scala/gitbucket/core/servlet/GitRepositoryServlet.scala
@@ -1,7 +1,10 @@
 package gitbucket.core.servlet

+import java.io.File
+
 import gitbucket.core.api
 import gitbucket.core.model.Session
+import gitbucket.core.plugin.{GitRepositoryRouting, PluginRegistry}
 import gitbucket.core.service.IssuesService.IssueSearchCondition
 import gitbucket.core.service.WebHookService._
 import gitbucket.core.service._
@@ -18,7 +21,6 @@ import org.eclipse.jgit.transport.resolver._
 import org.slf4j.LoggerFactory

 import javax.servlet.ServletConfig
-import javax.servlet.ServletContext
 import javax.servlet.http.{HttpServletResponse, HttpServletRequest}


@@ -35,20 +37,8 @@ class GitRepositoryServlet extends GitServlet with SystemSettingsService {
  override def init(config: ServletConfig): Unit = {
    setReceivePackFactory(new GitBucketReceivePackFactory())

-    // TODO are there any other ways...?
-    super.init(new ServletConfig(){
-      def getInitParameter(name: String): String = name match {
-        case "base-path"  => Directory.RepositoryHome
-        case "export-all" => "true"
-        case name => config.getInitParameter(name)
-      }
-      def getInitParameterNames(): java.util.Enumeration[String] = {
-         config.getInitParameterNames
-      }
-
-      def getServletContext(): ServletContext = config.getServletContext
-      def getServletName(): String = config.getServletName
-    })
+    val root: File = new File(Directory.RepositoryHome)
+    setRepositoryResolver(new GitBucketRepositoryResolver(new FileResolver[HttpServletRequest](root, true)))

    super.init(config)
  }
@@ -67,32 +57,52 @@ class GitRepositoryServlet extends GitServlet with SystemSettingsService {
  }
 }

+class GitBucketRepositoryResolver(parent: FileResolver[HttpServletRequest]) extends RepositoryResolver[HttpServletRequest] {
+
+  private val resolver = new FileResolver[HttpServletRequest](new File(Directory.GitBucketHome), true)
+
+  override def open(req: HttpServletRequest, name: String): Repository = {
+    // Rewrite repository path if routing is marched
+    PluginRegistry().getRepositoryRouting("/" + name).map { case GitRepositoryRouting(urlPattern, localPath, _) =>
+      val path = urlPattern.r.replaceFirstIn(name, localPath)
+      resolver.open(req, path)
+    }.getOrElse {
+      parent.open(req, name)
+    }
+  }
+
+}
+
 class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest] with SystemSettingsService {

  private val logger = LoggerFactory.getLogger(classOf[GitBucketReceivePackFactory])

  override def create(request: HttpServletRequest, db: Repository): ReceivePack = {
    val receivePack = new ReceivePack(db)
-    val pusher = request.getAttribute(Keys.Request.UserName).asInstanceOf[String]

-    logger.debug("requestURI: " + request.getRequestURI)
-    logger.debug("pusher:" + pusher)
+    if(PluginRegistry().getRepositoryRouting(request.gitRepositoryPath).isEmpty){
+      val pusher = request.getAttribute(Keys.Request.UserName).asInstanceOf[String]

-    defining(request.paths){ paths =>
-      val owner      = paths(1)
-      val repository = paths(2).stripSuffix(".git")
+      logger.debug("requestURI: " + request.getRequestURI)
+      logger.debug("pusher:" + pusher)

-      logger.debug("repository:" + owner + "/" + repository)
+      defining(request.paths){ paths =>
+        val owner      = paths(1)
+        val repository = paths(2).stripSuffix(".git")

-      if(!repository.endsWith(".wiki")){
-        defining(request) { implicit r =>
-          val hook = new CommitLogHook(owner, repository, pusher, baseUrl)
-          receivePack.setPreReceiveHook(hook)
-          receivePack.setPostReceiveHook(hook)
+        logger.debug("repository:" + owner + "/" + repository)
+
+        if(!repository.endsWith(".wiki")){
+          defining(request) { implicit r =>
+            val hook = new CommitLogHook(owner, repository, pusher, baseUrl)
+            receivePack.setPreReceiveHook(hook)
+            receivePack.setPostReceiveHook(hook)
+          }
        }
      }
-      receivePack
    }
+
+    receivePack
  }
 }

--- a/src/main/scala/gitbucket/core/ssh/GitCommand.scala
+++ b/src/main/scala/gitbucket/core/ssh/GitCommand.scala
@@ -1,12 +1,13 @@
 package gitbucket.core.ssh

 import gitbucket.core.model.Session
+import gitbucket.core.plugin.{GitRepositoryRouting, PluginRegistry}
 import gitbucket.core.service.{RepositoryService, AccountService, SystemSettingsService}
 import gitbucket.core.servlet.{Database, CommitLogHook}
 import gitbucket.core.util.{Directory, ControlUtil}
 import org.apache.sshd.server.{CommandFactory, Environment, ExitCallback, Command}
 import org.slf4j.LoggerFactory
-import java.io.{InputStream, OutputStream}
+import java.io.{File, InputStream, OutputStream}
 import ControlUtil._
 import org.eclipse.jgit.api.Git
 import Directory._
@@ -15,11 +16,11 @@ import org.apache.sshd.server.command.UnknownCommand
 import org.eclipse.jgit.errors.RepositoryNotFoundException

 object GitCommand {
-  val CommandRegex = """\Agit-(upload|receive)-pack '/([a-zA-Z0-9\-_.]+)/([a-zA-Z0-9\-_.]+).git'\Z""".r
+  val DefaultCommandRegex = """\Agit-(upload|receive)-pack '/([a-zA-Z0-9\-_.]+)/([a-zA-Z0-9\-_.]+).git'\Z""".r
+  val SimpleCommandRegex  = """\Agit-(upload|receive)-pack '/(.+\.git)'\Z""".r
 }

-abstract class GitCommand(val owner: String, val repoName: String) extends Command {
-  self: RepositoryService with AccountService =>
+abstract class GitCommand() extends Command {

  private val logger = LoggerFactory.getLogger(classOf[GitCommand])
  protected var err: OutputStream = null
@@ -71,6 +72,11 @@ abstract class GitCommand(val owner: String, val repoName: String) extends Comma
    this.in = in
  }

+}
+
+abstract class DefaultGitCommand(val owner: String, val repoName: String) extends GitCommand {
+  self: RepositoryService with AccountService =>
+
  protected def isWritableUser(username: String, repositoryInfo: RepositoryService.RepositoryInfo)
                              (implicit session: Session): Boolean =
    getAccountByUserName(username) match {
@@ -80,7 +86,8 @@ abstract class GitCommand(val owner: String, val repoName: String) extends Comma

 }

-class GitUploadPack(owner: String, repoName: String, baseUrl: String) extends GitCommand(owner, repoName)
+
+class DefaultGitUploadPack(owner: String, repoName: String, baseUrl: String) extends DefaultGitCommand(owner, repoName)
    with RepositoryService with AccountService {

  override protected def runTask(user: String)(implicit session: Session): Unit = {
@@ -94,11 +101,10 @@ class GitUploadPack(owner: String, repoName: String, baseUrl: String) extends Gi
      }
    }
  }
-
 }

-class GitReceivePack(owner: String, repoName: String, baseUrl: String) extends GitCommand(owner, repoName)
-    with SystemSettingsService with RepositoryService with AccountService {
+class DefaultGitReceivePack(owner: String, repoName: String, baseUrl: String) extends DefaultGitCommand(owner, repoName)
+    with RepositoryService with AccountService {

  override protected def runTask(user: String)(implicit session: Session): Unit = {
    getRepository(owner, repoName.replaceFirst("\\.wiki\\Z", ""), baseUrl).foreach { repositoryInfo =>
@@ -116,18 +122,56 @@ class GitReceivePack(owner: String, repoName: String, baseUrl: String) extends G
      }
    }
  }
-
 }

+class PluginGitUploadPack(repoName: String, baseUrl: String, routing: GitRepositoryRouting) extends GitCommand
+    with SystemSettingsService {
+
+  override protected def runTask(user: String)(implicit session: Session): Unit = {
+    if(routing.filter.filter("/" + repoName, Some(user), loadSystemSettings(), false)){
+      val path = routing.urlPattern.r.replaceFirstIn(repoName, routing.localPath)
+      using(Git.open(new File(Directory.GitBucketHome, path))){ git =>
+        val repository = git.getRepository
+        val upload = new UploadPack(repository)
+        upload.upload(in, out, err)
+      }
+    }
+  }
+}
+
+class PluginGitReceivePack(repoName: String, baseUrl: String, routing: GitRepositoryRouting) extends GitCommand
+    with SystemSettingsService {
+
+  override protected def runTask(user: String)(implicit session: Session): Unit = {
+    if(routing.filter.filter("/" + repoName, Some(user), loadSystemSettings(), true)){
+      val path = routing.urlPattern.r.replaceFirstIn(repoName, routing.localPath)
+      using(Git.open(new File(Directory.GitBucketHome, path))){ git =>
+        val repository = git.getRepository
+        val receive = new ReceivePack(repository)
+        receive.receive(in, out, err)
+      }
+    }
+  }
+}
+
+
 class GitCommandFactory(baseUrl: String) extends CommandFactory {
  private val logger = LoggerFactory.getLogger(classOf[GitCommandFactory])

  override def createCommand(command: String): Command = {
+    import GitCommand._
    logger.debug(s"command: $command")
+
    command match {
-      case GitCommand.CommandRegex("upload", owner, repoName) => new GitUploadPack(owner, repoName, baseUrl)
-      case GitCommand.CommandRegex("receive", owner, repoName) => new GitReceivePack(owner, repoName, baseUrl)
+      case SimpleCommandRegex ("upload" , repoName) if(pluginRepository(repoName)) => new PluginGitUploadPack (repoName, baseUrl, routing(repoName))
+      case SimpleCommandRegex ("receive", repoName) if(pluginRepository(repoName)) => new PluginGitReceivePack(repoName, baseUrl, routing(repoName))
+      case DefaultCommandRegex("upload" , owner, repoName) => new DefaultGitUploadPack (owner, repoName, baseUrl)
+      case DefaultCommandRegex("receive", owner, repoName) => new DefaultGitReceivePack(owner, repoName, baseUrl)
      case _ => new UnknownCommand(command)
    }
  }
+
+  private def pluginRepository(repoName: String): Boolean = PluginRegistry().getRepositoryRouting("/" + repoName).isDefined
+  private def routing(repoName: String): GitRepositoryRouting = PluginRegistry().getRepositoryRouting("/" + repoName).get
+
 }
--- a/src/main/scala/gitbucket/core/util/Implicits.scala
+++ b/src/main/scala/gitbucket/core/util/Implicits.scala
@@ -72,6 +72,8 @@ object Implicits {

    def hasAttribute(name: String): Boolean = request.getAttribute(name) != null

+    def gitRepositoryPath: String = request.getRequestURI.replaceFirst("^/git/", "/")
+
  }

  implicit class RichSession(session: HttpSession){
--- a/src/main/scala/gitbucket/core/util/JGitUtil.scala
+++ b/src/main/scala/gitbucket/core/util/JGitUtil.scala
@@ -791,26 +791,31 @@ object JGitUtil {
    return git.log.add(startCommit).addPath(path).setMaxCount(1).call.iterator.next
  }

-  def getBranches(owner: String, name: String, defaultBranch: String): Seq[BranchInfo] = {
+  def getBranches(owner: String, name: String, defaultBranch: String, origin: Boolean): Seq[BranchInfo] = {
    using(Git.open(getRepositoryDir(owner, name))){ git =>
      val repo = git.getRepository
-      val defaultObject = repo.resolve(defaultBranch)
+      val defaultObject = if (repo.getAllRefs.keySet().contains(defaultBranch)) {
+        repo.resolve(defaultBranch)
+      } else {
+        git.branchList().call().iterator().next().getObjectId
+      }
+
      git.branchList.call.asScala.map { ref =>
        val walk = new RevWalk(repo)
-        try{
+        try {
          val defaultCommit = walk.parseCommit(defaultObject)
          val branchName = ref.getName.stripPrefix("refs/heads/")
          val branchCommit = if(branchName == defaultBranch){
            defaultCommit
-          }else{
+          } else {
            walk.parseCommit(ref.getObjectId)
          }
          val when = branchCommit.getCommitterIdent.getWhen
          val committer = branchCommit.getCommitterIdent.getName
          val committerEmail = branchCommit.getCommitterIdent.getEmailAddress
-          val mergeInfo = if(branchName==defaultBranch){
+          val mergeInfo = if(origin && branchName == defaultBranch){
            None
-          }else{
+          } else {
            walk.reset()
            walk.setRevFilter( RevFilter.MERGE_BASE )
            walk.markStart(branchCommit)
--- a/src/main/scala/gitbucket/core/util/Notifier.scala
+++ b/src/main/scala/gitbucket/core/util/Notifier.scala
@@ -75,7 +75,7 @@ class Mailer(private val smtp: Smtp) extends Notifier {
      database withSession { implicit session =>
        defining(
          s"[${r.name}] ${issue.title} (#${issue.issueId})" ->
-            msg(Markdown.toHtml(content, r, false, true))) { case (subject, msg) =>
+            msg(Markdown.toHtml(content, r, false, true, false))) { case (subject, msg) =>
            recipients(issue) { to =>
              val email = new HtmlEmail
              email.setHostName(smtp.host)
@@ -87,7 +87,7 @@ class Mailer(private val smtp: Smtp) extends Notifier {
                email.setSSLOnConnect(ssl)
              }
              smtp.fromAddress
-                .map (_ -> smtp.fromName.orNull)
+                .map (_ -> smtp.fromName.getOrElse(context.loginAccount.get.userName))
                .orElse (Some("notifications@gitbucket.com" -> context.loginAccount.get.userName))
                .foreach { case (address, name) =>
                  email.setFrom(address, name)
--- a/src/main/scala/gitbucket/core/util/Validations.scala
+++ b/src/main/scala/gitbucket/core/util/Validations.scala
@@ -6,7 +6,7 @@ import org.scalatra.i18n.Messages
 trait Validations {

  /**
-   * Constraint for the identifier such as user name, repository name or page name.
+   * Constraint for the identifier such as user name or page name.
   */
  def identifier: Constraint = new Constraint(){
    override def validate(name: String, value: String, messages: Messages): Option[String] =
@@ -19,6 +19,23 @@ trait Validations {
      }
  }

+  /**
+   * Constraint for the repository identifier.
+   */
+  def repository: Constraint = new Constraint(){
+    override def validate(name: String, value: String, messages: Messages): Option[String] =
+      if(!value.matches("[a-zA-Z0-9\\-\\+_.]+")){
+        Some(s"${name} contains invalid character.")
+      } else if(value.startsWith("_") || value.startsWith("-")){
+        Some(s"${name} starts with invalid character.")
+      } else {
+        None
+      }
+  }
+
+  /**
+   * Constraint for the color pattern.
+   */
  def color = pattern("#[0-9a-fA-F]{6}")

  /**
--- a/src/main/scala/gitbucket/core/view/LinkConverter.scala
+++ b/src/main/scala/gitbucket/core/view/LinkConverter.scala
@@ -2,7 +2,6 @@ package gitbucket.core.view

 import gitbucket.core.controller.Context
 import gitbucket.core.service.{RepositoryService, RequestCache}
-import gitbucket.core.util.Implicits
 import gitbucket.core.util.Implicits.RichString

 trait LinkConverter { self: RequestCache =>
@@ -11,10 +10,12 @@ trait LinkConverter { self: RequestCache =>
   * Converts issue id, username and commit id to link.
   */
  protected def convertRefsLinks(value: String, repository: RepositoryService.RepositoryInfo,
-                                 issueIdPrefix: String =  "#")(implicit context: Context): String = {
-    value
-      // escape HTML tags
-      .replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;").replace("\"", "&quot;")
+      issueIdPrefix: String =  "#", escapeHtml: Boolean = true)(implicit context: Context): String = {
+
+    // escape HTML tags
+    val escaped = if(escapeHtml) value.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;").replace("\"", "&quot;") else value
+
+    escaped
      // convert issue id to link
      .replaceBy(("(?<=(^|\\W))" + issueIdPrefix + "([0-9]+)(?=(\\W|$))").r){ m =>
        getIssue(repository.owner, repository.name, m.group(2)) match {
--- a/src/main/scala/gitbucket/core/view/Markdown.scala
+++ b/src/main/scala/gitbucket/core/view/Markdown.scala
@@ -18,11 +18,20 @@ object Markdown {

  /**
   * Converts Markdown of Wiki pages to HTML.
+   *
+   * @param repository the repository which contains the markdown
+   * @param enableWikiLink if true then wiki style link is available in markdown
+   * @param enableRefsLink if true then issue reference (e.g. #123) is rendered as link
+   * @param enableAnchor if true then anchor for headline is generated
+   * @param enableTaskList if true then task list syntax is available
+   * @param hasWritePermission
+   * @param pages the list of existing Wiki pages
   */
  def toHtml(markdown: String,
             repository: RepositoryService.RepositoryInfo,
             enableWikiLink: Boolean,
             enableRefsLink: Boolean,
+             enableAnchor: Boolean,
             enableTaskList: Boolean = false,
             hasWritePermission: Boolean = false,
             pages: List[String] = Nil)(implicit context: Context): String = {
@@ -38,10 +47,14 @@ object Markdown {
    } else s

    val rootNode = new PegDownProcessor(
-      Extensions.AUTOLINKS | Extensions.WIKILINKS | Extensions.FENCED_CODE_BLOCKS | Extensions.TABLES | Extensions.HARDWRAPS | Extensions.SUPPRESS_ALL_HTML
+      Extensions.AUTOLINKS | Extensions.WIKILINKS | Extensions.FENCED_CODE_BLOCKS |
+        Extensions.TABLES | Extensions.HARDWRAPS | Extensions.SUPPRESS_ALL_HTML | Extensions.STRIKETHROUGH
    ).parseMarkdown(source.toCharArray)

-    new GitBucketHtmlSerializer(markdown, repository, enableWikiLink, enableRefsLink, enableTaskList, hasWritePermission, pages).toHtml(rootNode)
+    new GitBucketHtmlSerializer(
+      markdown, repository, enableWikiLink, enableRefsLink, enableAnchor, enableTaskList,
+      hasWritePermission, pages
+    ).toHtml(rootNode)
  }
 }

@@ -100,6 +113,7 @@ class GitBucketHtmlSerializer(
    repository: RepositoryService.RepositoryInfo,
    enableWikiLink: Boolean,
    enableRefsLink: Boolean,
+    enableAnchor: Boolean,
    enableTaskList: Boolean,
    hasWritePermission: Boolean,
    pages: List[String]
@@ -108,9 +122,9 @@ class GitBucketHtmlSerializer(
    Map[String, VerbatimSerializer](VerbatimSerializer.DEFAULT -> new GitBucketVerbatimSerializer).asJava
  ) with LinkConverter with RequestCache {

-  override protected def printImageTag(imageNode: SuperNode, url: String): Unit = {
-    printer.print("<a target=\"_blank\" href=\"").print(fixUrl(url, true)).print("\">")
-           .print("<img src=\"").print(fixUrl(url, true)).print("\"  alt=\"").printEncoded(printChildrenToString(imageNode)).print("\"/></a>")
+  override protected def printImageTag(rendering: LinkRenderer.Rendering): Unit = {
+    printer.print("<a target=\"_blank\" href=\"").print(fixUrl(rendering.href, true)).print("\">")
+      .print("<img src=\"").print(fixUrl(rendering.href, true)).print("\"  alt=\"").printEncoded(rendering.text).print("\"/></a>")
  }

  override protected def printLink(rendering: LinkRenderer.Rendering): Unit = {
@@ -150,15 +164,34 @@ class GitBucketHtmlSerializer(

  private def printHeaderTag(node: HeaderNode): Unit = {
    val tag = s"h${node.getLevel}"
-    val headerTextString = printChildrenToString(node)
-    val anchorName = GitBucketHtmlSerializer.generateAnchorName(headerTextString)
+    val child = node.getChildren.asScala.headOption
+    val anchorName = child match {
+      case Some(x: AnchorLinkNode) => x.getName
+      case Some(x: TextNode)       => x.getText
+      case _ => GitBucketHtmlSerializer.generateAnchorName(extractText(node)) // TODO
+    }
+
    printer.print(s"""<$tag class="markdown-head">""")
-    printer.print(s"""<a class="markdown-anchor-link" href="#$anchorName"></a>""")
-    printer.print(s"""<a class="markdown-anchor" name="$anchorName"></a>""")
-    visitChildren(node)
+    if(enableAnchor){
+      printer.print(s"""<a class="markdown-anchor-link" href="#$anchorName"></a>""")
+      printer.print(s"""<a class="markdown-anchor" name="$anchorName"></a>""")
+    }
+    child match {
+      case Some(x: AnchorLinkNode) => printer.print(x.getText)
+      case _ => visitChildren(node)
+    }
    printer.print(s"</$tag>")
  }

+  private def extractText(node: Node): String = {
+    val sb = new StringBuilder()
+    node.getChildren.asScala.map {
+      case x: TextNode => sb.append(x.getText)
+      case x: Node => sb.append(extractText(x))
+    }
+    sb.toString()
+  }
+
  override def visit(node: HeaderNode): Unit = {
    printHeaderTag(node)
  }
@@ -177,6 +210,18 @@ class GitBucketHtmlSerializer(
    }
  }

+  override def visit(node: VerbatimNode) {
+    val printer = new Printer()
+    val serializer = verbatimSerializers.get(VerbatimSerializer.DEFAULT)
+    serializer.serialize(node, printer)
+    val html = printer.getString
+
+    // convert commit id and username to link.
+    val t = if(enableRefsLink) convertRefsLinks(html, repository, "issue:", escapeHtml = false) else html
+
+    this.printer.print(t)
+  }
+
  override def visit(node: BulletListNode): Unit = {
    if (printChildrenToString(node).contains("""class="task-list-item-checkbox" """)) {
      printer.println().print("""<ul class="task-list">""").indent(+2)
--- a/src/main/scala/gitbucket/core/view/helpers.scala
+++ b/src/main/scala/gitbucket/core/view/helpers.scala
@@ -5,14 +5,12 @@ import java.util.{Date, Locale, TimeZone}

 import gitbucket.core.controller.Context
 import gitbucket.core.model.CommitState
+import gitbucket.core.plugin.{RenderRequest, PluginRegistry}
 import gitbucket.core.service.{RepositoryService, RequestCache}
-import gitbucket.core.util.{JGitUtil, StringUtil}
+import gitbucket.core.util.{FileUtil, JGitUtil, StringUtil}

 import play.twirl.api.Html

-
-
-
 /**
 * Provides helper methods for Twirl templates.
 */
@@ -83,14 +81,6 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
  def plural(count: Int, singular: String, plural: String = ""): String =
    if(count == 1) singular else if(plural.isEmpty) singular + "s" else plural

-  private[this] val renderersBySuffix: Seq[(String, (List[String], String, String, RepositoryService.RepositoryInfo, Boolean, Boolean, Context) => Html)] =
-    Seq(
-      ".md"       -> ((filePath, fileContent, branch, repository, enableWikiLink, enableRefsLink, context) => markdown(fileContent, repository, enableWikiLink, enableRefsLink)(context)),
-      ".markdown" -> ((filePath, fileContent, branch, repository, enableWikiLink, enableRefsLink, context) => markdown(fileContent, repository, enableWikiLink, enableRefsLink)(context))
-    )
-
-  def renderableSuffixes: Seq[String] = renderersBySuffix.map(_._1)
-
  /**
   * Converts Markdown of Wiki pages to HTML.
   */
@@ -101,21 +91,20 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
               enableTaskList: Boolean = false,
               hasWritePermission: Boolean = false,
               pages: List[String] = Nil)(implicit context: Context): Html =
-    Html(Markdown.toHtml(value, repository, enableWikiLink, enableRefsLink, enableTaskList, hasWritePermission, pages))
+    Html(Markdown.toHtml(value, repository, enableWikiLink, enableRefsLink, enableTaskList, true, hasWritePermission, pages))

  def renderMarkup(filePath: List[String], fileContent: String, branch: String,
                   repository: RepositoryService.RepositoryInfo,
-                   enableWikiLink: Boolean, enableRefsLink: Boolean)(implicit context: Context): Html = {
+                   enableWikiLink: Boolean, enableRefsLink: Boolean, enableAnchor: Boolean)(implicit context: Context): Html = {

-    val fileNameLower = filePath.reverse.head.toLowerCase
-    renderersBySuffix.find { case (suffix, _) => fileNameLower.endsWith(suffix) } match {
-      case Some((_, handler)) => handler(filePath, fileContent, branch, repository, enableWikiLink, enableRefsLink, context)
-      case None => Html(
-        s"<tt>${
-          fileContent.split("(\\r\\n)|\\n").map(xml.Utility.escape(_)).mkString("<br/>")
-        }</tt>"
-      )
-    }
+    val fileName  = filePath.reverse.head.toLowerCase
+    val extension = FileUtil.getExtension(fileName)
+    val renderer  = PluginRegistry().getRenderer(extension)
+    renderer.render(RenderRequest(filePath, fileContent, branch, repository, enableWikiLink, enableRefsLink, enableAnchor, context))
+  }
+
+  def isRenderable(fileName: String): Boolean = {
+    PluginRegistry().renderableExtensions.exists(extension => fileName.toLowerCase.endsWith("." + extension))
  }

  /**
@@ -166,6 +155,11 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
      .replaceAll("\\[commit:([^\\s]+?)/([^\\s]+?)\\@([^\\s]+?)\\]", (m: Match) => s"""<a href="${context.path}/${m.group(1)}/${m.group(2)}/commit/${m.group(3)}">${m.group(1)}/${m.group(2)}@${m.group(3).substring(0, 7)}</a>""")
    )

+  /**
+   * Remove html tags from the given Html instance.
+   */
+  def removeHtml(html: Html): Html = Html(html.body.replaceAll("<.+?>", ""))
+
  /**
   * URL encode except '/'.
   */
--- a/src/main/twirl/gitbucket/core/account/newrepo.scala.html
+++ b/src/main/twirl/gitbucket/core/account/newrepo.scala.html
@@ -31,7 +31,7 @@ isCreateRepoOptionPublic: Boolean)(implicit context: gitbucket.core.controller.C
    <fieldset class="margin">
      <label class="radio">
        <input type="radio" name="isPrivate" value="false" @if(isCreateRepoOptionPublic){checked}>
-        <span class="strong"><img src="@assets/common/images/repo_public.png"/>&nbsp;</i>&nbsp;Public</span><br>
+        <span class="strong"><i class="octicon octicon-repo"></i>&nbsp;</i>&nbsp;Public</span><br>
        <div>
          <span>All users and guests can read this repository.</span>
        </div>
@@ -40,7 +40,7 @@ isCreateRepoOptionPublic: Boolean)(implicit context: gitbucket.core.controller.C
    <fieldset>
      <label class="radio">
        <input type="radio" name="isPrivate" value="true" @if(!isCreateRepoOptionPublic){checked}>
-        <span class="strong"><img src="@assets/common/images/repo_private.png"/>&nbsp;</i>&nbsp;Private</span><br>
+        <span class="strong"><i class="icon-lock"></i>&nbsp;</i>&nbsp;Private</span><br>
        <div>
          <span>Only collaborators can read this repository.</span>
        </div>
--- a/src/main/twirl/gitbucket/core/dashboard/header.scala.html
+++ b/src/main/twirl/gitbucket/core/dashboard/header.scala.html
@@ -6,11 +6,11 @@
@import gitbucket.core.view.helpers._
 <span class="small">
  <a class="button-link@if(condition.state == "open"){ selected}" href="@condition.copy(state = "open").toURL">
-    <img src="@assets/common/images/status-open@(if(condition.state == "open"){"-active"}).png"/>
+    <i class="octicon octicon-issue-opened @(if(condition.state == "open"){"active"})"></i>
    @openCount Open
  </a>&nbsp;&nbsp;
  <a class="button-link@if(condition.state == "closed"){ selected}" href="@condition.copy(state = "closed").toURL">
-    <img src="@assets/common/images/status-closed@(if(condition.state == "closed"){"-active"}).png"/>
+    <i class="octicon octicon-check @(if(condition.state == "closed"){"active"})"></i>
    @closedCount Closed
  </a>
 </span>
--- a/src/main/twirl/gitbucket/core/dashboard/issueslist.scala.html
+++ b/src/main/twirl/gitbucket/core/dashboard/issueslist.scala.html
@@ -19,9 +19,9 @@
  <tr>
    <td style="padding-top: 15px; padding-bottom: 15px;">
      @if(issue.isPullRequest){
-        <img src="@assets/common/images/pullreq-@(if(issue.closed) "closed" else "open").png"/>
+        <i class="octicon octicon-git-pull-request @(if(issue.closed) "closed" else "open")"></i>
      } else {
-        <img src="@assets/common/images/issue-@(if(issue.closed) "closed" else "open").png"/>
+        <i class="octicon octicon-issue-@(if(issue.closed) "closed" else "opened")"></i>
      }
      <a href="@path/@issue.userName/@issue.repositoryName">@issue.userName/@issue.repositoryName</a>&nbsp;&#xFF65;
      @if(issue.isPullRequest){
@@ -39,18 +39,19 @@
        }
        @if(commentCount > 0){
          <a href="@path/@issue.userName/@issue.repositoryName/issues/@issue.issueId" class="issue-comment-count">
-            <img src="@assets/common/images/comment-active.png"> @commentCount
+            <i class="octicon octicon-comment active"></i> @commentCount
          </a>
        } else {
          <a href="@path/@issue.userName/@issue.repositoryName/issues/@issue.issueId" class="issue-comment-count" style="color: silver;">
-            <img src="@assets/common/images/comment.png"> @commentCount
+            <i class="octicon octicon-comment"></i> @commentCount
          </a>
        }
      </span>
      <div class="small muted" style="margin-left: 20px; margin-top: 5px;">
        #@issue.issueId opened by @user(issue.openedUserName, styleClass="username") @datetime(issue.registeredDate)
        @milestone.map { milestone =>
-          <span style="margin: 20px;"><a href="@condition.copy(milestone = Some(Some(milestone))).toURL" class="username"><img src="@assets/common/images/milestone.png"> @milestone</a></span>
+          <span style="margin: 20px;"><a href="@condition.copy(milestone = Some(Some(milestone))).toURL" class="username"><i class="octicon octicon-milestone"></i> 
+@milestone</a></span>
        }
      </div>
    </td>
--- a/src/main/twirl/gitbucket/core/dashboard/tab.scala.html
+++ b/src/main/twirl/gitbucket/core/dashboard/tab.scala.html
@@ -4,16 +4,16 @@
 <div class="dashboard-nav">
  <div class="container">
    <a href="@path/" @if(active == ""){ class="active"}>
-      <img src="@assets/common/images/menu-feed.png">
+      <i class="octicon octicon-rss"></i>
      News Feed
    </a>
    @if(loginAccount.isDefined){
      <a href="@path/dashboard/pulls" @if(active == "pulls" ){ class="active"}>
-        <img src="@assets/common/images/menu-pulls.png">
+        <i class="octicon octicon-git-pull-request"></i>
        Pull Requests
      </a>
      <a href="@path/dashboard/issues" @if(active == "issues"){ class="active"}>
-        <img src="@assets/common/images/menu-issues.png">
+        <i class="octicon octicon-issue-opened"></i>
        Issues
      </a>
    }
@@ -27,6 +27,8 @@ div.dashboard-nav {
  margin-bottom: 20px;
 }

+
+
 div.dashboard-nav a  {
  line-height: 10px;
  margin-left: 20px;
@@ -36,8 +38,17 @@ div.dashboard-nav a  {
  color: #888;
 }

-div.dashboard-nav a:hover  {
+
+div.dashboard-nav .octicon{
+    width: 16px;
+    height: 16px;
+    font-size: 16px;
+    color: #888;
+}
+
+div.dashboard-nav a:hover,div.dashboard-nav a:hover .octicon  {
  text-decoration: none;
+  color: #333;
 }

 div.dashboard-nav a.active {
--- a/src/main/twirl/gitbucket/core/helper/activities.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/activities.scala.html
@@ -8,20 +8,20 @@
  @activities.map { activity =>
    <div class="block">
      @(activity.activityType match {
-        case "open_issue"        => detailActivity(activity, "activity-issue.png")
-        case "comment_issue"     => detailActivity(activity, "activity-comment.png")
-        case "comment_commit"    => detailActivity(activity, "activity-comment.png")
-        case "close_issue"       => detailActivity(activity, "activity-issue-close.png")
-        case "reopen_issue"      => detailActivity(activity, "activity-issue-reopen.png")
-        case "open_pullreq"      => detailActivity(activity, "activity-merge.png")
-        case "merge_pullreq"     => detailActivity(activity, "activity-merge.png")
-        case "create_repository" => simpleActivity(activity, "activity-create-repository.png")
-        case "create_branch"     => simpleActivity(activity, "activity-branch.png")
-        case "delete_branch"     => simpleActivity(activity, "activity-delete.png")
-        case "create_tag"        => simpleActivity(activity, "activity-tag.png")
-        case "delete_tag"        => simpleActivity(activity, "activity-delete.png")
-        case "fork"              => simpleActivity(activity, "activity-fork.png")
-        case "push"  => customActivity(activity, "activity-commit.png"){
+        case "open_issue"        => detailActivity(activity, "issue-opened")
+        case "comment_issue"     => detailActivity(activity, "comment-discussion")
+        case "comment_commit"    => detailActivity(activity, "comment-discussion")
+        case "close_issue"       => detailActivity(activity, "issue-closed")
+        case "reopen_issue"      => detailActivity(activity, "issue-reopened")
+        case "open_pullreq"      => detailActivity(activity, "git-pull-request")
+        case "merge_pullreq"     => detailActivity(activity, "git-merge")
+        case "create_repository" => simpleActivity(activity, "repo")
+        case "create_branch"     => simpleActivity(activity, "git-branch")
+        case "delete_branch"     => simpleActivity(activity, "circle-slash")
+        case "create_tag"        => simpleActivity(activity, "tag")
+        case "delete_tag"        => simpleActivity(activity, "circle-slash")
+        case "fork"              => simpleActivity(activity, "repo-forked")
+        case "push"  => customActivity(activity, "git-commit"){
          <div class="small activity-message">
            {activity.additionalInfo.get.split("\n").reverse.take(4).zipWithIndex.map{ case (commit, i) =>
              if(i == 3){
@@ -37,12 +37,12 @@
            }}
          </div>
        }
-        case "create_wiki" => customActivity(activity, "activity-wiki.png"){
+        case "create_wiki" => customActivity(activity, "book"){
          <div class="small activity-message">
            Created <a href={s"${path}/${activity.userName}/${activity.repositoryName}/wiki/${activity.additionalInfo.get}"}>{activity.additionalInfo.get}</a>.
          </div>
        }
-        case "edit_wiki" => customActivity(activity, "activity-wiki.png"){
+        case "edit_wiki" => customActivity(activity, "book"){
          activity.additionalInfo.get.split(":") match {
            case Array(pageName, commitId) =>
              <div class="small activity-message">
@@ -61,7 +61,7 @@
 }

@detailActivity(activity: gitbucket.core.model.Activity, image: String) = {
-  <div class="activity-icon-large"><img src="@assets/common/images/@image"/></div>
+  <div class="activity-icon-large"><i class="mega-octicon octicon-@image"></i></div>
  <div class="activity-content">
    <div class="muted small">@helper.html.datetimeago(activity.activityDate)</div>
    <div class="strong">
@@ -75,7 +75,7 @@
 }

@customActivity(activity: gitbucket.core.model.Activity, image: String)(additionalInfo: Any) = {
-  <div class="activity-icon-large"><img src="@assets/common/images/@image"/></div>
+  <div class="activity-icon-large"><i class="mega-octicon octicon-@image"></i></div>
  <div class="activity-content">
    <div class="muted small">@helper.html.datetimeago(activity.activityDate)</div>
    <div class="strong">
@@ -87,7 +87,7 @@
 }

@simpleActivity(activity: gitbucket.core.model.Activity, image: String) = {
-  <div class="activity-icon-small"><img src="@assets/common/images/@image"/></div>
+  <div class="activity-icon-small"><i class="octicon octicon-@image"></i></div>
  <div class="activity-content">
    <div>
      @avatar(activity.activityUserName, 16)
--- a/src/main/twirl/gitbucket/core/helper/diff.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/diff.scala.html
@@ -25,16 +25,16 @@
      <span class="pull-right diffstat" data-diff-id="@i"></span>
      <a href="#diff-@i">
        @if(diff.changeType == ChangeType.COPY || diff.changeType == ChangeType.RENAME){
-          <img src="@assets/common/images/diff_move.png"/> @diff.oldPath -> @diff.newPath
+          <i class="octicon octicon-diff-renamed"></i> @diff.oldPath -> @diff.newPath
        }
        @if(diff.changeType == ChangeType.ADD){
-          <img src="@assets/common/images/diff_add.png"/> @diff.newPath
+          <i class="octicon octicon-diff-added"></i> @diff.newPath
        }
        @if(diff.changeType == ChangeType.MODIFY){
-          <img src="@assets/common/images/diff_edit.png"/> @diff.newPath
+          <i class="octicon octicon-diff-modified"></i> @diff.newPath
        }
        @if(diff.changeType == ChangeType.DELETE){
-          <img src="@assets/common/images/diff_delete.png"/> @diff.oldPath
+          <i class="octicon octicon-diff-removed"></i> @diff.oldPath
        }
      </a>
    </li>
@@ -55,7 +55,7 @@
            </div>
          }
          <span class="diffstat">
-            <img src="@assets/common/images/diff_move.png"/>
+            <i class="octicon octicon-diff-renamed"></i>
          </span> @diff.oldPath -> @diff.newPath
        }
        @if(diff.changeType == ChangeType.ADD || diff.changeType == ChangeType.MODIFY){
@@ -68,9 +68,9 @@
          }
          <span class="diffstat">
          @if(diff.changeType == ChangeType.ADD){
-            <img src="@assets/common/images/diff_add.png"/>
+            <i class="octicon octicon-diff-added"></i>
          }else{
-            <img src="@assets/common/images/diff_edit.png"/>
+            <i class="octicon octicon-diff-modified"></i>
          }
          </span>
          @diff.newPath
@@ -83,7 +83,7 @@
            </div>
          }
          <span class="diffstat">
-            <img src="@assets/common/images/diff_delete.png"/>
+            <i class="octicon octicon-diff-removed"></i>
          </span> @diff.oldPath
        }
      </th>
--- a/src/main/twirl/gitbucket/core/helper/feed.scala.xml
+++ b/src/main/twirl/gitbucket/core/helper/feed.scala.xml
@@ -16,7 +16,7 @@
    <published>@datetimeRFC3339(activity.activityDate)</published>
    <updated>@datetimeRFC3339(activity.activityDate)</updated>
    <link type="text/html" rel="alternate" href="@context.baseUrl/@activity.userName/@activity.repositoryName" />
-    <title type="html">@activity.activityType</title>
+    <title type="html">@removeHtml(activityMessage(activity.message))</title>
    <author>
      <name>@activity.activityUserName</name>
      <uri>@url(activity.activityUserName)</uri>
--- a/src/main/twirl/gitbucket/core/helper/preview.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/preview.scala.html
@@ -5,6 +5,7 @@
  enableTaskList: Boolean,
  hasWritePermission: Boolean,
  style: String = "",
+  styleClass: String = "",
  placeholder: String = "Leave a comment",
  elastic: Boolean = false,
  uid: Long = new java.util.Date().getTime())(implicit context: gitbucket.core.controller.Context)
@@ -20,7 +21,9 @@
    <div class="tab-pane active" id="tab@uid">
      <span id="error-content" class="error"></span>
      @textarea = {
-        <textarea id="content@uid" name="content"@if(style.nonEmpty){ style="@style"} placeholder="@placeholder">@content</textarea>
+        <textarea id="content@uid" name="content" placeholder="@placeholder"
+          @if(style.nonEmpty){ style="@style"}
+          @if(styleClass.nonEmpty){ class="@styleClass" }>@content</textarea>
      }
      @if(enableWikiLink){
        @textarea
--- a/src/main/twirl/gitbucket/core/helper/repositoryicon.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/repositoryicon.scala.html
@@ -3,11 +3,11 @@
@import context._
@import gitbucket.core.view.helpers._
@if(repository.repository.isPrivate){
-  <img src="@assets/common/images/repo_private@{if(large){"_lg"}}.png"/>
+  <i class="@{if(large){"mega-"}}octicon octicon-lock"></i>
 } else {
  @if(repository.repository.originUserName.isDefined){
-    <img src="@assets/common/images/repo_fork@{if(large){"_lg"}}.png"/>
+    <i class="@{if(large){"mega-"}}octicon octicon-repo-forked"></i>
  } else {
-    <img src="@assets/common/images/repo_public@{if(large){"_lg"}}.png"/>
+    <i class="@{if(large){"mega-"}}octicon octicon-repo"></i>
  }
 }
--- a/src/main/twirl/gitbucket/core/issues/commentform.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/commentform.scala.html
@@ -10,7 +10,16 @@
    <div class="issue-avatar-image">@avatar(loginAccount.get.userName, 48)</div>
      <div class="box issue-comment-box">
      <div class="box-content">
-        @helper.html.preview(repository, "", false, true, true, hasWritePermission, "width: 635px; height: 100px; max-height: 150px;", elastic = true)
+        @helper.html.preview(
+          repository         = repository,
+          content            = "",
+          enableWikiLink     = false,
+          enableRefsLink     = true,
+          enableTaskList     = true,
+          hasWritePermission = hasWritePermission,
+          style              = "width: 635px; height: 100px; max-height: 150px;",
+          elastic            = true
+        )
      </div>
    </div>
    <div class="pull-right">
--- a/src/main/twirl/gitbucket/core/issues/create.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/create.scala.html
@@ -41,7 +41,7 @@
                          <div class="small" style="padding-left: 20px;">
                            @milestone.dueDate.map { dueDate =>
                              @if(isPast(dueDate)){
-                                <img src="@assets/common/images/alert.png"/><span class="milestone-alert">Due by @date(dueDate)</span>
+                                <i class="octicon octicon-alert" style="color:#BD2C00;"></i><span class="milestone-alert">Due by @date(dueDate)</span>
                              } else {
                                <span class="muted">Due by @date(dueDate)</span>
                              }
@@ -57,7 +57,16 @@
              </div>
            </div>
            <hr>
-            @helper.html.preview(repository, "", false, true, true, hasWritePermission, "width: 565px; height: 200px; max-height: 250px;", elastic = true)
+            @helper.html.preview(
+              repository         = repository,
+              content            = "",
+              enableWikiLink     = false,
+              enableRefsLink     = true,
+              enableTaskList     = true,
+              hasWritePermission = hasWritePermission,
+              style              = "width: 565px; height: 200px; max-height: 250px;",
+              elastic            = true
+            )
          </div>
        </div>
        <div class="pull-right">
--- a/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/issueinfo.scala.html
@@ -42,7 +42,7 @@
              <div class="small" style="padding-left: 20px;">
                @milestone.dueDate.map { dueDate =>
                  @if(isPast(dueDate)){
-                    <img src="@assets/common/images/alert.png"/><span class="milestone-alert">Due by @date(dueDate)</span>
+                  <i class="octicon octicon-alert" style="color:#BD2C00;"></i><span class="milestone-alert">Due by @date(dueDate)</span>
                  } else {
                    <span class="muted">Due by @date(dueDate)</span>
                  }
--- a/src/main/twirl/gitbucket/core/issues/labels/label.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/labels/label.scala.html
@@ -11,7 +11,7 @@
        <div style="margin-top: 6px">
          <a href="@url(repository)/issues?labels=@urlEncode(label.labelName)" id="label-row-content-@label.labelId">
            <span style="background-color: #@label.color; color: #@label.fontColor; padding: 8px; font-size: 120%; border-radius: 4px;">
-              <img src="@assets/common/images/label_@(if(label.fontColor == "ffffff") "white" else "black").png" style="width: 12px;"/>
+              <i class="octicon octicon-tag" style="color: #@label.fontColor;"></i>
              @label.labelName
            </span>
          </a>
--- a/src/main/twirl/gitbucket/core/issues/listparts.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/listparts.scala.html
@@ -16,8 +16,7 @@
@if(condition.nonEmpty){
  <div>
    <a href="@gitbucket.core.service.IssuesService.IssueSearchCondition().toURL" class="header-link">
-      <img src="@assets/common/images/clear.png" class="header-icon"/>
-      <img src="@assets/common/images/clear_hover.png" class="header-icon-hover" style="display: none;"/>
+      <i class="octicon octicon-x" ></i>
      <span class="strong">Clear current search query, filters, and sorts</span>
    </a>
  </div>
@@ -28,11 +27,11 @@
      <input type="checkbox"/>
      <span class="small">
        <a class="button-link@if(condition.state == "open"){ selected}" href="@condition.copy(state = "open").toURL">
-          <img src="@assets/common/images/status-open@(if(condition.state == "open"){"-active"}).png"/>
+          <i class="octicon octicon-issue-opened @(if(condition.state == "open"){"active"})"></i>
          @openCount Open
        </a>&nbsp;&nbsp;
        <a class="button-link@if(condition.state == "closed"){ selected}" href="@condition.copy(state = "closed").toURL">
-          <img src="@assets/common/images/status-closed@(if(condition.state == "closed"){"-active"}).png"/>
+          <i class="octicon octicon-check @(if(condition.state == "closed"){"active"})"></i>
          @closedCount Closed
        </a>
      </span>
@@ -176,7 +175,7 @@
        @if(hasWritePermission){
          <input type="checkbox" value="@issue.issueId"/>
        }
-        <img src="@assets/common/images/issue-@(if(issue.closed) "closed" else "open").png" style="margin-right: 20px;"/>
+        <i class="octicon octicon-issue-@(if(issue.closed) "closed" else "opened")" style="margin-right: 3px;"></i>
        @if(repository.isEmpty){
          <a href="@path/@issue.userName/@issue.repositoryName">@issue.repositoryName</a>&nbsp;&#xFF65;
        }
@@ -195,18 +194,19 @@
          }
          @if(commentCount > 0){
            <a href="@path/@issue.userName/@issue.repositoryName/issues/@issue.issueId" class="issue-comment-count">
-              <img src="@assets/common/images/comment-active.png"> @commentCount
+              <i class="octicon octicon-comment active"></i> @commentCount
            </a>
          } else {
            <a href="@path/@issue.userName/@issue.repositoryName/issues/@issue.issueId" class="issue-comment-count" style="color: silver;">
-              <img src="@assets/common/images/comment.png"> @commentCount
+              <i class="octicon octicon-comment"></i> @commentCount
            </a>
          }
        </span>
        <div class="small muted" style="margin-left: 40px; margin-top: 5px;">
          #@issue.issueId opened  @helper.html.datetimeago(issue.registeredDate) by @user(issue.openedUserName, styleClass="username")
          @milestone.map { milestone =>
-            <span style="margin: 20px;"><a href="@condition.copy(milestone = Some(Some(milestone))).toURL" class="username"><img src="@assets/common/images/milestone.png"> @milestone</a></span>
+            <span style="margin: 20px;"><a href="@condition.copy(milestone = Some(Some(milestone))).toURL" class="username"><i class="octicon octicon-milestone"></i>
+@milestone</a></span>
          }
        </div>
      </td>
@@ -216,4 +216,3 @@
 <div class="pull-right">
  @helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), gitbucket.core.service.IssuesService.IssueLimit, 10, condition.toURL)
 </div>
-
--- a/src/main/twirl/gitbucket/core/issues/milestones/list.scala.html
+++ b/src/main/twirl/gitbucket/core/issues/milestones/list.scala.html
@@ -13,11 +13,11 @@
        <th style="background-color: #eee;">
          <span class="small">
            <a class="button-link@if(state == "open"){ selected}" href="?state=open">
-              <img src="@assets/common/images/milestone@(if(state == "open"){"-active"}).png"/>
+              <i class="octicon octicon-milestone @(if(state == "open"){"active"})"></i>
              @milestones.count(_._1.closedDate.isEmpty) Open
            </a>&nbsp;&nbsp;
            <a class="button-link@if(state == "closed"){ selected}" href="?state=closed">
-              <img src="@assets/common/images/milestone@(if(state == "closed"){"-active"}).png"/>
+              <i class="octicon octicon-milestone @(if(state == "closed"){"active"})"></i>
              @milestones.count(_._1.closedDate.isDefined) Closed
            </a>
          </span>
@@ -38,7 +38,7 @@
                  } else {
                    @milestone.dueDate.map { dueDate =>
                      @if(isPast(dueDate)){
-                        <img src="@assets/common/images/alert.png"/><span class="muted milestone-alert">Due by @date(dueDate)</span>
+                        <i class="octicon octicon-alert" style="color:#BD2C00;"></i><span class="muted milestone-alert">Due by @date(dueDate)</span>
                      } else {
                        <span class="muted">Due by @date(dueDate)</span>
                      }
--- a/src/main/twirl/gitbucket/core/main.scala.html
+++ b/src/main/twirl/gitbucket/core/main.scala.html
@@ -13,6 +13,7 @@
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <link href="@assets/vendors/bootstrap/css/bootstrap.css" rel="stylesheet">
    <link href="@assets/vendors/bootstrap/css/bootstrap-responsive.css" rel="stylesheet">
+    <link href="@assets/vendors/octicons/octicons.css" rel="stylesheet">
    <link href="@assets/vendors/datepicker/css/datepicker.css" rel="stylesheet">
    <link href="@assets/vendors/colorpicker/css/bootstrap-colorpicker.css" rel="stylesheet">
    <link href="@assets/vendors/google-code-prettify/prettify.css" type="text/css" rel="stylesheet"/>
@@ -30,12 +31,17 @@
    <script src="@assets/vendors/elastic/jquery.elastic.source.js"></script>
    <script src="@assets/vendors/facebox/facebox.js"></script>
    <script src="@assets/vendors/jquery-hotkeys/jquery.hotkeys.js"></script>
+    @repository.map { repository =>
+      @if(!repository.repository.isPrivate){
+        <meta name="go-import" content="@context.baseUrl.replaceFirst("^https?://", "")/@repository.owner/@repository.name git @repository.httpUrl" />
+      }
+    }
  </head>
  <body>
    <form id="search" action="@path/search" method="POST">
      <div class="navbar">
        <div class="navbar-inner">
-          <div class="container">
+          <div class="container" style="width: 920px;">
            <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
              <span class="icon-bar"></span>
              <span class="icon-bar"></span>
@@ -46,27 +52,38 @@
              @defining(AutoUpdate.getCurrentVersion){ version =>
                <span class="header-version">@version.majorVersion.@version.minorVersion</span>
              }
+
            </a>
+            @repository.map { repository =>
+              <input type="text" name="query" style="width: 200px; margin-top: 5px; margin-bottom: 0px;" placeholder="Search this repository"/>
+              <input type="hidden" name="owner" value="@repository.owner"/>
+              <input type="hidden" name="repository" value="@repository.name"/>
+            }
+            @if(loginAccount.isDefined){
+              <a href="@path/dashboard/pulls" class="global-header-menu">Pull requests</a>
+              <a href="@path/dashboard/issues" class="global-header-menu">Issues</a>
+            }
            <div class="nav-collapse collapse pull-right header-menu">
-              @repository.map { repository =>
-                <input type="text" name="query" style="width: 300px; margin-bottom: 0px;" placeholder="Search this repository"/>
-                <input type="hidden" name="owner" value="@repository.owner"/>
-                <input type="hidden" name="repository" value="@repository.name"/>
-              }
              @if(loginAccount.isDefined){
-                <a href="@url(loginAccount.get.userName)" class="username menu">@avatar(loginAccount.get.userName, 20) @loginAccount.get.userName</a>
-                <a class="dropdown-toggle menu" data-toggle="dropdown" href="#"><i class="icon-plus"></i><span class="caret" style="vertical-align: middle;"></span></a>
-                <ul class="dropdown-menu">
-                  <li><a href="@path/new">New repository</a></li>
-                  <li><a href="@path/groups/new">New group</a></li>
-                </ul>
-                <a href="@url(loginAccount.get.userName)/_edit" class="menu" data-toggle="tooltip" data-placement="bottom" title="Account settings"><i class="icon-user" aria-label="Account settings"></i></a>
-                @if(loginAccount.get.isAdmin){
-                  <a href="@path/admin/users" class="menu" data-toggle="tooltip" data-placement="bottom" title="Administration"><i class="icon-wrench" aria-label="Administration"></i></a>
-                }
-                <a href="@path/signout" class="menu-last" data-toggle="tooltip" data-placement="bottom" title="Sign out"><i class="icon-share-alt" aria-label="Sign out"></i></a>
+                <div class="btn-group" style="margin-top: 0px;">
+                  <a class="dropdown-toggle menu" data-toggle="dropdown" href="#"><i class="octicon octicon-plus" style="font-size: 20px; vertical-align: top; margin-top: 10px;"></i><span class="caret" style="vertical-align: middle;"></span></a>
+                  <ul class="dropdown-menu">
+                    <li><a href="@path/new">New repository</a></li>
+                    <li><a href="@path/groups/new">New group</a></li>
+                  </ul>
+                </div>
+                <div class="btn-group" style="margin-top: 0px;">
+                  <a class="dropdown-toggle menu" data-toggle="dropdown" href="#" data-toggle="tooltip" data-placement="bottom" title="Signed is as @loginAccount.get.userName">@avatar(loginAccount.get.userName, 16)<span class="caret" style="vertical-align: middle;"></span></a>
+                  <ul class="dropdown-menu">
+                    <li><a href="@url(loginAccount.get.userName)/_edit">Account settings</a></li>
+                    @if(loginAccount.get.isAdmin){
+                      <li><a href="@path/admin/users">System administration</a></li>
+                    }
+                    <li><a href="@path/signout">Sign out</a></li>
+                  </ul>
+                </div>
              } else {
-                <a href="@path/signin?redirect=@urlEncode(currentPath)" class="btn btn-last" id="signin">Sign in</a>
+                <a href="@path/signin?redirect=@urlEncode(currentPath)" class="btn" id="signin">Sign in</a>
              }
            </div><!--/.nav-collapse -->
          </div>
--- a/src/main/twirl/gitbucket/core/menu.scala.html
+++ b/src/main/twirl/gitbucket/core/menu.scala.html
@@ -9,16 +9,11 @@
@import context._
@import gitbucket.core.view.helpers._

-@sidemenu(path: String, name: String, label: String, count: Int = 0) = {
+@sidemenu(path: String, name: String, icon: String, label: String, count: Int = 0) = {
  <li @if(active == name){class="active"} @if(!expand){data-toggle="tooltip" data-placement="left" data-original-title="@label"}>
    <div class="@if(active == name){margin} else {gradient} pull-left"></div>
    <a href="@url(repository)@path">
-      @if(active == name){
-        <img src="@assets/common/images/menu-@{name}-active.png">
-      } else {
-        <img src="@assets/common/images/menu-@{name}-active.png" class="menu-icon-active" style="display:none;">
-        <img src="@assets/common/images/menu-@{name}.png"        class="menu-icon">
-      }
+      <i class="menu-icon @if(active == name){menu-icon-active} octicon octicon-@{icon} "></i>
      @if(expand){ @label}
      @if(expand && count > 0){
        <div class="pull-right"><span class="label">@count</span></div>
@@ -27,13 +22,6 @@
  </li>
 }

-@sidemenuPlugin(path: String, name: String, label: String, icon: String) = {
-  <li @if(active == name){class="active"}>
-    <div class="@if(active == name){margin} else {gradient} pull-left"></div>
-    <a href="@url(repository)@path"><img src="@icon"/>@if(expand){ @label}</a>
-  </li>
-}
-
 <div class="container">
  @helper.html.information(info)
  @helper.html.error(error)
@@ -41,7 +29,7 @@
    <div class="pull-right">
      <div class="input-prepend">
        @if(loginAccount.isEmpty){
-          <a title="You must be signed in to fork a repository" href="@path/signin" class="btn btn-small" style="margin-bottom: 10px;">Fork</a>
+          <a title="You must be signed in to fork a repository" href="@path/signin?redirect=@urlEncode(s"${path}/${repository.owner}/${repository.name}")" class="btn btn-small" style="margin-bottom: 10px;">Fork</a>
        } else {
          @if(isNoGroup) {
            <a id="fork-link" href="javascript:void(0);" class="btn btn-small" style="margin-bottom: 10px;">Fork</a>
@@ -51,12 +39,12 @@
        }
        <span class="add-on count"><a href="@url(repository)/network/members">@repository.forkedCount</a></span>
      </div>
+      @if(loginAccount.isDefined && isNoGroup){
+        <form id="fork-form" method="post" action="@path/@repository.owner/@repository.name/fork">
+          <input type="hidden" name="account" value="@loginAccount.get.userName"/>
+        </form>
+      }
    </div>
-    @if(loginAccount.isDefined && isNoGroup){
-      <form id="fork-form" method="post" action="@path/@repository.owner/@repository.name/fork">
-        <input type="hidden" name="account" value="@loginAccount.get.userName"/>
-      </form>
-    }
  }
  <div class="head">
    @helper.html.repositoryicon(repository, true)
@@ -76,12 +64,12 @@
  <div style="width: @if(expand){170px} else {40px};" class="pull-right">
    <ul class="sidemenu">
      <li style="height: 12px"><div class="gradient pull-left" style="height: 12px"></div></li>
-      @sidemenu(""       , "code"  , "Code")
-      @sidemenu("/issues", "issues", "Issues", repository.issueCount)
-      @sidemenu("/pulls" , "pulls" , "Pull Requests", repository.pullCount)
-      @sidemenu("/wiki"  , "wiki"  , "Wiki")
+      @sidemenu(""       , "code"   , "code" , "Code")
+      @sidemenu("/issues", "issues" , "issue-opened" , "Issues", repository.issueCount)
+      @sidemenu("/pulls" , "pulls"  , "git-pull-request" , "Pull Requests", repository.pullCount)
+      @sidemenu("/wiki"  , "wiki"   , "book"  , "Wiki")
      @if(loginAccount.isDefined && (loginAccount.get.isAdmin || repository.managers.contains(loginAccount.get.userName))){
-        @sidemenu("/settings", "settings", "Settings")
+        @sidemenu("/settings" , "settings" , "tools", "Settings")
      }
      <li style="height: 12px"><div class="gradient pull-left" style="height: 12px"></div></li>
    </ul>
@@ -99,10 +87,10 @@
      }
      @id.map { id =>
        <div style="margin-top: 10px;">
-          <a href="@{url(repository)}/archive/@{encodeRefName(id)}.zip" class="btn btn-small" style="width: 147px;"><i class="icon-download-alt"></i>Download ZIP</a>
+          <a href="@{url(repository)}/archive/@{encodeRefName(id)}.zip" class="btn btn-small" style="width: 147px;font-weight: bold;"><i class="octicon octicon-cloud-download"></i>Download ZIP</a>
        </div>
        <div style="margin-top: 10px;">
-          <a href="@{url(repository)}/archive/@{encodeRefName(id)}.tar.gz" class="btn btn-small" style="width: 147px;"><i class="icon-download-alt"></i>Download TAR.GZ</a>
+          <a href="@{url(repository)}/archive/@{encodeRefName(id)}.tar.gz" class="btn btn-small" style="width: 147px;font-weight: bold;"><i class="octicon octicon-cloud-download"></i>Download TAR.GZ</a>
        </div>
      }
    }
@@ -117,22 +105,19 @@
          <tr>
            <td style="width: 33%; text-align: center;">
              <a href="@url(repository)/commits/@encodeRefName(id.getOrElse(""))" class="header-link">
-                <img src="@assets/common/images/header-commits-hover.png" class="header-icon-hover" style="display: none;"/>
-                <img src="@assets/common/images/header-commits.png"       class="header-icon"/>
+                <i class="octicon octicon-history"></i>
                <strong>@repository.commitCount</strong> commits
              </a>
            </td>
            <td style="width: 33%; text-align: center;">
              <a href="@url(repository)/branches" class="header-link" class="header-link">
-                <img src="@assets/common/images/header-branches-hover.png" class="header-icon-hover" style="display: none;"/>
-                <img src="@assets/common/images/header-branches.png"       class="header-icon"/>
+                <i class="octicon octicon-git-branch"></i>
                <strong>@repository.branchList.length</strong> branches
              </a>
            </td>
            <td style="width: 33%; text-align: center;">
              <a href="@url(repository)/tags" class="header-link" class="header-link">
-                <img src="@assets/common/images/header-tags-hover.png" class="header-icon-hover" style="display: none;"/>
-                <img src="@assets/common/images/header-tags.png"       class="header-icon"/>
+                <i class="octicon octicon-tag"></i>
                <strong>@repository.tags.length</strong> releases
              </a>
            </td>
@@ -145,44 +130,21 @@
 </div>
 <script>
 $(function(){
-  $('a.header-link').mouseover(function(e){
-    var target = e.target;
-    if(e.target.tagName != 'A'){
-      target = e.target.parentElement;
-    }
-    $(target).children('strong'               ).css('color', '#0088cc');
-    $(target).children('img.header-icon-hover').css('display', 'inline');
-    $(target).children('img.header-icon'      ).css('display', 'none');
-  });
-
-  $('a.header-link').mouseout(function(e){
-    var target = e.target;
-    if(e.target.tagName != 'A'){
-      target = e.target.parentElement;
-    }
-    $(target).children('strong'               ).css('color', 'black');
-    $(target).children('img.header-icon-hover').css('display', 'none');
-    $(target).children('img.header-icon'      ).css('display', 'inline');
-  });

  $('ul.sidemenu a').mouseover(function(e){
    var target = e.target;
-    if(e.target.tagName == "IMG"){
+    if(e.target.tagName == "I"){
      target = e.target.parentElement;
    }
    $(target).prev    ('div.gradient'        ).css('border-left', '1px solid silver');
-    $(target).children('img.menu-icon-active').css('display', 'inline');
-    $(target).children('img.menu-icon'       ).css('display', 'none');
  });

  $('ul.sidemenu a').mouseout(function(e){
    var target = e.target;
-    if(e.target.tagName == "IMG"){
+    if(e.target.tagName == "I"){
      target = e.target.parentElement;
    }
    $(target).prev    ('div.gradient'        ).css('border-left', '1px solid #eee');
-    $(target).children('img.menu-icon-active').css('display', 'none');
-    $(target).children('img.menu-icon'       ).css('display', 'inline');
  });

  $('a[rel*=facebox]').facebox({
--- a/src/main/twirl/gitbucket/core/pulls/compare.scala.html
+++ b/src/main/twirl/gitbucket/core/pulls/compare.scala.html
@@ -59,7 +59,15 @@
              <div style="width: 600px; border-right: 1px solid #d4d4d4;">
                <span class="error" id="error-title"></span>
                <input type="text" name="title" style="width: 580px" placeholder="Title"/>
-                @helper.html.preview(repository, "", false, true, true, hasWritePermission, "width: 580px; height: 200px;")
+                @helper.html.preview(
+                  repository         = repository,
+                  content            = "",
+                  enableWikiLink     = false,
+                  enableRefsLink     = true,
+                  enableTaskList     = true,
+                  hasWritePermission = hasWritePermission,
+                  style              = "width: 580px; height: 200px;"
+                )
                <input type="hidden" name="targetUserName" value="@originRepository.owner"/>
                <input type="hidden" name="targetBranch" value="@originId"/>
                <input type="hidden" name="requestUserName" value="@forkedRepository.owner"/>
@@ -131,7 +139,7 @@ $(function(){
  }

  @if(hasWritePermission){
-    function checkConflict(from, to, noConflictHandler, hasConflictHandler){
+    function checkConflict(from, to){
      $('.check-conflict').show();
      $.get('@url(repository)/compare/' + from + '...' + to + '/mergecheck',
        function(data){ $('.check-conflict').html(data); });
--- a/src/main/twirl/gitbucket/core/repo/blob.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/blob.scala.html
@@ -75,10 +75,10 @@
      <tr>
        <td>
          @if(content.viewType == "text"){
-            @defining(renderableSuffixes.find(suffix => pathList.reverse.head.toLowerCase.endsWith(suffix))) { isRrenderable =>
+            @defining(isRenderable(pathList.reverse.head)){ isRrenderable =>
              @if(!isBlame && isRrenderable) {
                <div class="box-content markdown-body" style="border: none; padding-left: 16px; padding-right: 16px;">
-                  @renderMarkup(pathList, content.content.get, branch, repository, false, false)
+                  @renderMarkup(pathList, content.content.get, branch, repository, false, false, true)
                </div>
              } else {
                <pre class="prettyprint linenums blob @if(!isRrenderable){ no-renderable } ">@content.content.get</pre>
@@ -152,7 +152,7 @@ $(window).load(function(){
  });

  function updateBlame(){
-    var m = /^\/(blame|blob)(\/.*)$/.exec(location.pathname.substring(repository.length));
+    var m = /^\/(blame|blob)(\/.*)$/.exec(location.href.substring(repository.length));
    var mode = m[1];
    $('.blame-action').toggleClass("active", mode=='blame').attr('href', repository + (m[1]=='blame'?'/blob':'/blame')+m[2]);
    if(pre.parents("td").find(".blame").length){
--- a/src/main/twirl/gitbucket/core/repo/branches.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/branches.scala.html
@@ -30,9 +30,17 @@
                  }
                }.getOrElse{
                  @if(context.loginAccount.isDefined){
-                    <a href="@url(repository)/compare/@{encodeRefName(repository.repository.defaultBranch)}...@{encodeRefName(branch.name)}?expand=1" class="btn btn-small">New Pull Request</a>
+                    <a href="@url(repository)/compare/@{repository.repository.parentUserName.map { parent =>
+                      urlEncode(parent) + ":" + encodeRefName(repository.repository.defaultBranch)
+                    }.getOrElse {
+                      encodeRefName(repository.repository.defaultBranch)
+                    }}...@{encodeRefName(branch.name)}?expand=1" class="btn btn-small">New Pull Request</a>
                  }else{
-                    <a href="@url(repository)/compare/@{encodeRefName(repository.repository.defaultBranch)}...@{encodeRefName(branch.name)}" class="btn btn-small">Compare</a>
+                    <a href="@url(repository)/compare/@{repository.repository.parentUserName.map { parent =>
+                      urlEncode(parent) + ":" + encodeRefName(repository.repository.defaultBranch)
+                    }.getOrElse {
+                      encodeRefName(repository.repository.defaultBranch)
+                    }}...@{encodeRefName(branch.name)}" class="btn btn-small">Compare</a>
                  }
                }
                @if(hasWritePermission){
@@ -75,7 +83,7 @@
 <script>
 $(function(){
  $('.delete-branch').click(function(e){
-    var branchName = $(e.target).data('name');
+    var branchName = $(e.target).closest('a').data('name');
    return confirm('Are you sure you want to remove the ' + branchName + ' branch?');
  });
  $('*[data-toggle=tooltip]').tooltip().css("white-space","nowrap");
--- a/src/main/twirl/gitbucket/core/repo/commentform.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/commentform.scala.html
@@ -15,7 +15,16 @@
    }
    <div class="box issue-comment-box">
      <div class="box-content">
-        @helper.html.preview(repository, "", false, true, true, hasWritePermission, "width: 635px; height: 100px; max-height: 150px;", elastic = true)
+        @helper.html.preview(
+          repository         = repository,
+          content            = "",
+          enableWikiLink     = false,
+          enableRefsLink     = true,
+          enableTaskList     = true,
+          hasWritePermission = hasWritePermission,
+          style              = "width: 635px; height: 100px; max-height: 150px;",
+          elastic            = true
+        )
      </div>
      @if(fileName.isDefined){
        <div class="pull-right" style="margin-top: 10px;">
--- a/src/main/twirl/gitbucket/core/repo/commit.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/commit.scala.html
@@ -25,7 +25,7 @@
          <div class="small" style="font-weight: normal;">
            @if(branches.nonEmpty){
              <span class="muted">
-                <img src="@assets/common/images/branch.png"/>
+                  <i class="octicon octicon-git-branch"></i>
                @branches.zipWithIndex.map { case (branch, i) =>
                  <a href="@url(repository)/tree/@encodeRefName(branch)" class="branch" id="branch-@i">@branch</a>
                }
@@ -33,7 +33,7 @@
            }
            @if(tags.nonEmpty){
              <span class="muted">
-                <img src="@assets/common/images/tag.png"/>
+                  <i class="octicon octicon-tag"></i>
                @tags.zipWithIndex.map { case (tag, i) =>
                  <a href="@url(repository)/tree/@tag" class="tag" id="tag-@i">@tag</a>
                }
--- a/src/main/twirl/gitbucket/core/repo/editor.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/editor.scala.html
@@ -120,7 +120,7 @@ $(function(){
    $('#editor').hide();
    $('#preview').show()

-    @if(renderableSuffixes.find(suffix => fileName.map(_.toLowerCase.endsWith(suffix)).getOrElse(false))) {
+    @if(fileName.map(isRenderable _).getOrElse(false)) {
      // update preview
      $('#preview').html('<img src="@assets/common/images/indicator.gif"> Previewing...');
      $.post('@url(repository)/_preview', {
--- a/src/main/twirl/gitbucket/core/repo/files.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/files.scala.html
@@ -39,7 +39,7 @@
        <a href="@url(repository)/tree/@encodeRefName(branch)/@pathList.take(i + 1).mkString("/")">@section</a> /
      }
      @if(hasWritePermission){
-        <a href="@url(repository)/new/@encodeRefName(branch)/@pathList.mkString("/")"><img src="@assets/common/images/newfile.png"/></a>
+        <a href="@url(repository)/new/@encodeRefName(branch)/@pathList.mkString("/")" title="Create a new file here" style="text-decoration: none;">+</i></a>
      }
    </div>
    <table class="table table-file-list">
@@ -88,12 +88,12 @@
        <td width="16">
        @if(file.isDirectory){
          @if(file.linkUrl.isDefined){
-            <img src="@assets/common/images/folder_link.png"/>
+            <i class="octicon octicon-file-symlink-directory"></i>
          } else {
-            <img src="@assets/common/images/folder.png"/>
+            <i class="octicon octicon-file-directory"></i>
          }
        } else {
-          <img src="@assets/common/images/file.png"/>
+          <i class="octicon octicon-file-text"></i>
        }
        </td>
        <td>
@@ -128,7 +128,7 @@
    @readme.map { case(filePath, content) =>
      <div id="readme">
        <div class="box-header">@filePath.reverse.head</div>
-        <div class="box-content markdown-body">@renderMarkup(filePath, content, branch, repository, false, false)</div>
+        <div class="box-content markdown-body">@renderMarkup(filePath, content, branch, repository, false, false, true)</div>
      </div>
    }
  }
--- a/src/main/twirl/gitbucket/core/wiki/edit.scala.html
+++ b/src/main/twirl/gitbucket/core/wiki/edit.scala.html
@@ -22,7 +22,17 @@
    <form action="@url(repository)/wiki/@if(page.isEmpty){_new} else {_edit}" method="POST" validate="true">
      <span id="error-pageName" class="error"></span>
      <input type="text" name="pageName" value="@pageName" style="width: 850px; font-weight: bold;" placeholder="Input a page name."/>
-      @helper.html.preview(repository, page.map(_.content).getOrElse(""), true, false, false, false, "width: 850px; height: 400px;", "")
+      @helper.html.preview(
+        repository         = repository,
+        content            = page.map(_.content).getOrElse(""),
+        enableWikiLink     = true,
+        enableRefsLink     = false,
+        enableTaskList     = false,
+        hasWritePermission = false,
+        style              = "width: 850px; height: 400px;",
+        styleClass         = "monospace",
+        placeholder        = ""
+      )
      <input type="text" name="message" value="" style="width: 850px;" placeholder="Write a small message here explaining this change. (Optional)"/>
      <input type="hidden" name="currentPageName" value="@pageName"/>
      <input type="hidden" name="id" value="@page.map(_.id)"/>
--- a/src/main/webapp/assets/common/css/gitbucket.css
+++ b/src/main/webapp/assets/common/css/gitbucket.css
@@ -36,7 +36,30 @@ h6 {
  font-size: 18px;
 }

+.octicon,.mega-octicon{
+    color : #999;
+    width: 14px;
+    height: 14px;
+    /*font-size: 14px;*/
+    text-align: center;
+}
+.mega-octicon{
+    width: 32px;
+    height: 32px;
+}

+.octicon.active,.mega-octicon.active{
+    color : #333;
+}
+
+.octicon-cloud-download{
+    color: #333;
+    margin-right: 5px;
+}
+
+.head .octicon,.head .mega-octicon{
+    color : #BBB;
+}
 /* ======================================================================== */
 /* Global Header */
 /* ======================================================================== */
@@ -55,6 +78,10 @@ div.header-menu {
  line-height: 40px;
 }

+div.header-menu .octicon{
+  color: #333;
+}
+
 div.header-menu input,
 div.header-menu a.btn {
  margin-top: 0px;
@@ -73,6 +100,7 @@ div.nav-collapse a.menu-last {
 .navbar .brand {
  padding-top: 6px;
  padding-bottom: 6px;
+  padding-left: 0px;
 }

 .navbar .brand img {
@@ -94,12 +122,23 @@ div.input-prepend span.count {
  padding-bottom: 6px;
 }

+a.global-header-menu {
+  color: black;
+  font-weight: bold;
+  font-size: 80%;
+  margin-left: 10px;
+  margin-right: 10px;
+  line-height: 3.5;
+}
+
+/*
 img.plugin-global-menu {
  width: 16px;
  height: 16px;
  position: relative;
  top: -2px;
 }
+*/

 /* ======================================================================== */
 /* General Styles */
@@ -230,6 +269,7 @@ div.box-header-small {
  background: #f2f8fa;
 }

+
 div.box-content {
  background-color: white;
  border: 1px solid #d8d8d8;
@@ -250,6 +290,10 @@ th.box-header {
  text-shadow: 0 1px 0 #fff
 }

+th.box-header .octicon {
+    display: inline;
+}
+
 th.metal {
  background-color: #e0e0e0;
  background-image: -moz-linear-gradient(#fafafa, #e8e8e8);
@@ -326,6 +370,10 @@ span.highlight {
  width: 100%;
 }

+.dz-clickable {
+  cursor: pointer;
+}
+
 /****************************************************************************/
 /* Side Menu */
 /****************************************************************************/
@@ -333,12 +381,6 @@ ul.sidemenu {
  margin-left: 0px;
 }

-ul.sidemenu img {
-  width: 14px;
-  height: 14px;
-}
-
-
 ul.sidemenu a:hover{
  text-decoration: none;
 }
@@ -379,6 +421,9 @@ ul.sidemenu span.badge {
  padding-right: 4px;
 }

+ul.sidemenu a:hover i.menu-icon, ul.sidemenu i.menu-icon-active {
+  color: #333;
+}
 /****************************************************************************/
 /* Create Repository */
 /****************************************************************************/
@@ -545,6 +590,10 @@ div.activity-content {
  margin-left: 40px;
 }

+div[class^="activity-icon"] i{
+    color: #BBB;
+}
+
 /****************************************************************************/
 /* Repository Viewer */
 /****************************************************************************/
@@ -557,9 +606,8 @@ a.header-link {
  font-size: 90%;
 }

-a.header-link img {
-  width: 14px;
-  height: 14px;
+a.header-link i.octicon {
+  opacity: 0.5;
 }

 a.header-link strong {
@@ -568,10 +616,30 @@ a.header-link strong {
 }

 a.header-link:hover {
-  color: #0088cc;
+  color: #4183c4;
  text-decoration: none;
 }

+a.header-link:hover i.octicon, a.header-link:hover strong{
+  color: inherit;
+}
+
+a.header-link i.octicon-x{
+    opacity: 1;
+    width: 20px;
+    height: 20px;
+    margin-right: 3px;
+    color: #FFF;
+    line-height: 20px;
+    background-color: #777;
+    border-radius: 3px;
+}
+a.header-link:hover i.octicon-x{
+    background-color: #4183c4;
+    color: #FFF;
+}
+
+
 table.blobview {
  table-layout: fixed;
 }
@@ -776,6 +844,9 @@ a.button-link {
    color: gray;
 }

+a.button-link i {
+    color: inherit;
+}
 a.selected {
    font-weight: bold;
    color: black;
@@ -791,6 +862,14 @@ table.table-issues {
  margin-top: 12px;
 }

+table.table-issues td .octicon-issue-opened,table.table-issues td .octicon-git-pull-request .open {
+  color: #6CC644;
+}
+
+table.table-issues td .octicon-issue-closed,table.table-issues td .octicon-git-pull-request .closed{
+  color : #BD2C00;;
+}
+
 a.issue-title {
  color: #333;
  font-weight: bold;
@@ -1519,13 +1598,15 @@ div.markdown-body table colgroup + tbody tr:first-child td:last-child {

 a.markdown-anchor-link {
  position: absolute;
-  left: -20px;
-  width: 32px;
-  height: 16px;
-  background-image: url(../images/link.png);
-  background-repeat: no-repeat;
+  left: -18px;
  display: none;
+  color: #999;
+  /* From octicon style */
+  font: normal normal normal 16px/1 octicons;
+  text-decoration: none;
+  text-rendering: auto;
 }
+a.markdown-anchor-link:before { content: '\f05c'} /*  */

 h1 a.markdown-anchor-link {
  top: 24px;
@@ -1774,3 +1855,11 @@ div.container.blame-container{
      display: inline;
    }
 }
+
+/****************************************************************************/
+/* Print */
+/****************************************************************************/
+a[href]:after {
+  display: none;
+}  
+
--- a/src/main/webapp/assets/common/images/activity-branch.png
+++ b/src/main/webapp/assets/common/images/activity-branch.png
--- a/src/main/webapp/assets/common/images/activity-comment.png
+++ b/src/main/webapp/assets/common/images/activity-comment.png
--- a/src/main/webapp/assets/common/images/activity-commit.png
+++ b/src/main/webapp/assets/common/images/activity-commit.png
--- a/src/main/webapp/assets/common/images/activity-create-repository.png
+++ b/src/main/webapp/assets/common/images/activity-create-repository.png
--- a/src/main/webapp/assets/common/images/activity-delete.png
+++ b/src/main/webapp/assets/common/images/activity-delete.png
--- a/src/main/webapp/assets/common/images/activity-fork.png
+++ b/src/main/webapp/assets/common/images/activity-fork.png
--- a/src/main/webapp/assets/common/images/activity-issue-close.png
+++ b/src/main/webapp/assets/common/images/activity-issue-close.png
--- a/src/main/webapp/assets/common/images/activity-issue-reopen.png
+++ b/src/main/webapp/assets/common/images/activity-issue-reopen.png
--- a/src/main/webapp/assets/common/images/activity-issue.png
+++ b/src/main/webapp/assets/common/images/activity-issue.png
--- a/src/main/webapp/assets/common/images/activity-merge.png
+++ b/src/main/webapp/assets/common/images/activity-merge.png
--- a/src/main/webapp/assets/common/images/activity-tag.png
+++ b/src/main/webapp/assets/common/images/activity-tag.png
--- a/src/main/webapp/assets/common/images/activity-wiki.png
+++ b/src/main/webapp/assets/common/images/activity-wiki.png
--- a/src/main/webapp/assets/common/images/alert.png
+++ b/src/main/webapp/assets/common/images/alert.png
--- a/src/main/webapp/assets/common/images/branch.png
+++ b/src/main/webapp/assets/common/images/branch.png
--- a/src/main/webapp/assets/common/images/clear.png
+++ b/src/main/webapp/assets/common/images/clear.png
--- a/src/main/webapp/assets/common/images/clear_hover.png
+++ b/src/main/webapp/assets/common/images/clear_hover.png
--- a/src/main/webapp/assets/common/images/comment-active.png
+++ b/src/main/webapp/assets/common/images/comment-active.png
--- a/src/main/webapp/assets/common/images/comment.png
+++ b/src/main/webapp/assets/common/images/comment.png
--- a/src/main/webapp/assets/common/images/diff_add.png
+++ b/src/main/webapp/assets/common/images/diff_add.png
--- a/src/main/webapp/assets/common/images/diff_delete.png
+++ b/src/main/webapp/assets/common/images/diff_delete.png
--- a/src/main/webapp/assets/common/images/diff_edit.png
+++ b/src/main/webapp/assets/common/images/diff_edit.png
--- a/src/main/webapp/assets/common/images/diff_move.png
+++ b/src/main/webapp/assets/common/images/diff_move.png
--- a/src/main/webapp/assets/common/images/file.png
+++ b/src/main/webapp/assets/common/images/file.png
--- a/src/main/webapp/assets/common/images/folder.png
+++ b/src/main/webapp/assets/common/images/folder.png
--- a/src/main/webapp/assets/common/images/folder_link.png
+++ b/src/main/webapp/assets/common/images/folder_link.png
--- a/src/main/webapp/assets/common/images/header-branches-hover.png
+++ b/src/main/webapp/assets/common/images/header-branches-hover.png
--- a/src/main/webapp/assets/common/images/header-branches.png
+++ b/src/main/webapp/assets/common/images/header-branches.png
--- a/src/main/webapp/assets/common/images/header-commits-hover.png
+++ b/src/main/webapp/assets/common/images/header-commits-hover.png
--- a/src/main/webapp/assets/common/images/header-commits.png
+++ b/src/main/webapp/assets/common/images/header-commits.png
--- a/src/main/webapp/assets/common/images/header-tags-hover.png
+++ b/src/main/webapp/assets/common/images/header-tags-hover.png
--- a/src/main/webapp/assets/common/images/header-tags.png
+++ b/src/main/webapp/assets/common/images/header-tags.png
--- a/src/main/webapp/assets/common/images/issue-closed.png
+++ b/src/main/webapp/assets/common/images/issue-closed.png
--- a/src/main/webapp/assets/common/images/issue-open.png
+++ b/src/main/webapp/assets/common/images/issue-open.png
--- a/src/main/webapp/assets/common/images/label_black.png
+++ b/src/main/webapp/assets/common/images/label_black.png
--- a/src/main/webapp/assets/common/images/label_white.png
+++ b/src/main/webapp/assets/common/images/label_white.png
--- a/src/main/webapp/assets/common/images/link.png
+++ b/src/main/webapp/assets/common/images/link.png
--- a/src/main/webapp/assets/common/images/menu-code-active.png
+++ b/src/main/webapp/assets/common/images/menu-code-active.png
--- a/src/main/webapp/assets/common/images/menu-code.png
+++ b/src/main/webapp/assets/common/images/menu-code.png
--- a/src/main/webapp/assets/common/images/menu-feed.png
+++ b/src/main/webapp/assets/common/images/menu-feed.png
--- a/src/main/webapp/assets/common/images/menu-issues-active.png
+++ b/src/main/webapp/assets/common/images/menu-issues-active.png
--- a/src/main/webapp/assets/common/images/menu-issues.png
+++ b/src/main/webapp/assets/common/images/menu-issues.png
--- a/src/main/webapp/assets/common/images/menu-pulls-active.png
+++ b/src/main/webapp/assets/common/images/menu-pulls-active.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Naoki Takezoe	836fa47812	GitBucket 3.5.0 release	2015-08-01 01:30:32 +09:00
Naoki Takezoe	77b3650580	(refs #844 )Improve global header menu	2015-07-28 21:53:51 +09:00
Naoki Takezoe	67ee6857ad	Remove unnecessary spec	2015-07-28 11:16:02 +09:00
Naoki Takezoe	5ab15c0a14	Merge branch 'beraboris-implement-668'	2015-07-28 11:13:51 +09:00
Naoki Takezoe	96a3f2c301	(refs #810 )Some fix about pull request	2015-07-28 11:12:11 +09:00
Naoki Takezoe	85707264c4	Fix position of fork-form	2015-07-28 02:04:49 +09:00
Naoki Takezoe	ed05422ea8	Merge branch 'implement-668' of https://github.com/beraboris/gitbucket into beraboris-implement-668	2015-07-28 01:58:30 +09:00
Naoki Takezoe	8f10c8051e	(refs #810 )Display Compare (or Pull Request) button for the default branch of the forked repository	2015-07-28 01:57:54 +09:00
Naoki Takezoe	41fff399b5	Redirect to the repository after sign-in by clicking fork button	2015-07-26 03:17:13 +09:00
Naoki Takezoe	9e237647b0	Small fix about icons	2015-07-26 02:59:26 +09:00
Naoki Takezoe	1be53c6746	Merge branch 'sapk-master'	2015-07-23 02:11:17 +09:00
Naoki Takezoe	f2368b03c0	(refs #409 )Fix header anchor name in Markdown	2015-07-23 00:53:29 +09:00
Naoki Takezoe	95284c0b36	(refs #409 )Fix Markdown style	2015-07-22 02:42:30 +09:00
Naoki Takezoe	f1e21a93fb	(refs #409 )Fix icons	2015-07-22 02:42:30 +09:00
Naoki Takezoe	689811f659	Add forks icon	2015-07-19 23:23:00 +09:00
Naoki Takezoe	33ccb4e98c	Merge branch 'uli-heller-email-sender'	2015-07-19 02:15:03 +09:00
Naoki Takezoe	29f6e98f9c	Merge branch 'email-sender' of https://github.com/uli-heller/gitbucket into uli-heller-email-sender	2015-07-19 02:14:36 +09:00
Naoki Takezoe	775c8cc064	Update release operation	2015-07-19 02:04:52 +09:00
Naoki Takezoe	9a974d047c	Small fix	2015-07-19 02:01:15 +09:00
Naoki Takezoe	3fd252d2db	Remove unnecessary file	2015-07-19 01:47:42 +09:00
Naoki Takezoe	43edb034c8	Merge branch 'linux-ubuntu1404' of https://github.com/uli-heller/gitbucket into uli-heller-linux-ubuntu1404	2015-07-19 01:46:40 +09:00
Naoki Takezoe	e629ca391e	Improve env.sh to extract GITBUCKET_VERSION from build.scala	2015-07-19 01:42:42 +09:00
Naoki Takezoe	0db7eba3f2	Merge pull request #836 from shiena/patch/fix_contenttype Fix duplicated Content-Type	2015-07-18 23:30:27 +09:00
Naoki Takezoe	a472abc88e	Merge pull request #829 from muddydixon/fix/group_image_cursor_css fixed cursor pointer css of group image change	2015-07-18 23:25:04 +09:00
Naoki Takezoe	861c619c19	Merge branch 'master' of https://github.com/sapk/gitbucket into sapk-master	2015-07-18 22:18:02 +09:00
Naoki Takezoe	124f331963	Fix testcase	2015-07-18 22:01:45 +09:00
Mitsuhiro Koga	76fcd44191	Fix duplicated Content-Type	2015-07-16 13:05:40 +09:00
Naoki Takezoe	2124c0b88c	Ignore ensime files	2015-07-14 02:49:21 +09:00
Naoki Takezoe	2f5ab8e3b9	(refs #830 )Bump pegdown to 1.5.0 and support strike syntax	2015-07-14 02:47:26 +09:00
muddydixon	32c8b6914b	fixed cursor pointer css of group image change	2015-07-13 16:54:12 +09:00
Naoki Takezoe	7e9d940f64	Merge branch 'beraboris-better-atom-titles'	2015-07-05 22:17:27 +09:00
Naoki Takezoe	59e826b630	(refs #811 )Remove html tags from title of atom feed	2015-07-05 22:15:39 +09:00
Naoki Takezoe	88f3ee4b13	Merge branch 'better-atom-titles' of https://github.com/beraboris/gitbucket into beraboris-better-atom-titles	2015-07-05 21:37:40 +09:00
Naoki Takezoe	b7380a084e	Merge pull request #814 from uli-heller/patch-1 Fixes #748 - duplicate c3p0.war	2015-07-05 21:33:36 +09:00
Naoki Takezoe	cb65e790ae	(refs #812 )Apply GitRepositoryFilter to SSH access too	2015-07-05 15:38:55 +09:00
Naoki Takezoe	573eabee93	(refs #812 )Prepend '/' to repository name	2015-07-05 15:08:52 +09:00
Naoki Takezoe	f0d4c6546a	(refs #812 )SSH support for plug-in served git repository	2015-07-05 14:16:16 +09:00
uli-heller	b0943c87c8	Fixes #748 - duplicate c3p0.war	2015-07-05 06:16:42 +02:00
Boris Bera	4f1208ea98	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	2015-07-04 15:29:09 -04:00
Naoki Takezoe	02f16639ea	Remove twirl-compiler from dependency	2015-07-05 00:50:27 +09:00
Naoki Takezoe	cd5e28c0b8	(refs #812 )Add GitRepositoryFilter for authentication	2015-07-05 00:13:34 +09:00
Naoki Takezoe	6f7579f8d9	(refs #812 )Add new extension point to serve Git repository by plug-in	2015-07-04 17:42:13 +09:00
Boris Bera	f1d2a71b49	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.	2015-07-03 21:23:53 -04:00
Boris Bera	fd4fe0dc0d	Pullreqs in forks now use upstream master as origin This implements #668.	2015-07-03 20:56:06 -04:00
Naoki Takezoe	3d5e4a4225	(refs #802 )Allow '+' in repository name	2015-07-03 21:40:26 +09:00
Naoki Takezoe	10ffb452d0	Fix delete branch confirmation message	2015-07-03 21:19:14 +09:00
Naoki Takezoe	3218bddbdc	(refs #808 )Add collaborators when fork repository by group	2015-07-03 20:47:37 +09:00
Naoki Takezoe	59f78dcbcb	Fix behavior when enableAnchor is false	2015-06-28 03:43:15 +09:00
Naoki Takezoe	0fe062a02f	Add option to disable anchor for headline in markdown	2015-06-28 03:20:55 +09:00
Naoki Takezoe	869eaf8cfd	Update version to 3.5.0-SNAPSHOT	2015-06-27 23:09:12 +09:00
Naoki Takezoe	5b445c9736	Improve declarative Plugin definition interface	2015-06-27 20:54:19 +09:00
Naoki Takezoe	6f3f3eaa99	Fix Wiki font style of Wiki editing form	2015-06-27 19:41:48 +09:00
Naoki Takezoe	a23ce92676	Add pom.xml for deploying assemble jar	2015-06-27 19:09:43 +09:00
Uli Heller	ad55d5199d	Use '{loginName} {fromAddress}' for the from field within the notification emails	2015-06-27 08:45:27 +02:00
Uli Heller	bd05895761	Make the release process work on linux	2015-06-27 07:11:23 +02:00
Uli Heller	c68dd6c891	Another change to make it work on linux - now linux and windows commands are mixed up unfortunately...	2015-06-27 06:56:12 +02:00
uli-heller	daae9ae1e7	Update how_to_run.md Once "bashism-source" is applied, the build runs smoothly on linux, no need to change anything...	2015-06-27 06:56:12 +02:00
Uli Heller	33dde75ae1	doc change: build.xml -> release/build.xml	2015-06-27 06:56:12 +02:00
Uli Heller	b2e1e1796d	Fixed bashism 'source'	2015-06-27 06:16:22 +02:00
Naoki Takezoe	c4a682773c	Fix warnings	2015-06-27 10:18:22 +09:00
Naoki Takezoe	07e1873cb3	Update release.md	2015-06-27 10:14:30 +09:00
Naoki Takezoe	14d0c4dc32	GitBucket 3.4 release	2015-06-27 10:12:25 +09:00
Naoki Takezoe	19f79b6e54	Merge pull request #789 from milligramme/patch-1 modify css: hide href content on printing	2015-06-26 17:47:31 +09:00
Naoki Takezoe	e0b9fc9481	(refs #788 )Fix NotFound in comparing with sibling repository	2015-06-26 17:06:33 +09:00
milligramme	16c28ad938	modify css: hide href content on printing on printing, href content appeared. it is caused by bootstrap.css `faae237ac5/src/main/webapp/assets/vendors/bootstrap/css/bootstrap.css (L183-L185)`	2015-06-26 15:31:15 +09:00
Naoki Takezoe	0e5af9ffa9	Update README.md	2015-06-23 14:29:32 +09:00
Naoki Takezoe	a0f6f03d4e	Add IntelliJ IDEA logo	2015-06-23 14:18:05 +09:00
Naoki Takezoe	f4cdfc5f32	(refs #769 )go-import meta tag is generated for only public repos	2015-06-10 23:18:35 +09:00
Naoki Takezoe	b45988705b	(refs #769 )Add go-import meta tag	2015-06-10 23:14:12 +09:00
Naoki Takezoe	dd50239759	(refs #780 )Not add an issue refer comment if it already exists	2015-06-09 10:32:58 +09:00
Naoki Takezoe	7297a07466	(refs #751 )Fix issue reference in verbatim node	2015-06-09 02:24:45 +09:00
Naoki Takezoe	e5fa43f91c	Merge pull request #778 from team-lab/fix/diff-ignore-space fix diff ignore space	2015-06-08 13:22:25 +09:00
nazoking	88080c8d02	fix diff ignore space	2015-06-08 01:33:22 +09:00
Naoki Takezoe	d38dfee540	Remove empty lines	2015-06-07 22:38:03 +09:00
Naoki Takezoe	4da6a7b6f9	Merge pull request #768 from Mura-Mi/avoid-npe-masterless Avoid NPE when master branch does not exist	2015-06-06 03:34:34 +09:00
Naoki Takezoe	957dfeed6d	(refs #775 )Move isRenderable() to helpers from PluginRepository	2015-06-05 01:34:23 +09:00
Naoki Takezoe	aa5a07b98e	(refs #775 )Add new extension point to add markup render	2015-06-05 01:30:00 +09:00
Naoki Takezoe	fd1ee07297	Provides declarative style plug-in definition.	2015-06-03 02:18:07 +09:00
Naoki Takezoe	07026125a9	Merge remote-tracking branch 'origin/master'	2015-06-02 01:06:21 +09:00
Naoki Takezoe	badb747d24	(refs #773 )Fix url processing in the blame view	2015-06-02 01:06:02 +09:00
Naoki Takezoe	e27c20d600	Merge pull request #771 from bfritz/fix-release-typo Fix typo in release.md	2015-06-01 08:27:26 +09:00
Naoki Takezoe	eb46c94c7c	Merge pull request #772 from xuwei-k/fix-travis-fail fix .travis.yml	2015-06-01 07:26:16 +09:00
xuwei-k	2e58f82a61	fix .travis.yml ``` java.lang.RuntimeException: Setting value cannot be null: {file:/home/travis/build/takezoe/gitbucket/}gitbucket/*:version at scala.sys.package$.error(package.scala:27) at sbt.EvaluateSettings$INode.setValue(INode.scala:143) at sbt.EvaluateSettings$MixedNode.evaluate0(INode.scala:175) ```	2015-06-01 04:04:45 +09:00
Brad Fritz	df28013b18	Fix typo in release.md	2015-05-31 11:53:08 -04:00
Naoki Takezoe	8f4e285974	Update README.md	2015-05-31 18:37:12 +09:00
Naoki Takezoe	08c4eeeefe	(refs #770 )Update release.md	2015-05-31 17:33:36 +09:00
Naoki Takezoe	1fdc2c629c	(refs #770 )Add set assembly invocation to deploy-assembly-jar.sh	2015-05-31 17:33:21 +09:00
Naoki Takezoe	a6767a1c3d	(refs #770 )Gather release scripts	2015-05-31 16:58:51 +09:00
Naoki Takezoe	c539d6b643	Update build.xml	2015-05-31 12:21:07 +09:00
Naoki Takezoe	80c3ffdfd7	Update release.md	2015-05-31 12:18:19 +09:00
Naoki Takezoe	f80f2106fe	Fix deploy script	2015-05-31 11:58:02 +09:00
Naoki Takezoe	cbfae66882	Fix version	2015-05-31 11:52:15 +09:00
Naoki Takezoe	8a5014fcbe	Update release.md	2015-05-31 11:49:35 +09:00
Mura-Mi	a2c26f0f2c	Avoid NPE when master branch does not exist	2015-05-29 01:28:11 +09:00
Antoine GIRARD	1ff68111b4	Merge remote-tracking branch 'upstream/master'	2015-05-18 15:51:03 +02:00
Antoine GIRARD	dff816324d	Rebase + Remove all unused image	2015-03-08 17:15:48 +01:00
Antoine GIRARD	a33e2c6e36	Completely moved to octicon	2015-03-04 23:46:46 +01:00
Antoine GIRARD	75ef82d18a	...	2015-03-04 23:46:46 +01:00
Antoine GIRARD	eb3c522122	Moved to octicon	2015-03-04 23:41:26 +01:00
Antoine GIRARD	6c8bcfc62e	Import of octicons	2015-03-04 23:10:55 +01:00