From 506ea02ddb2ae6f113a9e2b045c26a3a4b924f1e Mon Sep 17 00:00:00 2001
From: Sebastian Stehle <sebastian@squidex.io>
Date: Tue, 14 Nov 2017 20:03:30 +0100
Subject: [PATCH 1/8] Autofac removed

---
 src/Squidex/Squidex.csproj | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Squidex/Squidex.csproj b/src/Squidex/Squidex.csproj
index 37227c20d..be3caef03 100644
--- a/src/Squidex/Squidex.csproj
+++ b/src/Squidex/Squidex.csproj
@@ -15,15 +15,15 @@
     <EmbeddedResource Include="Config\Identity\Cert\*.*;Docs\*.md" />
     <EmbeddedResource Include="Controllers\Api\Users\Assets\Avatar.png" />
     <EmbeddedResource Remove="Assets\**" />
-	
+
     <Compile Remove="Assets\**" />
     <Content Remove="Assets\**" />
-	
+
     <None Remove="Assets\**" />
   </ItemGroup>
 
   <ItemGroup>
-	  <None Update="dockerfile">
+    <None Update="dockerfile">
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
     </None>
   </ItemGroup>
@@ -60,7 +60,7 @@
     <PackageReference Include="Microsoft.AspNetCore.HttpOverrides" Version="2.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0" />
-	  <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="2.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="2.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
@@ -85,9 +85,9 @@
       <ContentWithTargetPath Include="@(_DocumentationFile->'%(FullPath)')" RelativePath="%(_DocumentationFile.Identity)" TargetPath="%(_DocumentationFile.Filename)%(_DocumentationFile.Extension)" CopyToPublishDirectory="PreserveNewest" />
     </ItemGroup>
   </Target>
-    
+
   <PropertyGroup>
     <CodeAnalysisRuleSet>..\..\Squidex.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  
- </Project>
+
+</Project>
\ No newline at end of file

From 6868cb5ec9f2362d2548431543fa98be9f7f2c66 Mon Sep 17 00:00:00 2001
From: Sebastian Stehle <sebastian@squidex.io>
Date: Tue, 14 Nov 2017 20:08:45 +0100
Subject: [PATCH 2/8] Tests fixed

---
 .../Log/Adapter/SemanticLogLoggerFactoryExtensions.cs      | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Squidex.Infrastructure/Log/Adapter/SemanticLogLoggerFactoryExtensions.cs b/src/Squidex.Infrastructure/Log/Adapter/SemanticLogLoggerFactoryExtensions.cs
index fbb32bc50..b78102e4f 100644
--- a/src/Squidex.Infrastructure/Log/Adapter/SemanticLogLoggerFactoryExtensions.cs
+++ b/src/Squidex.Infrastructure/Log/Adapter/SemanticLogLoggerFactoryExtensions.cs
@@ -19,5 +19,12 @@ namespace Squidex.Infrastructure.Log.Adapter
 
             return builder;
         }
+
+        public static LoggerFactory AddSemanticLog(this LoggerFactory builder, ISemanticLog log)
+        {
+            builder.AddProvider(new SemanticLogLoggerProvider(log));
+
+            return builder;
+        }
     }
 }

From 61f778f4f43f332d33b7824e28f4419deeabf44a Mon Sep 17 00:00:00 2001
From: Sebastian Stehle <sebastian@squidex.io>
Date: Tue, 14 Nov 2017 20:35:27 +0100
Subject: [PATCH 3/8] Master branch only

---
 .drone.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.drone.yml b/.drone.yml
index a507e342a..b72edbb34 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -21,6 +21,7 @@ pipeline:
     secrets: [ docker_username, docker_password ]
     when:
       event: push
+      branch: [master]
 
   build_release:
     image: docker

From 984042d73a377f0bce9704b66bf49541f589c5ab Mon Sep 17 00:00:00 2001
From: Jason Ma <wo.0@live.cn>
Date: Wed, 15 Nov 2017 14:03:13 +0800
Subject: [PATCH 4/8] fix bug. menu title should be changed follow the app
 selected.

---
 .../app/shell/pages/internal/apps-menu.component.html  |  8 ++++----
 .../app/shell/pages/internal/apps-menu.component.ts    | 10 +++++++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/Squidex/app/shell/pages/internal/apps-menu.component.html b/src/Squidex/app/shell/pages/internal/apps-menu.component.html
