diff --git a/Fody.2.3.24.nupkg b/Fody.2.3.24.nupkg deleted file mode 100644 index ca315c314..000000000 Binary files a/Fody.2.3.24.nupkg and /dev/null differ diff --git a/libs/fody/2.3.24/fody.2.3.24.nupkg b/libs/fody/2.3.24/fody.2.3.24.nupkg deleted file mode 100644 index ca315c314..000000000 Binary files a/libs/fody/2.3.24/fody.2.3.24.nupkg and /dev/null differ diff --git a/libs/fody/2.3.24/fody.2.3.24.nupkg.sha512 b/libs/fody/2.3.24/fody.2.3.24.nupkg.sha512 deleted file mode 100644 index e2af0e784..000000000 --- a/libs/fody/2.3.24/fody.2.3.24.nupkg.sha512 +++ /dev/null @@ -1 +0,0 @@ -tTFEibLh222u4a7SJ+I4zCkfPRBRF4mHF446OSRQtILNZ2tH0Te/rSM7MCt1FzvLAy5KeNlZHfwdlS+AJZDa6w== \ No newline at end of file diff --git a/libs/fody/2.3.24/fody.nuspec b/libs/fody/2.3.24/fody.nuspec deleted file mode 100644 index caafd3029..000000000 --- a/libs/fody/2.3.24/fody.nuspec +++ /dev/null @@ -1,17 +0,0 @@ - - - - Fody - 2.3.24 - Simon Cropp - Simon Cropp - false - true - http://www.opensource.org/licenses/mit-license.php - http://github.com/Fody/Fody - https://raw.github.com/Fody/Fody/master/package_icon.png - Extensible tool for weaving .net assemblies. - - ILWeaving, Fody, Cecil, AOP - - \ No newline at end of file diff --git a/libs/microsoft.orleans.orleanscodegenerator.build/2.0.0-beta1-fix/microsoft.orleans.orleanscodegenerator.build.2.0.0-beta1-fix.nupkg b/libs/microsoft.orleans.orleanscodegenerator.build/2.0.0-beta1-fix/microsoft.orleans.orleanscodegenerator.build.2.0.0-beta1-fix.nupkg deleted file mode 100644 index c719a733a..000000000 Binary files a/libs/microsoft.orleans.orleanscodegenerator.build/2.0.0-beta1-fix/microsoft.orleans.orleanscodegenerator.build.2.0.0-beta1-fix.nupkg and /dev/null differ diff --git a/libs/microsoft.orleans.orleanscodegenerator.build/2.0.0-beta1-fix/microsoft.orleans.orleanscodegenerator.build.2.0.0-beta1-fix.nupkg.sha512 b/libs/microsoft.orleans.orleanscodegenerator.build/2.0.0-beta1-fix/microsoft.orleans.orleanscodegenerator.build.2.0.0-beta1-fix.nupkg.sha512 deleted file mode 100644 index 11c0b5549..000000000 --- a/libs/microsoft.orleans.orleanscodegenerator.build/2.0.0-beta1-fix/microsoft.orleans.orleanscodegenerator.build.2.0.0-beta1-fix.nupkg.sha512 +++ /dev/null @@ -1 +0,0 @@ -5W20j9jiNog4dHUEt+cCnePb8z6jFEMnkwO4XilajM7FCnen3KTnN/G8PAUGuQieSlTI9MRe0sRYcafLJl900w== \ No newline at end of file diff --git a/libs/microsoft.orleans.orleanscodegenerator.build/2.0.0-beta1-fix/microsoft.orleans.orleanscodegenerator.build.nuspec b/libs/microsoft.orleans.orleanscodegenerator.build/2.0.0-beta1-fix/microsoft.orleans.orleanscodegenerator.build.nuspec deleted file mode 100644 index d685caf66..000000000 --- a/libs/microsoft.orleans.orleanscodegenerator.build/2.0.0-beta1-fix/microsoft.orleans.orleanscodegenerator.build.nuspec +++ /dev/null @@ -1,23 +0,0 @@ - - - - Microsoft.Orleans.OrleansCodeGenerator.Build - 2.0.0-beta1-fix - Microsoft Orleans Build-time Code Generator - Microsoft - Microsoft - false - true - https://github.com/dotnet/Orleans#license - https://github.com/dotnet/Orleans - https://raw.githubusercontent.com/dotnet/orleans/gh-pages/assets/logo_128.png - Microsoft Orleans build-time code generator to install in all grain interface & implementation projects. - © Microsoft Corporation. All rights reserved. - Orleans Cloud-Computing Actor-Model Actors Distributed-Systems C# .NET - - - - - - - \ No newline at end of file diff --git a/libs/orleansdashboard/2.0.0-beta3/orleansdashboard.2.0.0-beta3.nupkg b/libs/orleansdashboard/2.0.0-beta3/orleansdashboard.2.0.0-beta3.nupkg deleted file mode 100644 index a90f02b9d..000000000 Binary files a/libs/orleansdashboard/2.0.0-beta3/orleansdashboard.2.0.0-beta3.nupkg and /dev/null differ diff --git a/libs/orleansdashboard/2.0.0-beta3/orleansdashboard.2.0.0-beta3.nupkg.sha512 b/libs/orleansdashboard/2.0.0-beta3/orleansdashboard.2.0.0-beta3.nupkg.sha512 deleted file mode 100644 index 6500d397d..000000000 --- a/libs/orleansdashboard/2.0.0-beta3/orleansdashboard.2.0.0-beta3.nupkg.sha512 +++ /dev/null @@ -1 +0,0 @@ -mBHlGWl+bNTPP463JBEB/dftmdZKQRD8X72F7lsTFqYWddW5Ytp1gbzChCxW0d/Pt71KLF6XrVmyecbFlNdFBA== \ No newline at end of file diff --git a/libs/orleansdashboard/2.0.0-beta3/orleansdashboard.nuspec b/libs/orleansdashboard/2.0.0-beta3/orleansdashboard.nuspec deleted file mode 100644 index cf2043a3f..000000000 --- a/libs/orleansdashboard/2.0.0-beta3/orleansdashboard.nuspec +++ /dev/null @@ -1,25 +0,0 @@ - - - - OrleansDashboard - 2.0.0-beta3 - OrleansContrib - OrleansContrib - false - https://opensource.org/licenses/MIT - https://github.com/OrleansContrib/OrleansDashboard - http://dotnet.github.io/orleans/assets/logo.png - An admin dashboard for Microsoft Orleans - Copyright © 2017 - orleans dashboard metrics monitor - - - - - - - - - - - \ No newline at end of file diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/NumberFieldProperties.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/NumberFieldProperties.cs index 8b0b02ec7..bd86a2a74 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Schemas/NumberFieldProperties.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/NumberFieldProperties.cs @@ -13,14 +13,14 @@ namespace Squidex.Domain.Apps.Core.Schemas [TypeName(nameof(NumberField))] public sealed class NumberFieldProperties : FieldProperties { + public ImmutableList AllowedValues { get; set; } + public double? MaxValue { get; set; } public double? MinValue { get; set; } public double? DefaultValue { get; set; } - public ImmutableList AllowedValues { get; set; } - public NumberFieldEditor Editor { get; set; } public override T Accept(IFieldPropertiesVisitor visitor) diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/StringFieldEditor.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/StringFieldEditor.cs index cdb515d5d..c7130e1de 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Schemas/StringFieldEditor.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/StringFieldEditor.cs @@ -14,6 +14,7 @@ namespace Squidex.Domain.Apps.Core.Schemas Dropdown, Radio, RichText, + Slug, TextArea } } diff --git a/src/Squidex.Domain.Apps.Core.Model/Schemas/StringFieldProperties.cs b/src/Squidex.Domain.Apps.Core.Model/Schemas/StringFieldProperties.cs index 1c0313c9e..008c18c58 100644 --- a/src/Squidex.Domain.Apps.Core.Model/Schemas/StringFieldProperties.cs +++ b/src/Squidex.Domain.Apps.Core.Model/Schemas/StringFieldProperties.cs @@ -13,6 +13,8 @@ namespace Squidex.Domain.Apps.Core.Schemas [TypeName(nameof(StringField))] public sealed class StringFieldProperties : FieldProperties { + public ImmutableList AllowedValues { get; set; } + public int? MinLength { get; set; } public int? MaxLength { get; set; } @@ -23,8 +25,6 @@ namespace Squidex.Domain.Apps.Core.Schemas public string PatternMessage { get; set; } - public ImmutableList AllowedValues { get; set; } - public StringFieldEditor Editor { get; set; } public override T Accept(IFieldPropertiesVisitor visitor) diff --git a/src/Squidex/app/features/content/pages/content/content-field.component.html b/src/Squidex/app/features/content/pages/content/content-field.component.html index 3fc4b9f7b..ca0427db4 100644 --- a/src/Squidex/app/features/content/pages/content/content-field.component.html +++ b/src/Squidex/app/features/content/pages/content/content-field.component.html @@ -49,6 +49,9 @@
+
+ +
diff --git a/src/Squidex/app/features/schemas/pages/schema/types/string-ui.component.html b/src/Squidex/app/features/schemas/pages/schema/types/string-ui.component.html index 14a5d4168..ab2ab341f 100644 --- a/src/Squidex/app/features/schemas/pages/schema/types/string-ui.component.html +++ b/src/Squidex/app/features/schemas/pages/schema/types/string-ui.component.html @@ -21,6 +21,13 @@ Input +