Merge remote-tracking branch 'origin/master' into course-grading-manual

sagemathinc · Apr 26, 2019 · 8bcf501 · 8bcf501
2 parents 640a300 + 077c2c6
commit 8bcf501
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/smc-webapp/users.cjsx b/src/smc-webapp/users.cjsx
@@ -182,7 +182,7 @@ exports.User = User = rclass
         info = @props.user_map?.get(@props.account_id)
         if not info?
             if not misc.is_valid_uuid_string(@props.account_id)
-                return <span>{@props.account_id} unsucessfully</span>
+                return <span>Unknown User {@props.account_id}</span>
             actions.fetch_non_collaborator(@props.account_id)
             return <span>Loading...</span>
         else

diff --git a/src/webapp-lib/preflight-checks.ts b/src/webapp-lib/preflight-checks.ts
@@ -86,9 +86,10 @@ function preflight_check(): void {
 
   // 69 to 61 have issues, and 65 up until beta8 exhibits similar issues.
   // 65 resolved in beta9. upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=1514688
+  // 66 is broken badly again: https://github.com/sagemathinc/cocalc/issues/3771
   const buggyFF =
     spec.name === "Firefox" &&
-    (59 <= spec.version && spec.version <= 61) &&
+    ((59 <= spec.version && spec.version <= 61) || spec.version == 66) &&
     !ff60esr;
 
   if (oldFF || oldIE || oldEdge || oldSafari || oldOpera || oldChrome) {
@@ -114,9 +115,10 @@ function preflight_check(): void {
           <p style="font-weight:bold">
              You cannot use CoCac with your current browser, because of
              <a href="https://github.com/sagemathinc/cocalc/issues/2875">issue #2875</a> caused by
-             <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1453204">firefox issue #1453204</a>!
+             <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=1453204">firefox issue #1453204</a>.
+             (Something similar now afflicts Firefox 66 too.)
           </p>
-          <p>Either update to at least Firefox version 62,
+          <p>Either update to at least Firefox version 62 (but less than 66),
              switch to a recent version of <a target="_blank" rel="noopener" href='https://google.com/chrome'>Google Chrome</a>,
              or tweak your TSL settings (we wouldn't recommend that, though):
              <a href="https://tinyurl.com/y9hphj39">https://tinyurl.com/y9hphj39</a> and