Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
@AaronSadlerUK
AaronSadlerUK committed Sep 14, 2022
2 parents 75891c9 + be14068 commit 61e9f29
Show file tree
Hide file tree
Showing 1,395 changed files with 77,927 additions and 22,856 deletions.
46 changes: 23 additions & 23 deletions ActiveIS.UmbracoForms.ConfirmInput/ActiveIS.UmbracoForms.ConfirmInput.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,37 +74,37 @@
<HintPath>..\packages\Semver.2.0.4\lib\net452\Semver.dll</HintPath>
</Reference>
<Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
<HintPath>..\packages\Serilog.2.8.0\lib\net46\Serilog.dll</HintPath>
<HintPath>..\packages\Serilog.2.10.0\lib\net46\Serilog.dll</HintPath>
</Reference>
<Reference Include="Serilog.Enrichers.Process, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
<HintPath>..\packages\Serilog.Enrichers.Process.2.0.1\lib\net45\Serilog.Enrichers.Process.dll</HintPath>
<HintPath>..\packages\Serilog.Enrichers.Process.2.0.2\lib\net45\Serilog.Enrichers.Process.dll</HintPath>
</Reference>
<Reference Include="Serilog.Enrichers.Thread, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
<HintPath>..\packages\Serilog.Enrichers.Thread.3.0.0\lib\net45\Serilog.Enrichers.Thread.dll</HintPath>
<HintPath>..\packages\Serilog.Enrichers.Thread.3.1.0\lib\net45\Serilog.Enrichers.Thread.dll</HintPath>
</Reference>
<Reference Include="Serilog.Filters.Expressions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
<HintPath>..\packages\Serilog.Filters.Expressions.2.0.0\lib\net45\Serilog.Filters.Expressions.dll</HintPath>
<Reference Include="Serilog.Filters.Expressions, Version=2.1.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
<HintPath>..\packages\Serilog.Filters.Expressions.2.1.0\lib\net45\Serilog.Filters.Expressions.dll</HintPath>
</Reference>
<Reference Include="Serilog.Formatting.Compact, Version=1.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
<HintPath>..\packages\Serilog.Formatting.Compact.1.0.0\lib\net45\Serilog.Formatting.Compact.dll</HintPath>
<Reference Include="Serilog.Formatting.Compact, Version=1.1.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
<HintPath>..\packages\Serilog.Formatting.Compact.1.1.0\lib\net452\Serilog.Formatting.Compact.dll</HintPath>
</Reference>
<Reference Include="Serilog.Formatting.Compact.Reader, Version=1.0.3.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
<HintPath>..\packages\Serilog.Formatting.Compact.Reader.1.0.3\lib\net45\Serilog.Formatting.Compact.Reader.dll</HintPath>
<Reference Include="Serilog.Formatting.Compact.Reader, Version=1.0.5.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
<HintPath>..\packages\Serilog.Formatting.Compact.Reader.1.0.5\lib\net45\Serilog.Formatting.Compact.Reader.dll</HintPath>
</Reference>
<Reference Include="Serilog.Settings.AppSettings, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
<HintPath>..\packages\Serilog.Settings.AppSettings.2.2.2\lib\net45\Serilog.Settings.AppSettings.dll</HintPath>
</Reference>
<Reference Include="Serilog.Sinks.Async, Version=1.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
<HintPath>..\packages\Serilog.Sinks.Async.1.3.0\lib\net45\Serilog.Sinks.Async.dll</HintPath>
<Reference Include="Serilog.Sinks.Async, Version=1.5.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
<HintPath>..\packages\Serilog.Sinks.Async.1.5.0\lib\net461\Serilog.Sinks.Async.dll</HintPath>
</Reference>
<Reference Include="Serilog.Sinks.File, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
<HintPath>..\packages\Serilog.Sinks.File.4.0.0\lib\net45\Serilog.Sinks.File.dll</HintPath>
<HintPath>..\packages\Serilog.Sinks.File.4.1.0\lib\net45\Serilog.Sinks.File.dll</HintPath>
</Reference>
<Reference Include="Serilog.Sinks.Map, Version=1.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
<HintPath>..\packages\Serilog.Sinks.Map.1.0.0\lib\netstandard2.0\Serilog.Sinks.Map.dll</HintPath>
<Reference Include="Serilog.Sinks.Map, Version=1.0.2.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
<HintPath>..\packages\Serilog.Sinks.Map.1.0.2\lib\netstandard2.0\Serilog.Sinks.Map.dll</HintPath>
</Reference>
<Reference Include="Superpower, Version=1.0.0.0, Culture=neutral, PublicKeyToken=aec39280ded1b3a7, processorArchitecture=MSIL">
<HintPath>..\packages\Superpower.2.0.0\lib\net45\Superpower.dll</HintPath>
<HintPath>..\packages\Superpower.2.3.0\lib\net45\Superpower.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
Expand Down Expand Up @@ -144,19 +144,19 @@
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="Umbraco.Core, Version=8.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoCms.Core.8.1.0\lib\net472\Umbraco.Core.dll</HintPath>
<HintPath>..\packages\UmbracoCms.Core.8.17.2\lib\net472\Umbraco.Core.dll</HintPath>
</Reference>
<Reference Include="Umbraco.Forms.Core, Version=8.4.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoForms.Core.8.4.1\lib\net472\Umbraco.Forms.Core.dll</HintPath>
<Reference Include="Umbraco.Forms.Core, Version=8.10.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoForms.Core.8.10.2\lib\net472\Umbraco.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Umbraco.Forms.Core.Providers, Version=8.4.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoForms.Core.8.4.1\lib\net472\Umbraco.Forms.Core.Providers.dll</HintPath>
<Reference Include="Umbraco.Forms.Core.Providers, Version=8.10.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoForms.Core.8.10.2\lib\net472\Umbraco.Forms.Core.Providers.dll</HintPath>
</Reference>
<Reference Include="Umbraco.Forms.Web, Version=8.4.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoForms.Core.8.4.1\lib\net472\Umbraco.Forms.Web.dll</HintPath>
<Reference Include="Umbraco.Forms.Web, Version=8.10.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoForms.Core.8.10.2\lib\net472\Umbraco.Forms.Web.dll</HintPath>
</Reference>
<Reference Include="Umbraco.Licensing, Version=2.0.33.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\UmbracoForms.Core.8.4.1\lib\net472\Umbraco.Licensing.dll</HintPath>
<HintPath>..\packages\UmbracoForms.Core.8.10.2\lib\net472\Umbraco.Licensing.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ActiveIS.UmbracoForms.ConfirmInput/Fields/ConfirmInputField.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ public override IEnumerable<string> ValidateField(Form form, Field field, IEnume
errors.Add(ValidationErrorMessage);
}

