Skip to content

Commit

Permalink
Merge branch 'dev/8.7'
Browse files Browse the repository at this point in the history
  • Loading branch information
Aaron Sadler committed Apr 7, 2021
2 parents 0566d48 + 5eebdc6 commit 682aa0d
Show file tree
Hide file tree
Showing 100 changed files with 2,575 additions and 1,720 deletions.
8 changes: 4 additions & 4 deletions Builds/NuGet/UmbracoForms.uCaptcha.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package >
<metadata>
<id>AaronSadler.uCaptcha</id>
<version>1.0.2</version>
<version>1.0.3</version>
<title>UmbracoForms.uCaptcha</title>
<authors>Aaron Sadler</authors>
<owners>Aaron Sadler</owners>
Expand All @@ -12,13 +12,13 @@
<icon>uCaptcha-logo.png</icon>
<summary>A simple to use and integrate captcha plugin for Umbraco Forms which supports both hCaptcha and reCaptcha</summary>
<description>A simple to use and integrate captcha plugin for Umbraco Forms which supports both hCaptcha and reCaptcha</description>
<releaseNotes><![CDATA[1.0.1 Fixed string conversion to bool exception]]></releaseNotes>
<releaseNotes><![CDATA[1.0.3 Fixed to work with Umbraco Forms 8.7.0]]></releaseNotes>
<copyright>Copyright 2020</copyright>
<tags>umbraco, umbraco-cms, hCaptcha, umbraco-forms, reCaptcha</tags>
<dependencies>
<group targetFramework=".NETFramework4.7.2">
<dependency id="UmbracoForms" version="8.4.1" />
<dependency id="UmbracoForms.Core" version="8.4.1" />
<dependency id="UmbracoForms" version="8.7.0" />
<dependency id="UmbracoForms.Core" version="8.7.0" />
<dependency id="UmbracoCms" version="8.6.1" />
</group>
</dependencies>
Expand Down
Binary file added Builds/NuGet/nuget.exe
View file
Binary file not shown.
3 changes: 3 additions & 0 deletions Builds/UmbracoForms.uCaptcha_1.0.3.zip
View file
Git LFS file not shown
2 changes: 1 addition & 1 deletion Builds/package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<info>
<package>
<name>UmbracoForms.uCaptcha</name>
<version>1.0.2</version>
<version>1.0.3</version>
<iconUrl></iconUrl>
<licence url="https://opensource.org/licenses/MIT">MIT</licence>
<url>https://github.com/AaronSadlerUK/UmbracoForms.uCaptcha</url>
Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ A simple to use and integrate captcha plugin for Umbraco Forms which supports bo

## Getting started

This package is supported on Umbraco 8.6+ and Umbraco Forms 8.4.1+.
This package is supported on Umbraco 8.6+ and Umbraco Forms 8.7.0+.

### Installation

Expand All @@ -16,7 +16,7 @@ This package adds both hCaptcha or reCaptcha to Umbraco Forms, configurable by t

It has the ability to choose from the traditional checkbox or invisible options.

This is tested with **Umbraco V8.6.1** and **Umbraco Forms 8.4.1**
This is tested with **Umbraco V8.6.1** and **Umbraco Forms 8.7.0**

