[ARVADOS] updated: b4fcabf6325304c7ca80c215fc7afabc3c94e9a6

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/assets/javascripts/upload_to_collection.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

       via  b4fcabf6325304c7ca80c215fc7afabc3c94e9a6 (commit)
      from  572a74976c1d2d341265c1377a60222215079c62 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit b4fcabf6325304c7ca80c215fc7afabc3c94e9a6
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Mar 10 15:37:10 2015 -0400

    5182: Tweak error messages.

diff --git a/apps/workbench/app/assets/javascripts/upload_to_collection.js b/apps/workbench/app/assets/javascripts/upload_to_collection.js
index 58ac3fe..55f562d 100644
--- a/apps/workbench/app/assets/javascripts/upload_to_collection.js
+++ b/apps/workbench/app/assets/javascripts/upload_to_collection.js
@@ -65,7 +65,7 @@ function UploadToCollection($scope, $filter, $q, $timeout,
     ////////////////////////////////
 
     var keepProxy;
-    var defaultErrorMessage = 'A network error occurred, or there is a CORS configuration problem. Please check your browser debug console for a more specific error message (browser security features prevent us from showing the details here).';
+    var defaultErrorMessage = 'A network error occurred: either the server was unreachable, or there is a server configuration problem. Please check your browser debug console for a more specific error message (browser security features prevent us from showing the details here).';
 
     function SliceReader(_slice) {
         var that = this;
@@ -127,7 +127,7 @@ function UploadToCollection($scope, $filter, $q, $timeout,
                 // give up now.
                 _deferred.reject({
                     textStatus: 'error',
-                    err: 'server setup problem (proxy ' + proxyUriBase() + ' cannot be used from origin ' + window.location.origin + ')'
+                    err: 'There is a server configuration problem. Proxy ' + proxyUriBase() + ' cannot be used from origin ' + window.location.origin + ' due to the browser\'s mixed-content (https/http) policy.'
                 });
             } else {
                 goSend();

-----------------------------------------------------------------------


hooks/post-receive
--