Merge branch 'master' into viewing-options-bug

client/coral-framework/components/Popup.js

@@ -22,6 +22,9 @@ export default class Popup extends Component {
     );
 
     this.setCallbacks();
+
+    // For some reasons IE needs a timeout before setting the callbacks...
+    setTimeout(() => this.setCallbacks(), 1000);
   }
 
   setCallbacks() {

client/coral-ui/components/Spinner.css

@@ -4,49 +4,28 @@
 }
 
 .spinner {
-    -webkit-animation: rotator 1.4s linear infinite;
     animation: rotator 1.4s linear infinite;
 }
 
-@-webkit-keyframes rotator {
-    0% {
-        -webkit-transform: rotate(0deg);
-        transform: rotate(0deg);
-    }
-    100% {
-        -webkit-transform: rotate(270deg);
-        transform: rotate(270deg);
-    }
-}
-
 @keyframes rotator {
     0% {
-        -webkit-transform: rotate(0deg);
         transform: rotate(0deg);
     }
     100% {
-        -webkit-transform: rotate(270deg);
         transform: rotate(270deg);
     }
 }
+
+
+
 .path {
+    stroke: #f67150;
     stroke-dasharray: 187;
     stroke-dashoffset: 0;
-    -webkit-transform-origin: center;
     transform-origin: center;
-    -webkit-animation: dash 1.4s ease-in-out infinite, colors 5.6s ease-in-out infinite;
     animation: dash 1.4s ease-in-out infinite, colors 5.6s ease-in-out infinite;
 }
 
-@-webkit-keyframes colors {
-    0% {
-        stroke: #f67150;
-    }
-    100% {
-        stroke: #f6a47e;
-    }
-}
-
 @keyframes colors {
     0% {
         stroke: #f67150;
@@ -55,33 +34,35 @@
         stroke: #f6a47e;
     }
 }
-@-webkit-keyframes dash {
-    0% {
-        stroke-dashoffset: 187;
-    }
-    50% {
-        stroke-dashoffset: 46.75;
-        -webkit-transform: rotate(135deg);
-        transform: rotate(135deg);
-    }
-    100% {
-        stroke-dashoffset: 187;
-        -webkit-transform: rotate(450deg);
-        transform: rotate(450deg);
-    }
-}
+
 @keyframes dash {
     0% {
         stroke-dashoffset: 187;
     }
     50% {
         stroke-dashoffset: 46.75;
-        -webkit-transform: rotate(135deg);
         transform: rotate(135deg);
     }
     100% {
         stroke-dashoffset: 187;
-        -webkit-transform: rotate(450deg);
         transform: rotate(450deg);
     }
 }
+
+@keyframes fullRotator {
+    0% {
+        transform: rotate(0deg);
+    }
+    100% {
+        transform: rotate(360deg);
+    }
+}
+
+/* Hack for IE and Edge as they don't support css animations on SVG elements. */
+_:-ms-lang(x), .path {
+  stroke-dasharray: 160;
+}
+
+_:-ms-lang(x), .spinner {
+  animation: fullRotator 1.4s linear infinite;
+}

routes/api/auth/index.js

@@ -12,6 +12,10 @@ router.get('/', (req, res, next) => {
     return;
   }
 
+  res.header('Cache-Control', 'private, no-cache, no-store, must-revalidate');
+  res.header('Expires', '-1');
+  res.header('Pragma', 'no-cache');
+
   // Send back the user object.
   res.json({user: req.user});
 });

scripts/e2e-ci.sh

@@ -21,16 +21,12 @@ if [[ "${CIRCLE_BRANCH}" == "master" ]]; then
   # Test using browserstack.
   browserstack chrome
   browserstack firefox
-
-  # temporarily turn off ci, please fix https://www.pivotaltracker.com/story/show/152144406.
-  # browserstack ie
+  browserstack ie
+  browserstack edge
 
   # Safari >= 8 has issues connecting to browserstack-local. Safari < 8 is too old.
   # browserstack safari
 
-  # Edge 14 & 15 randomly fails when switching from the login popup back to the main window.
-  # browserstack edge
-
   exit $exitCode
 else
   # When browserstack is not available test locally using chrome headless.