Merge pull request #7 from bdukes/master

Version 1.3
EngageSoftware · Apr 5, 2013 · cdb1d17 · cdb1d17
2 parents 53a5347 + eb92d2c
commit cdb1d17
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 25 deletions.
diff --git a/Docs/Engage Tell A Friend - Read Me.docx b/Docs/Engage Tell A Friend - Read Me.docx
diff --git a/EngageTellAFriend.5.dnn b/EngageTellAFriend.5.dnn
@@ -3,14 +3,18 @@
     <package name="Engage: Tell A Friend" type="Module" version="REPLACED BY NANT">
       <friendlyName>Engage: Tell A Friend</friendlyName>
       <description>A simple and flexible module for sharing DNN websites from Engage Software (http://www.engagesoftware.com/).</description>
-      <owner>
+        <iconFile>DesktopModules/EngageTellAFriend/images/tellafriend-icon32.png</iconFile>
+        <owner>
         <name>Engage Software</name>
         <organization>Engage Software</organization>
         <url><![CDATA[<a href="http://www.engagesoftware.com/">http://www.engagesoftware.com/</a>]]></url>
         <email><![CDATA[<a href="mailto:support@engagemodules.com">support@engagemodules.com</a>]]></email>
       </owner>
       <license src="REPLACED BY NANT"/>
       <releaseNotes src="REPLACED BY NANT" />
+      <dependencies>
+        <dependency type="CoreVersion">6.0.0</dependency>
+      </dependencies>
       <components>
         <component type="ResourceFile">
           <resourceFiles>

diff --git a/EngageTellAFriend.build b/EngageTellAFriend.build
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<project xmlns="http://nant.sf.net/release/0.90/nant.xsd" name="Engage: Tell A Friend" basedir="." default="package">
+<project xmlns="http://nant.sf.net/release/0.92/nant.xsd" name="Engage: Tell A Friend" basedir="." default="package">
   <property name="build" value="true" overwrite="false"/>
   <property name="bin.directory" value="..\..\bin" overwrite="false"/>
   <property name="project.config" value="release"/>
@@ -113,6 +113,7 @@
         <include name="${releaseNotes.file}"/>
         <include name="??.??.??.txt" />
         <include name="ReadMe.txt" />
+        <include name="Docs/*" />
         <include name="**/*.SqlDataProvider"/>
         <include name="**/*.4.dnn"/>
         <include name="**/*.5.dnn"/>
@@ -124,7 +125,7 @@
         <include name="${project.dll}"/>
         <include name="${references.directory}/*.dll"/>
         <exclude name="${references.directory}/DotNetNuke.dll"/>
-        <exclude name="${references.directory}/DotNetNuke.WebUtility.dll"/>
+        <exclude name="${references.directory}/DotNetNuke.*.dll"/>
         <exclude name="${references.directory}/Microsoft.ApplicationBlocks.Data.dll"/>
       </fileset>
     </copy>
@@ -135,12 +136,11 @@
       </fileset>
     </attrib>
 
-    <xmlpoke file="${package.directory}/temp/package/Engage${project.name}.5.dnn" value="${license.file}" xpath="dotnetnuke/packages/package/license/@src"/>
-    <xmlpoke file="${package.directory}/temp/package/Engage${project.name}.5.dnn" value="${releaseNotes.file}" xpath="dotnetnuke/packages/package/releaseNotes/@src"/>
-    <xmlpoke file="${package.directory}/temp/package/Engage${project.name}.5.dnn" value="${project.version}" xpath="dotnetnuke/packages/package/@version"/>
-    <xmlpoke file="${package.directory}/temp/package/Engage${project.name}.5.dnn" value="${project.version}" xpath="dotnetnuke/packages/package/components/component[@type='Script']/scripts/script[@type='UnInstall']/version"/>
-    <xmlpoke file="${package.directory}/temp/package/Engage${project.name}.5.dnn" value="${project.version}" xpath="dotnetnuke/packages/package/components/component[@type='Assembly']/assemblies/assembly[version='REPLACED BY NANT']/version"/>
-    <!--<xmlpoke file="${package.directory}/temp/package/Engage${project.name}.4.dnn" value="${project.version}" xpath="dotnetnuke/folders/folder/version"/>-->
+    <xmlpoke file="${package.directory}/temp/package/Engage${project.name}.5.dnn" value="${license.file}" xpath="dotnetnuke/packages/package/license/@src" failonerror="false" />
+    <xmlpoke file="${package.directory}/temp/package/Engage${project.name}.5.dnn" value="${releaseNotes.file}" xpath="dotnetnuke/packages/package/releaseNotes/@src" failonerror="false" />
+    <xmlpoke file="${package.directory}/temp/package/Engage${project.name}.5.dnn" value="${project.version}" xpath="dotnetnuke/packages/package/@version" failonerror="false" />
+    <xmlpoke file="${package.directory}/temp/package/Engage${project.name}.5.dnn" value="${project.version}" xpath="dotnetnuke/packages/package/components/component[@type='Script']/scripts/script[@type='UnInstall']/version" failonerror="false" />
+    <xmlpoke file="${package.directory}/temp/package/Engage${project.name}.5.dnn" value="${project.version}" xpath="dotnetnuke/packages/package/components/component[@type='Assembly']/assemblies/assembly[version='REPLACED BY NANT']/version" failonerror="false" />
   </target>
   <target name="zip-package" description="Zips up the files in the temp/package directory, getting the correct manifest file and using the correct naming convention">
     <property name="package.type" value="Install"/>

diff --git a/EngageTellAFriend.csproj b/EngageTellAFriend.csproj
@@ -164,6 +164,8 @@
   </ItemGroup>
   <ItemGroup>
     <CodeAnalysisDictionary Include="CustomDictionary.xml" />
+    <Content Include="images\tellafriend-icon32.png" />
+    <Content Include="ReleaseNotes_1.3.0.htm" />
     <Content Include="References\DotNetNuke.Web.dll" />
     <Content Include="ReleaseNotes_1.2.1.htm" />
     <Content Include="ReleaseNotes_1.2.0.htm" />

diff --git a/Licenses/EULA-Free.htm b/Licenses/EULA-Free.htm
@@ -1,19 +1,21 @@
-    <p>Copyright © 2011 Engage Software</p>
+<div class="Normal">
+    <p>Copyright &copy; 2013 Engage Software</p>
     <p>
-        Permission is hereby granted, free of charge, to any person obtaining a copy<br />
-        of this software and associated documentation files (the &quot;Software&quot;), to deal<br />
-        in the Software without restriction, including without limitation the rights<br />
-        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell<br />
-        copies of the Software, and to permit persons to whom the Software is<br />
+        Permission is hereby granted, free of charge, to any person obtaining a copy
+        of this software and associated documentation files (the &quot;Software&quot;), to deal
+        in the Software without restriction, including without limitation the rights
+        to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+        copies of the Software, and to permit persons to whom the Software is
         furnished to do so, subject to the following conditions:</p>
     <p>
-        The above copyright notice and this permission notice shall be included in<br />
+        The above copyright notice and this permission notice shall be included in
         all copies or substantial portions of the Software.</p>
     <p>
-        THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR<br />
-        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,<br />
-        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE<br />
-        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER<br />
-        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,<br />
-        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN<br />
-        THE SOFTWARE.</p>
+        THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+        IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+        FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+        AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+        LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+        OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+        THE SOFTWARE.</p>
+</div>
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -19,12 +19,12 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("2011 Engage Software")]
+[assembly: AssemblyCopyright("2013 Engage Software")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(true)]
-[assembly: AssemblyVersion("01.02.01.*")]
+[assembly: AssemblyVersion("01.03.00.*")]
 [assembly: AssemblyDelaySign(false)]
 [assembly: AssemblyKeyFile("")]
 [assembly: AssemblyKeyName("")]

diff --git a/ReleaseNotes_1.3.0.htm b/ReleaseNotes_1.3.0.htm
@@ -0,0 +1,8 @@
+<h2>Change Log</h2>
+<ul>
+    <li>Added <abbr title="Completely Automated Public Turing test to tell Computers and Humans Apart">CAPTCHA</abbr> protection.  By default, there are two invisible protections, while the standard CAPTCHA can be turned on via the settings.</li>
+</ul>
+<h2>Known Issues</h2>
+<ul>
+    <li>Close button tooltip text on modal popup is not localizable</li>
+</ul>
diff --git a/images/tellafriend-icon32.png b/images/tellafriend-icon32.png