Skip to content

Commit 682aa0d

Browse files
author
Aaron Sadler
committed
Merge branch 'dev/8.7'
2 parents 0566d48 + 5eebdc6 commit 682aa0d

File tree

100 files changed

+2575
-1720
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+2575
-1720
lines changed

‎Builds/NuGet/UmbracoForms.uCaptcha.nuspec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>AaronSadler.uCaptcha</id>
5-
<version>1.0.2</version>
5+
<version>1.0.3</version>
66
<title>UmbracoForms.uCaptcha</title>
77
<authors>Aaron Sadler</authors>
88
<owners>Aaron Sadler</owners>
@@ -12,13 +12,13 @@
1212
<icon>uCaptcha-logo.png</icon>
1313
<summary>A simple to use and integrate captcha plugin for Umbraco Forms which supports both hCaptcha and reCaptcha</summary>
1414
<description>A simple to use and integrate captcha plugin for Umbraco Forms which supports both hCaptcha and reCaptcha</description>
15-
<releaseNotes><![CDATA[1.0.1 Fixed string conversion to bool exception]]></releaseNotes>
15+
<releaseNotes><![CDATA[1.0.3 Fixed to work with Umbraco Forms 8.7.0]]></releaseNotes>
1616
<copyright>Copyright 2020</copyright>
1717
<tags>umbraco, umbraco-cms, hCaptcha, umbraco-forms, reCaptcha</tags>
1818
<dependencies>
1919
<group targetFramework=".NETFramework4.7.2">
20-
<dependency id="UmbracoForms" version="8.4.1" />
21-
<dependency id="UmbracoForms.Core" version="8.4.1" />
20+
<dependency id="UmbracoForms" version="8.7.0" />
21+
<dependency id="UmbracoForms.Core" version="8.7.0" />
2222
<dependency id="UmbracoCms" version="8.6.1" />
2323
</group>
2424
</dependencies>

‎Builds/NuGet/nuget.exe‎

6.41 MB
Binary file not shown.

‎Builds/UmbracoForms.uCaptcha_1.0.3.zip‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
version https://git-lfs.github.com/spec/v1
2+
oid sha256:17826ee67f4bc12b9ac7e97edb0504cd423eeb9fb9ab11ec1f24720945a2ca7d
3+
size 16366

‎Builds/package.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<info>
44
<package>
55
<name>UmbracoForms.uCaptcha</name>
6-
<version>1.0.2</version>
6+
<version>1.0.3</version>
77
<iconUrl></iconUrl>
88
<licence url="https://opensource.org/licenses/MIT">MIT</licence>
99
<url>https://github.com/AaronSadlerUK/UmbracoForms.uCaptcha</url>

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ A simple to use and integrate captcha plugin for Umbraco Forms which supports bo
44

55
## Getting started
66

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

99
### Installation
1010

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

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

19-
This is tested with **Umbraco V8.6.1** and **Umbraco Forms 8.4.1**
19+
This is tested with **Umbraco V8.6.1** and **Umbraco Forms 8.7.0**
2020

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

4848
## License
4949

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

5252
Licensed under the MIT License.

‎TestSite/App_Data/packages/installedPackages.config‎

