Merge branch 'saas-showbuilder' of github.com:sourcefabric/airtime into saas-showbuilder

This commit is contained in:
Duncan Sommerville 2015-08-25 17:09:17 -04:00
commit afa3b47e42
19 changed files with 422 additions and 104 deletions

View file

@ -14,10 +14,11 @@ $(document).ready(function() {
Object.freeze(self.IMPORT_STATUS_CODES);
}
console.log(acceptedMimeTypes.join());
Dropzone.options.addMediaDropzone = {
url:'/rest/media',
//clickable: false,
acceptedFiles: acceptedMimeTypes.join(),
acceptedFiles: acceptedMimeTypes.join() + ",.flac",
init: function () {
this.on("sending", function (file, xhr, data) {
data.append("csrf_token", $("#csrf").val());