return errors.Any() ? errors : base.ValidateField(form, field, fieldValues, context, formStorage);
return errors.Any() ? errors : base.ValidateField(form, field, fieldValues.Take(1), context, formStorage);
}

public override IEnumerable<string> RequiredJavascriptFiles(Field field)
Expand Down
24 changes: 12 additions & 12 deletions ActiveIS.UmbracoForms.ConfirmInput/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@
<package id="NPoco" version="3.9.4" targetFramework="net472" />
<package id="Owin" version="1.0" targetFramework="net472" />
<package id="Semver" version="2.0.4" targetFramework="net472" />
<package id="Serilog" version="2.8.0" targetFramework="net472" />
<package id="Serilog.Enrichers.Process" version="2.0.1" targetFramework="net472" />
<package id="Serilog.Enrichers.Thread" version="3.0.0" targetFramework="net472" />
<package id="Serilog.Filters.Expressions" version="2.0.0" targetFramework="net472" />
<package id="Serilog.Formatting.Compact" version="1.0.0" targetFramework="net472" />
<package id="Serilog.Formatting.Compact.Reader" version="1.0.3" targetFramework="net472" />
<package id="Serilog" version="2.10.0" targetFramework="net472" />
<package id="Serilog.Enrichers.Process" version="2.0.2" targetFramework="net472" />
<package id="Serilog.Enrichers.Thread" version="3.1.0" targetFramework="net472" />
<package id="Serilog.Filters.Expressions" version="2.1.0" targetFramework="net472" />
<package id="Serilog.Formatting.Compact" version="1.1.0" targetFramework="net472" />
<package id="Serilog.Formatting.Compact.Reader" version="1.0.5" targetFramework="net472" />
<package id="Serilog.Settings.AppSettings" version="2.2.2" targetFramework="net472" />
<package id="Serilog.Sinks.Async" version="1.3.0" targetFramework="net472" />
<package id="Serilog.Sinks.File" version="4.0.0" targetFramework="net472" />
<package id="Serilog.Sinks.Map" version="1.0.0" targetFramework="net472" />
<package id="Superpower" version="2.0.0" targetFramework="net472" />
<package id="Serilog.Sinks.Async" version="1.5.0" targetFramework="net472" />
<package id="Serilog.Sinks.File" version="4.1.0" targetFramework="net472" />
<package id="Serilog.Sinks.Map" version="1.0.2" targetFramework="net472" />
<package id="Superpower" version="2.3.0" targetFramework="net472" />
<package id="System.Diagnostics.DiagnosticSource" version="4.4.1" targetFramework="net472" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
<package id="Umbraco.SqlServerCE" version="4.0.0.1" targetFramework="net472" />
<package id="UmbracoCms.Core" version="8.1.0" targetFramework="net472" />
<package id="UmbracoForms.Core" version="8.4.1" targetFramework="net472" />
<package id="UmbracoCms.Core" version="8.17.2" targetFramework="net472" />
<package id="UmbracoForms.Core" version="8.10.2" targetFramework="net472" />
</packages>
12 changes: 6 additions & 6 deletions Builds/NuGet/ActiveIS.UmbracoForms.ConfirmInput.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package >
<metadata>
<id>ActiveIS.UmbracoForms.ConfirmInput</id>
<version>1.0.1</version>
<version>1.0.2</version>
<title>ActiveIS.UmbracoForms.ConfirmInput</title>
<authors>ActiveIS</authors>
<owners>ActiveIS</owners>
Expand All @@ -11,14 +11,14 @@
<projectUrl>https://github.com/ActiveIS/ActiveIS.UmbracoForms.ConfirmInput</projectUrl>
<icon>logo.png</icon>
<description>A text input with confirmation field</description>
<releaseNotes>Removed duplicate entry into field</releaseNotes>
<copyright>Copyright 2020</copyright>
<releaseNotes>Fixed validation issue</releaseNotes>
<copyright>Copyright 2022</copyright>
<tags>umbraco umbraco-cms umbraco-forms</tags>
<dependencies>
<group targetFramework=".NETFramework4.7.2">
<dependency id="UmbracoForms" version="8.4.1" />
<dependency id="UmbracoForms.Core" version="8.4.1" />
<dependency id="UmbracoCms" version="8.6.1" />
<dependency id="UmbracoForms" version="8.10.2" />
<dependency id="UmbracoForms.Core" version="8.10.2" />
<dependency id="UmbracoCms" version="8.17.2" />
</group>
</dependencies>
</metadata>
Expand Down
43 changes: 31 additions & 12 deletions TestSite/App_Data/UmbracoForms/Data/forms/6d977d23-5654-4b37-b922-2b669096dbf6.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
{
"caption": null,
"sortOrder": 0,
"id": "00000000-0000-0000-0000-000000000000",
"id": "c4953094-3a90-42df-a612-87a90b043b4b",
"page": "00000000-0000-0000-0000-000000000000",
"containers": [
{
Expand All @@ -32,9 +32,15 @@
"condition": null,
"settings": {
"DefaultValue": "",
"Placeholder": ""
"Placeholder": "",
"ShowLabel": "",
"MaximumLength": "",
"FieldType": "",
"AutocompleteAttribute": ""
},
"preValues": []
"preValues": [],
"allowedUploadTypes": null,
"allowMultipleFileUploads": true
},
{
"caption": "Email",
Expand All @@ -48,11 +54,11 @@
"dataSourceFieldKey": null,
"containsSensitiveData": false,
"mandatory": false,
"regex": "[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+.[a-zA-Z0-9-.]+",
"regex": "^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+.[a-zA-Z0-9-.]+$",
"requiredErrorMessage": null,
"invalidErrorMessage": null,
"condition": {
"id": "00000000-0000-0000-0000-000000000000",
"id": "f4e2894d-b8ec-421d-9150-c50ed28e9492",
"enabled": false,
"actionType": "Show",
"logicType": "All",
Expand All @@ -62,7 +68,9 @@
"ValidationErrorMessage": "",
"Placeholder": ""
},
"preValues": []
"preValues": [],
"allowedUploadTypes": null,
"allowMultipleFileUploads": true
},
{
"caption": "Message",
Expand All @@ -82,9 +90,15 @@
"condition": null,
"settings": {
"DefaultValue": "",
"Placeholder": ""
"Placeholder": "",
"ShowLabel": "",
"AutocompleteAttribute": "",
"NumberOfRows": "",
"MaximumLength": ""
},
"preValues": []
"preValues": [],
"allowedUploadTypes": null,
"allowMultipleFileUploads": true
},
{
"caption": "Consent for storing submitted data",
Expand All @@ -105,7 +119,9 @@
"settings": {
"AcceptCopy": "Yes, I give permission to store and process my data"
},
"preValues": null
"preValues": null,
"allowedUploadTypes": null,
"allowMultipleFileUploads": true
}
]
}
Expand All @@ -115,8 +131,9 @@
],
"caption": "Contact Us",
"sortOrder": 0,
"id": "00000000-0000-0000-0000-000000000000",
"form": "00000000-0000-0000-0000-000000000000"
"id": "a5213a29-6735-4461-a324-fd97f45a4de0",
"form": "00000000-0000-0000-0000-000000000000",
"buttonCondition": null
}
],
"id": "6d977d23-5654-4b37-b922-2b669096dbf6",
Expand All @@ -131,12 +148,14 @@
"xPathOnSubmit": null,
"manualApproval": false,
"storeRecordsLocally": true,
"autocompleteAttribute": "",
"cssClass": null,
"disableDefaultStylesheet": false,
"useClientDependency": false,
"workflows": [],
"datasource": null,
"submitLabel": "Submit",
"nextLabel": "Next",
"prevLabel": "Prev"
"prevLabel": "Prev",
"folderId": null
}
Loading

0 comments on commit 61e9f29

Please sign in to comment.