Merge branch '7.x-3.x' of github.com:tripal/tripal into 7.x-3.x

tripal/theme/js/TripalUploadFile.js

@@ -122,7 +122,8 @@
             self.updateProgressBar();
           }
         },
-        error : function() {
+        error : function(jqXHR, textStatus, errorThrown) {
+          alert(errorThrown);
           self.curr_chunk = 0;
           self._upload();
         }
@@ -447,4 +448,4 @@
   // Export the objects to the window for use in other JS files.
   window.TripalUploadFile = TripalUploadFile;
   
-})(jQuery);
+})(jQuery);