Merge branch 'master' into feature/webhook-scope

src/main/twirl/gitbucket/core/helper/attached.scala.html

@@ -1,22 +1,24 @@
 @(owner: String, repository: String)(textarea: Html)(implicit context: gitbucket.core.controller.Context)
 @import context._
+@import gitbucket.core.util.FileUtil
 <div class="muted attachable">
   @textarea
-  <div class="clickable">Attach images by dragging &amp; dropping, or selecting them.</div>
+  <div class="clickable">Attach images or documents by dragging &amp; dropping, or selecting them.</div>
 </div>
 @defining("(id=\")([\\w\\-]*)(\")".r.findFirstMatchIn(textarea.body).map(_.group(2))){ textareaId =>
 <script>
 $(function(){
   try {
     $([$('#@textareaId').closest('div')[0], $('#@textareaId').next('div')[0]]).dropzone({
-      url: '@path/upload/image/@owner/@repository',
+      url: '@path/upload/file/@owner/@repository',
       maxFilesize: 10,
-      acceptedFiles: 'image/*',
-      dictInvalidFileType: 'Unfortunately, we don\'t support that file type. Try again with a PNG, GIF, or JPG.',
-      previewTemplate: "<div class=\"dz-preview\">\n  <div class=\"dz-progress\"><span class=\"dz-upload\" data-dz-uploadprogress>Uploading your images...</span></div>\n  <div class=\"dz-error-message\"><span data-dz-errormessage></span></div>\n</div>",
+      acceptedFiles: @Html(FileUtil.mimeTypeWhiteList.mkString("'", ",", "'")),
+      dictInvalidFileType: 'Unfortunately, we don\'t support that file type. Try again with a PNG, GIF, JPG, DOCX, PPTX, XLSX, TXT, or PDF.',
+      previewTemplate: "<div class=\"dz-preview\">\n  <div class=\"dz-progress\"><span class=\"dz-upload\" data-dz-uploadprogress>Uploading your files...</span></div>\n  <div class=\"dz-error-message\"><span data-dz-errormessage></span></div>\n</div>",
       success: function(file, id) {
-        var images = '\n![' + file.name.split('.')[0] + '](@baseUrl/@owner/@repository/_attached/' + id + ')';
-        $('#@textareaId').val($('#@textareaId').val() + images);
+        var attachFile = (file.type.match(/image\/.*/) ? '\n![' + file.name.split('.')[0] : '\n[' + file.name) +
+          '](@baseUrl/@owner/@repository/_attached/' + id + ')';
+        $('#@textareaId').val($('#@textareaId').val() + attachFile);
         $(file.previewElement).prevAll('div.dz-preview').addBack().remove();
       }
     });

src/main/twirl/gitbucket/core/helper/diff.scala.html

@@ -92,30 +92,38 @@
       <td style="padding: 0;">
         @if(diff.oldObjectId == diff.newObjectId){
           <div class="diff-same">File renamed without changes</div>
-        } else { @if(diff.newContent != None || diff.oldContent != None){
-          <div id="diffText-@i" class="diffText"></div>
-          <textarea id="newText-@i" style="display: none;" data-file-name="@diff.oldPath">@diff.newContent.getOrElse("")</textarea>
-          <textarea id="oldText-@i" style="display: none;" data-file-name="@diff.newPath">@diff.oldContent.getOrElse("")</textarea>
-        } else { @if(diff.newIsImage || diff.oldIsImage){
-            <div class="diff-image-render diff2up">
-            @if(oldCommitId.isDefined && diff.oldIsImage){
-              <div class="diff-image-frame diff-old"><img src="@url(repository)/blob/@oldCommitId.get/@diff.oldPath?raw=true" class="diff-image" onload="onLoadedDiffImages(this)" style="display:none" /></div>
-            } else {
-              @if(diff.changeType != ChangeType.ADD){
-                Not supported
-              }
-            }
-            @if(newCommitId.isDefined && diff.newIsImage){
-              <div class="diff-image-frame diff-new"><img src="@url(repository)/blob/@newCommitId.get/@diff.newPath?raw=true" class="diff-image" onload="onLoadedDiffImages(this)" style="display:none" /></div>
-            } else {
-              @if(diff.changeType != ChangeType.DELETE){
-                Not supported
-              }
-            }
-            </div>
         } else {
-          Not supported
-        } } }
+          @if(diff.newContent != None || diff.oldContent != None){
+            <div id="diffText-@i" class="diffText"></div>
+            <textarea id="newText-@i" style="display: none;" data-file-name="@diff.oldPath">@diff.newContent.getOrElse("")</textarea>
+            <textarea id="oldText-@i" style="display: none;" data-file-name="@diff.newPath">@diff.oldContent.getOrElse("")</textarea>
+          } else {
+            @if(diff.newIsImage || diff.oldIsImage){
+              <div class="diff-image-render diff2up">@diff.oldIsImage @diff.newIsImage
+              @if(oldCommitId.isDefined && diff.oldIsImage){
+                <div class="diff-image-frame diff-old"><img src="@url(repository)/blob/@oldCommitId.get/@diff.oldPath?raw=true" class="diff-image" onload="onLoadedDiffImages(this)" style="display:none" /></div>
+              } else {
+                @if(diff.changeType != ChangeType.ADD){
+                  <div style="padding: 12px;">Not supported</div>
+                }
+              }
+              @if(newCommitId.isDefined && diff.newIsImage){
+                <div class="diff-image-frame diff-new"><img src="@url(repository)/blob/@newCommitId.get/@diff.newPath?raw=true" class="diff-image" onload="onLoadedDiffImages(this)" style="display:none" /></div>
+              } else {
+                @if(diff.changeType != ChangeType.DELETE){
+                  <div style="padding: 12px;">Not supported</div>
+                }
+              }
+              </div>
+            } else {
+              @if(diff.tooLarge){
+                <div style="padding: 12px;">Too large</div>
+              } else {
+                <div style="padding: 12px;">Not supported</div>
+              }
+            }
+          }
+        }
       </td>
     </tr>
   </table>

src/main/twirl/gitbucket/core/index.scala.html

@@ -36,7 +36,7 @@
               </div>
             } else {
               <div class="box-content-bottom" style="padding: 0px;">
-                @defining(3){ max =>
+                @defining(20){ max =>
                   @userRepositories.zipWithIndex.map { case (repository, i) =>
                     <div class="box-content-row repo-link" style="@if(i > max - 1){display:none;}">
                       @helper.html.repositoryicon(repository, false)

src/main/twirl/gitbucket/core/issues/commentlist.scala.html

@@ -55,7 +55,7 @@
           } else {
             @if(comment.action == "refer"){
               @defining(comment.content.split(":")){ case Array(issueId, rest @ _*) =>
-                <strong><a href="@path/@repository.owner/@repository.name/issues/@issueId">Issue #@issueId</a>: @rest.mkString(":")</strong>
+                <strong>@issueLink(repository, issueId.toInt): @rest.mkString(":")</strong>
               }
             } else {
                 <div class="markdown-body">@markdown(comment.content, repository, false, true, true, hasWritePermission)</div>

src/main/twirl/gitbucket/core/menu.scala.html

@@ -104,7 +104,7 @@
   <div style="margin-right: @if(expand){180px} else {50px};">
     @if(expand){
       @repository.repository.description.map { description =>
-        <p class="description">@description</p>
+        <p class="description">@detectAndRenderLinks(description)</p>
       }
       <div style="margin-bottom: 10px;" class="box-content">
         <table class="fill-width">