Lines changed: 1 addition & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<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="">
4-
<license url="http://opensource.org/licenses/MIT"><![CDATA[MIT License]]></license>
5-
<author url="https://umbraco.com"><![CDATA[Umbraco HQ]]></author>
6-
<contributors />
7-
<readme><![CDATA[This is the default starter kit for Umbraco 8.0.0+.
8-
9-
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>
10-
<actions></actions>
11-
<datatypes>1060,1061,1062,1063,1064,1065,1066,1067,1068,1069,1070,1071,1072,1073,1074,1075,1076,1077,1078,1079,1080</datatypes>
12-
<content nodeId="1104" loadChildNodes="false" />
13-
<templates>1081,1082,1083,1084,1085,1086,1087,1088,1089,1090</templates>
14-
<stylesheets></stylesheets>
15-
<documentTypes>1092,1093,1094,1095,1096,1097,1098,1099,1100,1101,1102,1103</documentTypes>
16-
<macros>1,2</macros>
17-
<files>
18-
<file>Media\SK_Temp\7373036290_5e8420bf36_b.jpg</file>
19-
<file>Media\SK_Temp\14272036539_469ca21d5c_h.jpg</file>
20-
<file>Media\SK_Temp\7373036208_30257976a0_b.jpg</file>
21-
<file>Media\SK_Temp\7371127652_e01b6ab56f_b.jpg</file>
22-
<file>Media\SK_Temp\18530280048_459b8b61b2_h.jpg</file>
23-
<file>Media\SK_Temp\7377957524_347859faac_b.jpg</file>
24-
<file>Media\SK_Temp\16403439029_f500be349b_o.jpg</file>
25-
<file>Media\SK_Temp\4730684907_8a7f8759cb_b.jpg</file>
26-
<file>Media\SK_Temp\5852022091_87c5d045ab_b.jpg</file>
27-
<file>Media\SK_Temp\18095416144_44a566a5f4_h.jpg</file>
28-
<file>Media\SK_Temp\5852022211_9028df67c0_b.jpg</file>
29-
<file>Media\SK_Temp\18720470241_ff77768544_h.jpg</file>
30-
<file>Media\SK_Temp\18531852339_981b067419_h.jpg</file>
31-
<file>Media\SK_Temp\18531854019_351c579559_h.jpg</file>
32-
<file>scripts\umbraco-starterkit-app.js</file>
33-
<file>bin\Umbraco.SampleSite.dll</file>
34-
<file>App_Plugins\StarterKit\lessons.service.js</file>
35-
<file>App_Plugins\StarterKit\package.manifest</file>
36-
<file>App_Plugins\StarterKit\StarterKitHelp.Controller.js</file>
37-
<file>App_Plugins\StarterKit\starterkithelp.html</file>
38-
<file>App_Plugins\StarterKit\backoffice\tours\create-content.json</file>
39-
<file>App_Plugins\StarterKit\backoffice\tours\data-structure.json</file>
40-
<file>App_Plugins\StarterKit\lang\en-GB.xml</file>
41-
<file>App_Plugins\StarterKit\lang\en-US.xml</file>
42-
<file>App_Plugins\StarterKit\tours\views\validatetext.controller.js</file>
43-
<file>App_Plugins\StarterKit\tours\views\validatetext.html</file>
44-
<file>App_Plugins\StarterKit\tours\views\medialibrary\uploadimages.controller.js</file>
45-
<file>App_Plugins\StarterKit\tours\views\medialibrary\uploadimages.html</file>
46-
<file>Views\Partials\Navigation\TopNavigation.cshtml</file>
47-
<file>Views\Partials\CategoryLinks.cshtml</file>
48-
<file>Views\Partials\SectionHeader.cshtml</file>
49-
<file>Views\Partials\Navigation\SubNavigation.cshtml</file>
50-
<file>Views\Partials\Navigation\TopNavigation.cshtml</file>
51-
<file>css\umbraco-starterkit-style.css</file>
52-
<file>Views\MacroPartials\FeaturedProducts.cshtml</file>
53-
<file>Views\MacroPartials\LatestBlogposts.cshtml</file>
54-
<file>bin\Our.Umbraco.OsmMaps.dll</file>
55-
<file>App_Plugins\OsmMaps\OsmMaps.controller.js</file>
56-
<file>App_Plugins\OsmMaps\OsmMaps.html</file>
57-
<file>App_Plugins\OsmMaps\package.manifest</file>
58-
<file>App_Plugins\OsmMaps\assets\css\osmmaps.css</file>
59-
<file>App_Plugins\OsmMaps\assets\leaflet\leaflet-src.js</file>
60-
<file>App_Plugins\OsmMaps\assets\leaflet\leaflet.css</file>
61-
<file>App_Plugins\OsmMaps\assets\leaflet\leaflet.js</file>
62-
<file>App_Plugins\OsmMaps\assets\leaflet\images\layers-2x.png</file>
63-
<file>App_Plugins\OsmMaps\assets\leaflet\images\layers.png</file>
64-
<file>App_Plugins\OsmMaps\assets\leaflet\images\marker-icon-2x.png</file>
65-
<file>App_Plugins\OsmMaps\assets\leaflet\images\marker-icon.png</file>
66-
<file>App_Plugins\OsmMaps\assets\leaflet\images\marker-shadow.png</file>
67-
<file>App_Plugins\OsmMaps\langs\da-dk.js</file>
68-
<file>App_Plugins\OsmMaps\langs\de-de.js</file>
69-
<file>App_Plugins\OsmMaps\langs\en-gb.js</file>
70-
<file>App_Plugins\OsmMaps\langs\en-us.js</file>
71-
<file>App_Plugins\OsmMaps\langs\es-es.js</file>
72-
<file>App_Plugins\OsmMaps\langs\fr-fr.js</file>
73-
<file>App_Plugins\OsmMaps\langs\he-il.js</file>
74-
<file>App_Plugins\OsmMaps\langs\it-it.js</file>
75-
<file>App_Plugins\OsmMaps\langs\ja-jp.js</file>
76-
<file>App_Plugins\OsmMaps\langs\ko-kr.js</file>
77-
<file>App_Plugins\OsmMaps\langs\nb-no.js</file>
78-
<file>App_Plugins\OsmMaps\langs\nl-nl.js</file>
79-
<file>App_Plugins\OsmMaps\langs\pl-pl.js</file>
80-
<file>App_Plugins\OsmMaps\langs\pt-br.js</file>
81-
<file>App_Plugins\OsmMaps\langs\ru-ru.js</file>
82-
<file>App_Plugins\OsmMaps\langs\sv-se.js</file>
83-
<file>App_Plugins\OsmMaps\langs\zh-cn.js</file>
84-
</files>
85-
<languages></languages>
86-
<dictionaryitems></dictionaryitems>
87-
</package>
88-
<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="">
3+
<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="">
894
<license url="http://opensource.org/licenses/MIT"><![CDATA[MIT License]]></license>
905
<author url="https://umbraco.com"><![CDATA[Umbraco HQ]]></author>
916
<contributors />

‎TestSite/App_Plugins/UmbracoForms/Assets/aspnet-validation/dist/aspnet-validation.min.js‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)