index 27315a568..bc4084681 100644
--- a/src/Squidex/app/shell/pages/internal/apps-menu.component.html
+++ b/src/Squidex/app/shell/pages/internal/apps-menu.component.html
@@ -1,6 +1,6 @@
 <ul class="nav navbar-nav" *ngIf="apps">
     <li class="nav-item dropdown">
-        <span class="nav-link dropdown-toggle" id="app-name" (click)="modalMenu.toggle()">{{ctx.app ? ctx.app.name : 'Apps Overview'}}</span>
+        <span class="nav-link dropdown-toggle" id="app-name" (click)="modalMenu.toggle()">{{selectedApp ? selectedApp.name : 'Apps Overview'}}</span>
 
         <div class="dropdown-menu" *sqxModalView="modalMenu" closeAlways="true" @fade>
             <a class="dropdown-item all-apps" routerLink="/app">
@@ -22,12 +22,12 @@
         </div>
     </li>
 
-    <li class="nav-item" *ngIf="ctx.app && ctx.app.planUpgrade && ctx.app.planName && ctx.app.permission === 'Owner'">
+    <li class="nav-item" *ngIf="selectedApp && selectedApp.planUpgrade && selectedApp.planName && selectedApp.permission === 'Owner'">
         <div class="btn-group app-upgrade">
             <button type="button" class="btn btn-primary">
-                You are on the <strong>{{ctx.app.planName}}</strong> plan.
+                You are on the <strong>{{selectedApp.planName}}</strong> plan.
             </button>
-            <button type="button" class="btn btn-warning" [routerLink]="['/app', ctx.app.name, 'settings', 'plans']">
+            <button type="button" class="btn btn-warning" [routerLink]="['/app', selectedApp.name, 'settings', 'plans']">
                 Upgrade!
             </button>
         </div>
