Resolved merge conflicts for merging cc-5709-airtime-analyzer into saas.

2014-10-10 19:57:22 +00:00 · 2014-10-10 19:57:22 +00:00 · 9fb35c448e
commit 9fb35c448e
parent 0196aa21f5 081ca0a6a4
24 changed files with 165 additions and 106 deletions
--- a/airtime_mvc/public/js/airtime/library/plupload.js
+++ b/airtime_mvc/public/js/airtime/library/plupload.js
@ -23,7 +23,10 @@ $(document).ready(function() {
 		multiple_queues : 'true',
 		filters : [
 			{title: "Audio Files", extensions: "ogg,mp3,oga,flac,wav,m4a,mp4,opus"}
-		]
+		],
+                multipart_params : {
+                    "csrf_token" : $("#csrf").attr('value'),
+                }
 	});

 	uploader = $("#plupload_files").pluploadQueue();