From 0dbcc5cf2a38802605b32b0c3135cfe6906c7a1d Mon Sep 17 00:00:00 2001
From: Sebastian <sebastian@squidex.io>
Date: Fri, 28 Jun 2019 22:23:06 +0200
Subject: [PATCH 1/4] Manually merged graphql fix.

---
 .../features/api/pages/graphql/graphql-page.component.scss   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/Squidex/app/features/api/pages/graphql/graphql-page.component.scss b/src/Squidex/app/features/api/pages/graphql/graphql-page.component.scss
index 91ea94e93..a70e7cbb6 100644
--- a/src/Squidex/app/features/api/pages/graphql/graphql-page.component.scss
+++ b/src/Squidex/app/features/api/pages/graphql/graphql-page.component.scss
@@ -1,6 +1,11 @@
 @import '_vars';
 @import '_mixins';
 
+// Graphiql hints
+::ng-deep {
+    @import '~graphiql/dist/show-hint';
+}
+
 :host ::ng-deep {
     @import '~graphiql/graphiql';
 

From d6ccd7d6e9d38f2234e44ceff8022cb950202e41 Mon Sep 17 00:00:00 2001
From: Sebastian <sebastian@squidex.io>
Date: Fri, 28 Jun 2019 22:28:30 +0200
Subject: [PATCH 2/4] Better redirect for single external auth provider.

---
 .../Controllers/Account/AccountController.cs        | 13 ++++++++++++-
 .../Areas/IdentityServer/Views/Account/Login.cshtml | 11 -----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs b/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs
index 0ced5abe7..7b2553554 100644
--- a/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs
+++ b/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs
@@ -198,6 +198,17 @@ namespace Squidex.Areas.IdentityServer.Controllers.Account
 
             var externalProviders = await signInManager.GetExternalProvidersAsync();
 
+            if (externalProviders.Count == 1 && !allowPasswordAuth)
+            {
+                var provider = externalProviders[0].AuthenticationScheme;
+
+                var properties =
+                    signInManager.ConfigureExternalAuthenticationProperties(provider,
+                        Url.Action(nameof(ExternalCallback), new { ReturnUrl = returnUrl }));
+
+                return Challenge(properties, provider);
+            }
+
             var vm = new LoginVM
             {
                 ExternalProviders = externalProviders,
@@ -242,7 +253,7 @@ namespace Squidex.Areas.IdentityServer.Controllers.Account
 
             var isLoggedIn = result.Succeeded;
 
-            UserWithClaims user = null;
+            UserWithClaims user;
 
             if (isLoggedIn)
             {
diff --git a/src/Squidex/Areas/IdentityServer/Views/Account/Login.cshtml b/src/Squidex/Areas/IdentityServer/Views/Account/Login.cshtml
index dd23d6a95..855d81fdd 100644
--- a/src/Squidex/Areas/IdentityServer/Views/Account/Login.cshtml
+++ b/src/Squidex/Areas/IdentityServer/Views/Account/Login.cshtml
@@ -87,15 +87,4 @@ else
     <p class="profile-footer">
         Already registered? <a asp-controller="Account" asp-action="Login" asp-route-returnurl="@Model.ReturnUrl">Click here to login</a>
     </p>
-}
-
-@if (!Model.HasPasswordAuth && Model.ExternalProviders.Count == 1)
-{
-    <script>
-        var redirectButtons = document.getElementsByClassName("redirect-button");
-
-        if (redirectButtons.length === 1) {
-            redirectButtons[0].click();
-        }
-    </script>
 }
\ No newline at end of file

From 3e148ecbbd220161a79a880d9947f4dea5a60ac8 Mon Sep 17 00:00:00 2001
From: Sebastian Stehle <sebastian@squidex.io>
Date: Sat, 29 Jun 2019 10:01:21 +0200
Subject: [PATCH 3/4] Changelog for v2.2.0

---
 CHANGELOG.md | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9037de7bf..3201b80ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,18 @@
 # Changelog
 
+## v2.2.0 - 2019-06-29
+
+### Features
+
+* **Login**: Redirect to authentication provider automatically if only one provider is active.
+
+### Bugfixes
+
+* **GraphQL**: Fix a bug in styles that prevented to autocomplete to show properly
+
 ## v2.1.0 - 2019-06-22
 
-## Features
+### Features
 
 * **Assets**: Parameter to prevent download in Browser.
 * **Assets**: FTP asset store.
@@ -19,7 +29,7 @@
 * **UI**: Dropdown field for references.
 * **Users**: Email notifications when contributors is added.
 
-## Bugfixes
+### Bugfixes
 
 * **Contents**: Fix for scheduled publishing.
 * **GraphQL**: Fix query parameters for assets.
@@ -30,11 +40,11 @@
 
 ## v2.0.5 - 2019-04-21
 
-## Features
+### Features
 
 * **UI**: Sort content by clicking on the table header.
 
-## Bugfixes
+### Bugfixes
 
 * **UI**: Fix publish button in content context menu.
 

From cc643acfe421c7caffc85596fee3784b964cfd75 Mon Sep 17 00:00:00 2001
From: Sebastian Stehle <sebastian@squidex.io>
Date: Sat, 29 Jun 2019 10:05:57 +0200
Subject: [PATCH 4/4] Changelog for 3.0.0-beta2

---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3201b80ba..c927de4cd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## v3.0.0-beta2 - 2019-06-29
+
+### Features
+
+* **Content**: Editor for custom workflows.
+
 ## v2.2.0 - 2019-06-29
 
 ### Features
@@ -10,6 +16,10 @@
 
 * **GraphQL**: Fix a bug in styles that prevented to autocomplete to show properly
 
+## v3.0.0-beta1 - 2019-06-24
+
+This version contains many major breaking changes. Please read: https://docs.squidex.io/next/02-api-compatibility
+
 ## v2.1.0 - 2019-06-22
 
 ### Features