Merge branch 'master' into confirmation-featured

client/coral-framework/hocs/withQuery.js

@@ -49,8 +49,9 @@ export default (document, config = {}) => hoistStatics((WrappedComponent) => {
     memoized = null;
     resolvedDocument = null;
     lastNetworkStatus = null;
-    data = null;
     name = '';
+    apolloData = null;
+    data = null;
 
     // Pending subscription data.
     subscriptionQueue = [];
@@ -151,6 +152,7 @@ export default (document, config = {}) => hoistStatics((WrappedComponent) => {
     };
 
     nextData(data) {
+      this.apolloData = data;
       this.emitWhenNeeded(data);
 
       // If data was previously set, we update it in a immutable way.
@@ -181,16 +183,24 @@ export default (document, config = {}) => hoistStatics((WrappedComponent) => {
           variables: data.variables,
           networkStatus: data.networkStatus,
           loading: data.loading,
-          startPolling: data.startPolling,
-          stopPolling: data.stopPolling,
-          refetch: data.refetch,
-          updateQuery: data.updateQuery,
           subscribeToMoreThrottled: this.subscribeToMoreThrottled,
+          startPolling: (...args) => {
+            return this.apolloData.startPolling(...args);
+          },
+          stopPolling: (...args) => {
+            return this.apolloData.stopPolling(...args);
+          },
+          updateQuery: (...args) => {
+            return this.apolloData.updateQuery(...args);
+          },
+          refetch: (...args) => {
+            return this.apolloData.refetch(...args);
+          },
           subscribeToMore: (stmArgs) => {
             const resolvedDocument = this.resolveDocument(stmArgs.document);
 
             // Resolve document fragments before passing it to `apollo-client`.
-            return data.subscribeToMore({
+            return this.apolloData.subscribeToMore({
               ...stmArgs,
               document: resolvedDocument,
               onError: (err) => {
@@ -209,7 +219,7 @@ export default (document, config = {}) => hoistStatics((WrappedComponent) => {
               {variables: lmArgs.variables});
 
             // Resolve document fragments before passing it to `apollo-client`.
-            return data.fetchMore({
+            return this.apolloData.fetchMore({
               ...lmArgs,
               query: resolvedDocument,
             })

client/coral-settings/containers/ProfileContainer.js

@@ -61,7 +61,7 @@ class ProfileContainer extends Component {
       return <NotLoggedIn showSignInDialog={showSignInDialog} />;
     }
 
-    if (loading) {
+    if (loading || !me) {
       return <Spinner />;
     }
 

locales/da.yml

@@ -285,7 +285,7 @@ da:
   no_like_bio: "Jeg kan ikke lide denne biografi"
   no_like_username: "Jeg kan ikke lide dette brugernavn"
   other: "Andet"
-  permalink: "Link"
+  permalink: "Delen"
   personal_info: "Denne kommentar afslører personligt identificerbare oplysninger"
   post: "Post"
   profile: "Profil"

locales/en.yml

@@ -297,7 +297,7 @@ en:
   no_like_bio: "I don't like this bio"
   no_like_username: "I don't like this username"
   other: Other
-  permalink: Link
+  permalink: Share
   personal_info: "This comment reveals personally identifiable information"
   post: Post
   profile: Profile

locales/es.yml

@@ -283,7 +283,7 @@ es:
   no_like_bio: "No me gusta esta biografia"
   no_like_username: "No me gusta este nombre de usuario"
   other: Otro
-  permalink: Enlace
+  permalink: Compartir
   personal_info: "Este comentario muestra información personal"
   post: Publicar
   profile: Perfil

locales/fr.yml

@@ -237,7 +237,7 @@ fr:
   no_like_bio: "Je n'aime pas cette biographie"
   no_like_username: "Je n'aime pas ce nom d'utilisateur"
   other: Autre
-  permalink: Lien
+  permalink: Partager
   personal_info: "Ce commentaire révèle des informations personnelles identifiables"
   post: Publier
   profile: Profil

locales/pt_BR.yml

@@ -288,7 +288,7 @@ pt_BR:
   no_like_bio: "Eu não gosto dessa descrição de perfil"
   no_like_username: "Eu não gosto deste nome de usuário"
   other: Outro
-  permalink: Link
+  permalink: Compartilhar
   personal_info: "Este comentário revela informações de identificação pessoal"
   post: Publicar
   profile: Perfil

scripts/e2e-ci.sh

@@ -8,7 +8,10 @@ E2E_MAX_RETRIES=${E2E_MAX_RETRIES:-1}
 
 # Safari >= 8 has issues connecting to browserstack-local. Safari < 8 is too old.
 # IE 64bit has issues with receiving keyboard input. Let's wait for them to fix it.
-BROWSERS="chrome,firefox,edge" #ie safari
+
+# FIXME: disabled firefox,edge until fixing pass is done
+# BROWSERS="chrome,firefox,edge" #ie safari
+BROWSERS="chrome"
 
 if [[ "${CIRCLE_BRANCH}" == "master" && -n "$BROWSERSTACK_KEY" ]]; then
   echo Testing on browserstack