diff --git a/src/Squidex/app/shell/pages/internal/apps-menu.component.ts b/src/Squidex/app/shell/pages/internal/apps-menu.component.ts
index 340739279..f7d3dc85d 100644
--- a/src/Squidex/app/shell/pages/internal/apps-menu.component.ts
+++ b/src/Squidex/app/shell/pages/internal/apps-menu.component.ts
@@ -29,19 +29,22 @@ import {
 })
 export class AppsMenuComponent implements OnDestroy, OnInit {
     private appsSubscription: Subscription;
+    private appSubscription: Subscription;
 
     public modalMenu = new ModalView(false, true);
     public modalDialog = new ModalView();
 
     public apps: AppDto[] = [];
+    public selectedApp: AppDto;
 
-    constructor(public readonly ctx: AppContext,
+    constructor(
         private readonly appsStore: AppsStoreService
     ) {
     }
 
     public ngOnDestroy() {
         this.appsSubscription.unsubscribe();
+        this.appSubscription.unsubscribe();
     }
 
     public ngOnInit() {
@@ -49,6 +52,11 @@ export class AppsMenuComponent implements OnDestroy, OnInit {
             this.appsStore.apps.subscribe(apps => {
                 this.apps = apps;
             });
+
+        this.appSubscription =
+            this.appsStore.selectedApp.subscribe(app => {
+                this.selectedApp = app;
+            });
     }
 
     public createApp() {

From 4aa1f1fe018d3c465043011d762728966e8dffab Mon Sep 17 00:00:00 2001
From: Sebastian Stehle <sebastian@squidex.io>
Date: Wed, 15 Nov 2017 18:50:16 +0100
Subject: [PATCH 5/8] Just some renamings.

---
 .../shell/pages/internal/apps-menu.component.html    | 12 ++++++------
 .../app/shell/pages/internal/apps-menu.component.ts  |  9 +++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/Squidex/app/shell/pages/internal/apps-menu.component.html b/src/Squidex/app/shell/pages/internal/apps-menu.component.html
index bc4084681..6e8ccfa47 100644
--- a/src/Squidex/app/shell/pages/internal/apps-menu.component.html
+++ b/src/Squidex/app/shell/pages/internal/apps-menu.component.html
@@ -1,8 +1,8 @@
 <ul class="nav navbar-nav" *ngIf="apps">
     <li class="nav-item dropdown">
-        <span class="nav-link dropdown-toggle" id="app-name" (click)="modalMenu.toggle()">{{selectedApp ? selectedApp.name : 'Apps Overview'}}</span>
+        <span class="nav-link dropdown-toggle" id="app-name" (click)="appsMenu.toggle()">{{selectedApp ? selectedApp.name : 'Apps Overview'}}</span>
 
-        <div class="dropdown-menu" *sqxModalView="modalMenu" closeAlways="true" @fade>
+        <div class="dropdown-menu" *sqxModalView="appsMenu" closeAlways="true" @fade>
             <a class="dropdown-item all-apps" routerLink="/app">
                 <span class="all-apps-text">All Apps</span> 
                 <span class="all-apps-pill badge badge-pill badge-primary">{{apps.length}}</span>
@@ -34,22 +34,22 @@
     </li>
 </ul>
 
-<div class="modal" *sqxModalView="modalDialog;onRoot:true" @fade>
+<div class="modal" *sqxModalView="addAppDialog;onRoot:true" @fade>
     <div class="modal-backdrop"></div>
     <div class="modal-dialog">
         <div class="modal-content">
             <div class="modal-header">
                 <h4 class="modal-title">Create App</h4>
 
-                <button type="button" class="close" data-dismiss="modal" aria-label="Close" (click)="modalDialog.hide()">
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close" (click)="addAppDialog.hide()">
                     <span aria-hidden="true">&times;</span>
                 </button>
             </div>
 
             <div class="modal-body">
                 <sqx-app-form 
-                    (created)="modalDialog.hide()" 
-                    (cancelled)="modalDialog.hide()">
+                    (created)="addAppDialog.hide()" 
+                    (cancelled)="addAppDialog.hide()">
                 </sqx-app-form>
             </div>
         </div>
diff --git a/src/Squidex/app/shell/pages/internal/apps-menu.component.ts b/src/Squidex/app/shell/pages/internal/apps-menu.component.ts
index f7d3dc85d..c5b07ff01 100644
--- a/src/Squidex/app/shell/pages/internal/apps-menu.component.ts
+++ b/src/Squidex/app/shell/pages/internal/apps-menu.component.ts
@@ -31,10 +31,11 @@ export class AppsMenuComponent implements OnDestroy, OnInit {
     private appsSubscription: Subscription;
     private appSubscription: Subscription;
 
-    public modalMenu = new ModalView(false, true);
-    public modalDialog = new ModalView();
+    public addAppDialog = new ModalView();
 
+    public appsMenu = new ModalView(false, true);
     public apps: AppDto[] = [];
+
     public selectedApp: AppDto;
 
     constructor(
@@ -60,7 +61,7 @@ export class AppsMenuComponent implements OnDestroy, OnInit {
     }
 
     public createApp() {
-        this.modalMenu.hide();
-        this.modalDialog.show();
+        this.appsMenu.hide();
+        this.addAppDialog.show();
     }
 }
\ No newline at end of file

From af201cd985df1509f446919515ab2a650c40cb11 Mon Sep 17 00:00:00 2001
From: Sebastian Stehle <sebastian@squidex.io>
Date: Thu, 16 Nov 2017 17:54:57 +0100
Subject: [PATCH 6/8] Closes #172 Closes #175

---
 .../Controllers/Api/Ping/PingController.cs    |  3 ++-
 .../pages/graphql/graphql-page.component.scss |  6 ++++-
 .../angular/panel-container.directive.ts      | 25 ++++++++-----------
 .../app/framework/angular/panel.component.ts  |  9 +++----
 4 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/src/Squidex/Controllers/Api/Ping/PingController.cs b/src/Squidex/Controllers/Api/Ping/PingController.cs
index 6dc65d9c6..730569034 100644
--- a/src/Squidex/Controllers/Api/Ping/PingController.cs
+++ b/src/Squidex/Controllers/Api/Ping/PingController.cs
@@ -25,6 +25,7 @@ namespace Squidex.Controllers.Api.Ping
         /// <summary>
         /// Get ping status.
         /// </summary>
+        /// <param name="app">The name of the app.</param>
         /// <returns>
         /// 204 => Service ping successful.
         /// </returns>
@@ -34,7 +35,7 @@ namespace Squidex.Controllers.Api.Ping
         [HttpGet]
         [Route("ping/{app}/")]
         [ApiCosts(0)]
-        public IActionResult GetPing()
+        public IActionResult GetPing(string app)
         {
             return NoContent();
         }
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 00a5cbf4a..f1563c37b 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
@@ -9,4 +9,8 @@
 
 .graphiql-container > * {
     box-sizing: content-box;
-}
+    
+    & .editorWrap {
+        overflow: hidden;
+    }
+}
\ No newline at end of file
diff --git a/src/Squidex/app/framework/angular/panel-container.directive.ts b/src/Squidex/app/framework/angular/panel-container.directive.ts
index 6414af63d..28abbfcc0 100644
--- a/src/Squidex/app/framework/angular/panel-container.directive.ts
+++ b/src/Squidex/app/framework/angular/panel-container.directive.ts
@@ -25,7 +25,7 @@ export class PanelContainerDirective implements AfterViewInit, OnDestroy {
 
     @HostListener('window:resize')
     public onResize() {
-        this.invalidate();
+        this.invalidate(true);
     }
 
     public ngOnDestroy() {
@@ -33,7 +33,7 @@ export class PanelContainerDirective implements AfterViewInit, OnDestroy {
     }
 
     public ngAfterViewInit() {
-        this.invalidate({ force: true, resize: true });
+        this.invalidate(true);
     }
 
     public push(panel: PanelComponent) {
@@ -48,14 +48,8 @@ export class PanelContainerDirective implements AfterViewInit, OnDestroy {
         this.invalidate();
     }
 
-    public invalidate(params?: { force: boolean, resize: boolean }) {
-        this.isInit = this.isInit || (params && params.force) === true;
-
-        if (!this.isInit) {
-            return;
-        }
-
-        if (params && params.resize) {
+    public invalidate(resize = false) {
+        if (resize) {
             this.containerWidth = this.element.nativeElement.getBoundingClientRect().width;
         }
 
@@ -67,21 +61,22 @@ export class PanelContainerDirective implements AfterViewInit, OnDestroy {
         for (let panel of this.panels) {
             const panelRoot = panel.panel.nativeElement;
 
-            let width = panel.desiredWidth;
+            let layoutWidth = '';
 
             if (panel.desiredWidth === '*' && panel === last) {
-                panel.actualWidth = this.containerWidth - currentPosition;
-
-                panel.desiredWidth = width + 'px';
+                layoutWidth = (this.containerWidth - currentPosition) + 'px';
+            } else {
+                layoutWidth = panel.desiredWidth;
             }
 
             this.renderer.setElementStyle(panelRoot, 'top', '0px');
             this.renderer.setElementStyle(panelRoot, 'left', currentPosition + 'px');
+            this.renderer.setElementStyle(panelRoot, 'width', layoutWidth);
             this.renderer.setElementStyle(panelRoot, 'bottom', '0px');
             this.renderer.setElementStyle(panelRoot, 'position', 'absolute');
             this.renderer.setElementStyle(panelRoot, 'z-index', currentLayer.toString());
 
-            currentPosition += panel.actualWidth;
+            currentPosition += panel.renderWidth;
             currentLayer -= 10;
         }
 
diff --git a/src/Squidex/app/framework/angular/panel.component.ts b/src/Squidex/app/framework/angular/panel.component.ts
index 1a2fc8790..984050933 100644
--- a/src/Squidex/app/framework/angular/panel.component.ts
+++ b/src/Squidex/app/framework/angular/panel.component.ts
@@ -14,7 +14,7 @@ import { PanelContainerDirective } from './panel-container.directive';
 @Component({
     selector: 'sqx-panel',
     template: `
-        <div [style.width]="desiredWidth" [attr.expand]="expand" #panel>
+        <div #panel>
             <div class="panel panel-{{theme}}" [@slideRight]>
                 <ng-content></ng-content>
             </div>
@@ -24,7 +24,7 @@ import { PanelContainerDirective } from './panel-container.directive';
     ]
 })
 export class PanelComponent implements AfterViewInit, OnDestroy, OnInit {
-    public actualWidth = 0;
+    public renderWidth = 0;
 
     @Input()
     public theme = 'light';
@@ -32,9 +32,6 @@ export class PanelComponent implements AfterViewInit, OnDestroy, OnInit {
     @Input()
     public desiredWidth = '10rem';
 
-    @Input()
-    public expand = false;
-
     @ViewChild('panel')
     public panel: ElementRef;
 
@@ -52,7 +49,7 @@ export class PanelComponent implements AfterViewInit, OnDestroy, OnInit {
     }
 
     public ngAfterViewInit() {
-        this.actualWidth = this.panel.nativeElement.getBoundingClientRect().width;
+        this.renderWidth = this.panel.nativeElement.getBoundingClientRect().width;
 
         this.container.invalidate();
     }

From 47df01e9114a51060eb2cd83af03880585a771cf Mon Sep 17 00:00:00 2001
From: Sebastian Stehle <sebastian@squidex.io>
Date: Thu, 16 Nov 2017 18:03:35 +0100
Subject: [PATCH 7/8] Closes #172

---
 .../Schemas/Schema.cs                         |  2 +-
 .../Contents/GraphQL/GraphQLModel.cs          |  4 +++
 .../Contents/GraphQLTests.cs                  | 27 +++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/Schema.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/Schema.cs
index 8a7a06d40..137e49783 100644
--- a/src/Squidex.Domain.Apps.Core.Model/Schemas/Schema.cs
+++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/Schema.cs
@@ -109,7 +109,7 @@ namespace Squidex.Domain.Apps.Core.Schemas
 
             if (fieldsByName.ContainsKey(field.Name) || fieldsById.ContainsKey(field.Id))
             {
-                throw new ArgumentException($"A field with name '{field.Name}' already exists.", nameof(field));
+                throw new ArgumentException($"A field with name '{field.Name}' and id {field.Id} already exists.", nameof(field));
             }
 
             fieldsById.Add(field.Id, field);
diff --git a/src/Squidex.Domain.Apps.Read/Contents/GraphQL/GraphQLModel.cs b/src/Squidex.Domain.Apps.Read/Contents/GraphQL/GraphQLModel.cs
index 6afac5493..50c64f64f 100644
--- a/src/Squidex.Domain.Apps.Read/Contents/GraphQL/GraphQLModel.cs
+++ b/src/Squidex.Domain.Apps.Read/Contents/GraphQL/GraphQLModel.cs
@@ -71,6 +71,10 @@ namespace Squidex.Domain.Apps.Read.Contents.GraphQL
                     typeof(JsonField),
                     field => ResolveDefault("Json")
                 },
+                {
+                    typeof(TagsField),
+                    field => ResolveDefault("String")
+                },
                 {
                     typeof(GeolocationField),
                     field => ResolveDefault("Geolocation")
diff --git a/tests/Squidex.Domain.Apps.Read.Tests/Contents/GraphQLTests.cs b/tests/Squidex.Domain.Apps.Read.Tests/Contents/GraphQLTests.cs
index a32193a3d..7cc7779e9 100644
--- a/tests/Squidex.Domain.Apps.Read.Tests/Contents/GraphQLTests.cs
+++ b/tests/Squidex.Domain.Apps.Read.Tests/Contents/GraphQLTests.cs
@@ -76,6 +76,9 @@ namespace Squidex.Domain.Apps.Read.Contents
             schemaDef.AddField(new GeolocationField(10, "my-geolocation", Partitioning.Invariant,
                 new GeolocationFieldProperties()));
 
+            schemaDef.AddField(new TagsField(11, "my-tags", Partitioning.Invariant,
+                new TagsFieldProperties()));
+
             A.CallTo(() => app.Id).Returns(appId);
             A.CallTo(() => app.PartitionResolver).Returns(x => InvariantPartitioning.Instance);
 
@@ -270,6 +273,9 @@ namespace Squidex.Domain.Apps.Read.Contents
                       myGeolocation {
                         iv
                       }
+                      myTags {
+                        iv
+                      }
                     }
                   }
                 }";
@@ -330,6 +336,14 @@ namespace Squidex.Domain.Apps.Read.Contents
                                         latitude = 10,
                                         longitude = 20
                                     }
+                                },
+                                myTags = new
+                                {
+                                    iv = new[]
+                                    {
+                                        "tag1",
+                                        "tag2"
+                                    }
                                 }
                             }
                         }
@@ -375,6 +389,9 @@ namespace Squidex.Domain.Apps.Read.Contents
                       myGeolocation {{
                         iv
                       }}
+                      myTags {{
+                        iv
+                      }}
                     }}
                   }}
                 }}";
@@ -429,6 +446,14 @@ namespace Squidex.Domain.Apps.Read.Contents
                                     latitude = 10,
                                     longitude = 20
                                 }
+                            },
+                            myTags = new
+                            {
+                                iv = new[]
+                                {
+                                    "tag1",
+                                    "tag2"
+                                }
                             }
                         }
                     }
@@ -629,6 +654,8 @@ namespace Squidex.Domain.Apps.Read.Contents
                         new ContentFieldData().AddValue("iv", true))
                     .AddField("my-datetime",
                         new ContentFieldData().AddValue("iv", now.ToDateTimeUtc()))
+                    .AddField("my-tags",
+                        new ContentFieldData().AddValue("iv", JToken.FromObject(new[] { "tag1", "tag2" })))
                     .AddField("my-references",
                         new ContentFieldData().AddValue("iv", JToken.FromObject(new[] { refId })))
                     .AddField("my-geolocation",

From d7380616e4ae87e9df6324f3ed9c46c46c1059ad Mon Sep 17 00:00:00 2001
From: Sebastian Stehle <sebastian@squidex.io>
Date: Thu, 16 Nov 2017 18:34:36 +0100
Subject: [PATCH 8/8] Closes #173 Closes #174

---
 .../Apps/Json/JsonLanguagesConfig.cs          | 63 +++++++++++++++++++
 .../Apps/Json/LanguagesConfigConverter.cs     | 22 ++-----
 .../pages/languages/language.component.ts     |  2 +-
 .../languages/languages-page.component.ts     | 11 +---
 .../services/app-languages.service.spec.ts    | 46 ++++++++++----
 .../shared/services/app-languages.service.ts  | 25 ++++++--
 .../Model/Apps/LanguagesConfigJsonTests.cs    |  5 ++
 7 files changed, 129 insertions(+), 45 deletions(-)
 create mode 100644 src/Squidex.Domain.Apps.Core.Model/Apps/Json/JsonLanguagesConfig.cs

diff --git a/src/Squidex.Domain.Apps.Core.Model/Apps/Json/JsonLanguagesConfig.cs b/src/Squidex.Domain.Apps.Core.Model/Apps/Json/JsonLanguagesConfig.cs
new file mode 100644
index 000000000..f23beded4
--- /dev/null
+++ b/src/Squidex.Domain.Apps.Core.Model/Apps/Json/JsonLanguagesConfig.cs
@@ -0,0 +1,63 @@
+// ==========================================================================
+//  JsonLanguagesConfig.cs
+//  Squidex Headless CMS
+// ==========================================================================
+//  Copyright (c) Squidex Group
+//  All rights reserved.
+// ==========================================================================
+
+using System.Collections.Generic;
+using Newtonsoft.Json;
+using Squidex.Infrastructure;
+
+namespace Squidex.Domain.Apps.Core.Apps.Json
+{
+    public sealed class JsonLanguagesConfig
+    {
+        [JsonProperty]
+        public Dictionary<string, JsonLanguageConfig> Languages { get; set; }
+
+        [JsonProperty]
+        public Language Master { get; set; }
+
+        public JsonLanguagesConfig()
+        {
+        }
+
+        public JsonLanguagesConfig(LanguagesConfig value)
+        {
+            Languages = new Dictionary<string, JsonLanguageConfig>(value.Count);
+
+            foreach (LanguageConfig config in value)
+            {
+                Languages.Add(config.Language, new JsonLanguageConfig(config));
+            }
+
+            Master = value.Master?.Language;
+        }
+
+        public LanguagesConfig ToConfig()
+        {
+            var languagesConfig = new LanguageConfig[Languages?.Count ?? 0];
+
+            if (Languages != null)
+            {
+                var i = 0;
+
+                foreach (var config in Languages)
+                {
+                    languagesConfig[i++] = config.Value.ToConfig(config.Key);
+                }
+            }
+
+            var result = LanguagesConfig.Build(languagesConfig);
+
+            if (Master != null)
+            {
+                result.MakeMaster(Master);
+            }
+
+            return result;
+        }
+    }
+}
diff --git a/src/Squidex.Domain.Apps.Core.Model/Apps/Json/LanguagesConfigConverter.cs b/src/Squidex.Domain.Apps.Core.Model/Apps/Json/LanguagesConfigConverter.cs
index af52f34a9..98dd331cc 100644
--- a/src/Squidex.Domain.Apps.Core.Model/Apps/Json/LanguagesConfigConverter.cs
+++ b/src/Squidex.Domain.Apps.Core.Model/Apps/Json/LanguagesConfigConverter.cs
@@ -6,7 +6,7 @@
 //  All rights reserved.
 // ==========================================================================
 
-using System.Collections.Generic;
+using System;
 using Newtonsoft.Json;
 using Squidex.Infrastructure.Json;
 
@@ -16,30 +16,16 @@ namespace Squidex.Domain.Apps.Core.Apps.Json
     {
         protected override void WriteValue(JsonWriter writer, LanguagesConfig value, JsonSerializer serializer)
         {
-            var json = new Dictionary<string, JsonLanguageConfig>(value.Count);
-
-            foreach (LanguageConfig config in value)
-            {
-                json.Add(config.Language, new JsonLanguageConfig(config));
-            }
+            var json = new JsonLanguagesConfig(value);
 
             serializer.Serialize(writer, json);
         }
 
         protected override LanguagesConfig ReadValue(JsonReader reader, JsonSerializer serializer)
         {
-            var json = serializer.Deserialize<Dictionary<string, JsonLanguageConfig>>(reader);
-
-            var languagesConfig = new LanguageConfig[json.Count];
-
-            var i = 0;
-
-            foreach (var config in json)
-            {
-                languagesConfig[i++] = config.Value.ToConfig(config.Key);
-            }
+            var json = serializer.Deserialize<JsonLanguagesConfig>(reader);
 
-            return LanguagesConfig.Build(languagesConfig);
+            return json.ToConfig();
         }
     }
 }
diff --git a/src/Squidex/app/features/settings/pages/languages/language.component.ts b/src/Squidex/app/features/settings/pages/languages/language.component.ts
index d87f60111..25ac3b704 100644
--- a/src/Squidex/app/features/settings/pages/languages/language.component.ts
+++ b/src/Squidex/app/features/settings/pages/languages/language.component.ts
@@ -130,7 +130,7 @@ export class LanguageComponent implements OnInit, OnChanges, OnDestroy {
                 this.allLanguages.filter(l =>
                     this.language.iso2Code !== l.iso2Code &&
                     this.language.fallback.indexOf(l.iso2Code) < 0);
-            this.otherLanguage = this.otherLanguages.values[0];
+            this.otherLanguage = this.otherLanguages[0];
         }
 
         if (this.language) {
diff --git a/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts b/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts
index 40b82b236..cb23a9962 100644
--- a/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts
+++ b/src/Squidex/app/features/settings/pages/languages/languages-page.component.ts
@@ -106,16 +106,7 @@ export class LanguagesPageComponent implements OnInit {
 
         this.appLanguages =
             new AppLanguagesDto(
-                appLanguages.languages.map(l => {
-                    const isMaster = masterId ? l.iso2Code === masterId : l.isMaster;
-
-                    return new AppLanguageDto(
-                        l.iso2Code,
-                        l.englishName, isMaster,
-                        l.isOptional,
-                        l.fallback.filter(f => !!appLanguages.languages.find(l2 => l2.iso2Code === f))
-                    );
-                }).sort((a, b) => {
+                appLanguages.languages.sort((a, b) => {
                     if (a.isMaster === b.isMaster) {
                         return a.iso2Code.localeCompare(b.iso2Code);
                     } else {
diff --git a/src/Squidex/app/shared/services/app-languages.service.spec.ts b/src/Squidex/app/shared/services/app-languages.service.spec.ts
index 9b249ae45..b9f8b1c03 100644
--- a/src/Squidex/app/shared/services/app-languages.service.spec.ts
+++ b/src/Squidex/app/shared/services/app-languages.service.spec.ts
@@ -20,34 +20,56 @@ import {
 } from './../';
 
 describe('AppLanguageDto', () => {
-    const language1 = new AppLanguageDto('de', 'English', false, false, []);
-    const language2 = new AppLanguageDto('en', 'English', false, false, []);
-    const language2_new = new AppLanguageDto('en', 'English (United States)', false, false, []);
     const version = new Version('1');
     const newVersion = new Version('2');
 
     it('should update languages when adding language', () => {
-        const languages_1 = new AppLanguagesDto([language1], version);
-        const languages_2 = languages_1.addLanguage(language2, newVersion);
+        const language1_1 = new AppLanguageDto('de', 'English', true, false, []);
+        const language2_1 = new AppLanguageDto('it', 'Italien', false, false, []);
 
-        expect(languages_2.languages).toEqual([language1, language2]);
+        const languages_1 = new AppLanguagesDto([language1_1], version);
+        const languages_2 = languages_1.addLanguage(language2_1, newVersion);
+
+        expect(languages_2.languages).toEqual([language1_1, language2_1]);
         expect(languages_2.version).toEqual(newVersion);
     });
 
     it('should update languages when removing language', () => {
-        const languages_1 = new AppLanguagesDto([language1, language2], version);
-        const languages_2 = languages_1.removeLanguage(language1, newVersion);
+        const language1_1 = new AppLanguageDto('de', 'English', true, false, ['it']);
+        const language1_2 = new AppLanguageDto('de', 'English', true, false, []);
+        const language2_1 = new AppLanguageDto('it', 'Italien', false, false, []);
+
+        const languages_1 = new AppLanguagesDto([language1_1, language2_1], version);
+        const languages_2 = languages_1.removeLanguage(language2_1, newVersion);
 
-        expect(languages_2.languages).toEqual([language2]);
+        expect(languages_2.languages).toEqual([language1_2]);
         expect(languages_2.version).toEqual(newVersion);
     });
 
     it('should update languages when updating language', () => {
-        const languages_1 = new AppLanguagesDto([language1, language2], version);
-        const languages_2 = languages_1.updateLanguage(language2_new, newVersion);
+        const language1_1 = new AppLanguageDto('de', 'English', true, false, ['it']);
+        const language2_1 = new AppLanguageDto('it', 'Italien', false, false, []);
+        const language2_2 = new AppLanguageDto('it', 'Italien', false, false, ['de']);
+
+        const languages_1 = new AppLanguagesDto([language1_1, language2_1], version);
+        const languages_2 = languages_1.updateLanguage(language2_2, newVersion);
+
+        expect(languages_2.languages).toEqual([language1_1, language2_2]);
+        expect(languages_2.version).toEqual(newVersion);
+    });
+
+    it('should update master language when updating language', () => {
+        const language1_1 = new AppLanguageDto('de', 'English', true, false, ['it']);
+        const language1_2 = new AppLanguageDto('de', 'English', false, false, ['it']);
+        const language2_1 = new AppLanguageDto('it', 'Italien', false, false, []);
+        const language2_2 = new AppLanguageDto('it', 'Italien', true, false, ['de']);
+
+        const languages_1 = new AppLanguagesDto([language1_1, language2_1], version);
+        const languages_2 = languages_1.updateLanguage(language2_2, newVersion);
 
-        expect(languages_2.languages).toEqual([language1, language2_new]);
+        expect(languages_2.languages).toEqual([language1_2, language2_2]);
         expect(languages_2.version).toEqual(newVersion);
+        expect(languages_2.languages[0].isMaster).toBeFalsy();
     });
 });
 
diff --git a/src/Squidex/app/shared/services/app-languages.service.ts b/src/Squidex/app/shared/services/app-languages.service.ts
index f5da2e4fb..78f6bc6e9 100644
--- a/src/Squidex/app/shared/services/app-languages.service.ts
+++ b/src/Squidex/app/shared/services/app-languages.service.ts
@@ -30,12 +30,29 @@ export class AppLanguagesDto {
         return new AppLanguagesDto([...this.languages, language], version);
     }
 
-    public updateLanguage(language: AppLanguageDto, version: Version) {
-        return new AppLanguagesDto(this.languages.map(l => l.iso2Code === language.iso2Code ? language : l), version);
+    public removeLanguage(language: AppLanguageDto, version: Version) {
+        return new AppLanguagesDto(
+            this.languages.filter(l => l.iso2Code !== language.iso2Code).map(l => {
+                return new AppLanguageDto(
+                    l.iso2Code,
+                    l.englishName,
+                    l.isMaster,
+                    l.isOptional,
+                    l.fallback.filter(f => f !== language.iso2Code));
+            }), version);
     }
 
-    public removeLanguage(language: AppLanguageDto, version: Version) {
-        return new AppLanguagesDto(this.languages.filter(l => l.iso2Code !== language.iso2Code), version);
+    public updateLanguage(language: AppLanguageDto, version: Version) {
+        return new AppLanguagesDto(
+            this.languages.map(l => {
+                if (l.iso2Code === language.iso2Code) {
+                    return language;
+                } else if (l.isMaster && language.isMaster) {
+                    return  new AppLanguageDto(l.iso2Code, l.englishName, false, l.isOptional, l.fallback);
+                } else {
+                    return l;
+                }
+            }), version);
     }
 }
 
diff --git a/tests/Squidex.Domain.Apps.Core.Tests/Model/Apps/LanguagesConfigJsonTests.cs b/tests/Squidex.Domain.Apps.Core.Tests/Model/Apps/LanguagesConfigJsonTests.cs
index cd5ae5eb9..e54510c0c 100644
--- a/tests/Squidex.Domain.Apps.Core.Tests/Model/Apps/LanguagesConfigJsonTests.cs
+++ b/tests/Squidex.Domain.Apps.Core.Tests/Model/Apps/LanguagesConfigJsonTests.cs
@@ -6,6 +6,7 @@
 //  All rights reserved.
 // ==========================================================================
 
+using System.Linq;
 using FluentAssertions;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -27,9 +28,13 @@ namespace Squidex.Domain.Apps.Core.Model.Apps
                 new LanguageConfig(Language.DE, true, Language.EN),
                 new LanguageConfig(Language.IT, false, Language.DE));
 
+            sut.MakeMaster(Language.IT);
+
             var serialized = JToken.FromObject(sut, serializer).ToObject<LanguagesConfig>(serializer);
 
             serialized.ShouldBeEquivalentTo(sut);
+
+            Assert.Same(serialized.FirstOrDefault(x => x.Key == "it"), serialized.Master);
         }
     }
 }