Merge branch 'dev' into f-one-time-tokens

src/main/java/caosdb/server/resource/SharedFileResource.java

@@ -71,7 +71,12 @@ public class SharedFileResource extends AbstractCaosDBServerResource {
 
     final MediaType mt = MediaType.valueOf(FileUtils.getMimeType(file));
     final FileRepresentation ret = new FileRepresentation(file, mt);
-    ret.setDisposition(new Disposition(Disposition.TYPE_ATTACHMENT));
+
+    // HTML files should be opened in the browser.
+    // Any other media type than HTML is attached for download.
+    if (!MediaType.TEXT_HTML.includes(mt)) {
+      ret.setDisposition(new Disposition(Disposition.TYPE_ATTACHMENT));
+    }
 
     return ret;
   }