You can see a demo of it in action here:
[https://aaronsadler.uk/contact/](https://aaronsadler.uk/contact/)
Expand Down Expand Up @@ -47,6 +47,6 @@ To raise a new bug, create an issue on the GitHub repository. To fix a bug or ad

## License

Copyright &copy; 2020 [Aaron Sadler](https://aaronsadler.uk/).
Copyright &copy; 2021 [Aaron Sadler](https://aaronsadler.uk/).

Licensed under the MIT License.
87 changes: 1 addition & 86 deletions TestSite/App_Data/packages/installedPackages.config
View file
Original file line number Diff line number Diff line change
@@ -1,91 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="1" version="4.0.2" url="https://umbraco.com" name="The Starter Kit" packagePath="D:\Repos\UmbracoForms.hCaptcha\TestSite\App_Data\packages\ced954d1-8c0f-4abe-bdda-99e7a787d052.umb" iconUrl="" umbVersion="8.0.0" packageGuid="b961642b-b8e0-4286-bec6-2e5f75a9422f" view="">
<license url="http://opensource.org/licenses/MIT"><![CDATA[MIT License]]></license>
<author url="https://umbraco.com"><![CDATA[Umbraco HQ]]></author>
<contributors />
<readme><![CDATA[This is the default starter kit for Umbraco 8.0.0+.
It contains a simple website that contains many basic features to help get you started including a home page, a blog, a product catalog, contact page and more.]]></readme>
<actions></actions>
<datatypes>1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1072,1073,1074,1075,1076,1077,1078,1079,1080</datatypes>
<content nodeId="1104" loadChildNodes="false" />
<templates>1081,1082,1083,1084,1085,1086,1087,1088,1089,1090</templates>
<stylesheets></stylesheets>
<documentTypes>1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103</documentTypes>
<macros>1,2</macros>
<files>
<file>Media\SK_Temp\7373036290_5e8420bf36_b.jpg</file>
<file>Media\SK_Temp\14272036539_469ca21d5c_h.jpg</file>
<file>Media\SK_Temp\7373036208_30257976a0_b.jpg</file>
<file>Media\SK_Temp\7371127652_e01b6ab56f_b.jpg</file>
<file>Media\SK_Temp\18530280048_459b8b61b2_h.jpg</file>
<file>Media\SK_Temp\7377957524_347859faac_b.jpg</file>
<file>Media\SK_Temp\16403439029_f500be349b_o.jpg</file>
<file>Media\SK_Temp\4730684907_8a7f8759cb_b.jpg</file>
<file>Media\SK_Temp\5852022091_87c5d045ab_b.jpg</file>
<file>Media\SK_Temp\18095416144_44a566a5f4_h.jpg</file>
<file>Media\SK_Temp\5852022211_9028df67c0_b.jpg</file>
<file>Media\SK_Temp\18720470241_ff77768544_h.jpg</file>
<file>Media\SK_Temp\18531852339_981b067419_h.jpg</file>
<file>Media\SK_Temp\18531854019_351c579559_h.jpg</file>
<file>scripts\umbraco-starterkit-app.js</file>
<file>bin\Umbraco.SampleSite.dll</file>
<file>App_Plugins\StarterKit\lessons.service.js</file>
<file>App_Plugins\StarterKit\package.manifest</file>
<file>App_Plugins\StarterKit\StarterKitHelp.Controller.js</file>
<file>App_Plugins\StarterKit\starterkithelp.html</file>
<file>App_Plugins\StarterKit\backoffice\tours\create-content.json</file>
<file>App_Plugins\StarterKit\backoffice\tours\data-structure.json</file>
<file>App_Plugins\StarterKit\lang\en-GB.xml</file>
<file>App_Plugins\StarterKit\lang\en-US.xml</file>
<file>App_Plugins\StarterKit\tours\views\validatetext.controller.js</file>
<file>App_Plugins\StarterKit\tours\views\validatetext.html</file>
<file>App_Plugins\StarterKit\tours\views\medialibrary\uploadimages.controller.js</file>
<file>App_Plugins\StarterKit\tours\views\medialibrary\uploadimages.html</file>
<file>Views\Partials\Navigation\TopNavigation.cshtml</file>
<file>Views\Partials\CategoryLinks.cshtml</file>
<file>Views\Partials\SectionHeader.cshtml</file>
<file>Views\Partials\Navigation\SubNavigation.cshtml</file>
<file>Views\Partials\Navigation\TopNavigation.cshtml</file>
<file>css\umbraco-starterkit-style.css</file>
<file>Views\MacroPartials\FeaturedProducts.cshtml</file>
<file>Views\MacroPartials\LatestBlogposts.cshtml</file>
<file>bin\Our.Umbraco.OsmMaps.dll</file>
<file>App_Plugins\OsmMaps\OsmMaps.controller.js</file>
<file>App_Plugins\OsmMaps\OsmMaps.html</file>
<file>App_Plugins\OsmMaps\package.manifest</file>
<file>App_Plugins\OsmMaps\assets\css\osmmaps.css</file>
<file>App_Plugins\OsmMaps\assets\leaflet\leaflet-src.js</file>
<file>App_Plugins\OsmMaps\assets\leaflet\leaflet.css</file>
<file>App_Plugins\OsmMaps\assets\leaflet\leaflet.js</file>
<file>App_Plugins\OsmMaps\assets\leaflet\images\layers-2x.png</file>
<file>App_Plugins\OsmMaps\assets\leaflet\images\layers.png</file>
<file>App_Plugins\OsmMaps\assets\leaflet\images\marker-icon-2x.png</file>
<file>App_Plugins\OsmMaps\assets\leaflet\images\marker-icon.png</file>
<file>App_Plugins\OsmMaps\assets\leaflet\images\marker-shadow.png</file>
<file>App_Plugins\OsmMaps\langs\da-dk.js</file>
<file>App_Plugins\OsmMaps\langs\de-de.js</file>
<file>App_Plugins\OsmMaps\langs\en-gb.js</file>
<file>App_Plugins\OsmMaps\langs\en-us.js</file>
<file>App_Plugins\OsmMaps\langs\es-es.js</file>
<file>App_Plugins\OsmMaps\langs\fr-fr.js</file>
<file>App_Plugins\OsmMaps\langs\he-il.js</file>
<file>App_Plugins\OsmMaps\langs\it-it.js</file>
<file>App_Plugins\OsmMaps\langs\ja-jp.js</file>
<file>App_Plugins\OsmMaps\langs\ko-kr.js</file>
<file>App_Plugins\OsmMaps\langs\nb-no.js</file>
<file>App_Plugins\OsmMaps\langs\nl-nl.js</file>
<file>App_Plugins\OsmMaps\langs\pl-pl.js</file>
<file>App_Plugins\OsmMaps\langs\pt-br.js</file>
<file>App_Plugins\OsmMaps\langs\ru-ru.js</file>
<file>App_Plugins\OsmMaps\langs\sv-se.js</file>
<file>App_Plugins\OsmMaps\langs\zh-cn.js</file>
</files>
<languages></languages>
<dictionaryitems></dictionaryitems>
</package>
<package id="2" version="4.0.3" url="https://umbraco.com" name="The Starter Kit" packagePath="D:\Repos\UmbracoForms.hCaptcha\TestSite\App_Data\packages\ced954d1-8c0f-4abe-bdda-99e7a787d052.umb" iconUrl="" umbVersion="8.0.0" packageGuid="ced954d1-8c0f-4abe-bdda-99e7a787d052" view="">
<package id="1" version="4.0.3" url="https://umbraco.com" name="The Starter Kit" packagePath="D:\Repos\MyStuff\UmbracoForms.uCaptcha\TestSite\App_Data\packages\ced954d1-8c0f-4abe-bdda-99e7a787d052.umb" iconUrl="" umbVersion="8.0.0" packageGuid="ced954d1-8c0f-4abe-bdda-99e7a787d052" view="">
<license url="http://opensource.org/licenses/MIT"><![CDATA[MIT License]]></license>
<author url="https://umbraco.com"><![CDATA[Umbraco HQ]]></author>
<contributors />
Expand Down
2 changes: 2 additions & 0 deletions TestSite/App_Plugins/UmbracoForms/Assets/aspnet-validation/dist/aspnet-validation.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 682aa0d

Please sign in to comment.