From 51c992d87379479d134079e6035cc08bb8527bf6 Mon Sep 17 00:00:00 2001 From: Armin Date: Fri, 30 Mar 2018 20:13:46 +0200 Subject: [PATCH 1/4] force reconnect after webview --- engine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine b/engine index d2b3560..0104695 160000 --- a/engine +++ b/engine @@ -1 +1 @@ -Subproject commit d2b3560e036b302dc71403bb4386f327575ff8fc +Subproject commit 010469550b0aecba8001f874896701f48d67bc18 -- GitLab From bac6242b540b65513305b53a036ba89e2396bf1a Mon Sep 17 00:00:00 2001 From: Armin Date: Fri, 30 Mar 2018 20:23:27 +0200 Subject: [PATCH 2/4] fxed typot --- engine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine b/engine index 0104695..9a8d825 160000 --- a/engine +++ b/engine @@ -1 +1 @@ -Subproject commit 010469550b0aecba8001f874896701f48d67bc18 +Subproject commit 9a8d825d4461107defbad900b9e0dcf116c40793 -- GitLab From efb44198d06bb453c0b4ece0d06d9ad3f89378d4 Mon Sep 17 00:00:00 2001 From: Armin Date: Fri, 30 Mar 2018 20:28:48 +0200 Subject: [PATCH 3/4] fixed scope --- engine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine b/engine index 9a8d825..ed03a05 160000 --- a/engine +++ b/engine @@ -1 +1 @@ -Subproject commit 9a8d825d4461107defbad900b9e0dcf116c40793 +Subproject commit ed03a05285bf26c1519e2e160c5b24fc2130b7ee -- GitLab From 7c1f4651e853dfe4632994a69899be6a7ab84628 Mon Sep 17 00:00:00 2001 From: Armin Date: Tue, 3 Apr 2018 23:59:52 +0200 Subject: [PATCH 4/4] fixes login issues --- engine | 2 +- fairchat/qml/pages/LoginPage.qml | 2 +- fairchat/qml/pages/OpenIDLogin.qml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/engine b/engine index ed03a05..ae67df7 160000 --- a/engine +++ b/engine @@ -1 +1 @@ -Subproject commit ed03a05285bf26c1519e2e160c5b24fc2130b7ee +Subproject commit ae67df7f380b389b35f33640399da4e6b16a27c0 diff --git a/fairchat/qml/pages/LoginPage.qml b/fairchat/qml/pages/LoginPage.qml index 01e0386..aea774a 100755 --- a/fairchat/qml/pages/LoginPage.qml +++ b/fairchat/qml/pages/LoginPage.qml @@ -251,7 +251,7 @@ Page { mainStack.toMainView() } onHashLoggedIn: { - welcomePopup.open() + // welcomePopup.open() } onLoginError: { diff --git a/fairchat/qml/pages/OpenIDLogin.qml b/fairchat/qml/pages/OpenIDLogin.qml index d017e06..9cc4a56 100644 --- a/fairchat/qml/pages/OpenIDLogin.qml +++ b/fairchat/qml/pages/OpenIDLogin.qml @@ -96,7 +96,7 @@ Page { if(idpWebView.loadProgress == 100){ idpWebView.runJavaScript("document.getElementById(\"config\").textContent",function(result){ rocketChatController.loginWithMethod(loginMethod, result) - + mainStack.pop() }) }else{ timer.start() -- GitLab