Skip to content

Commit

Permalink
Merge pull request #214 from EPTamminga/Issue_213
Browse files Browse the repository at this point in the history
Release things
  • Loading branch information
EPTamminga authored Feb 16, 2020
2 parents d9ea07a + 28b7f60 commit 1175f83
Show file tree
Hide file tree
Showing 6 changed files with 79 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:

[assembly: AssemblyVersion("7.0.5.0")]
[assembly: AssemblyFileVersion("7.0.5.0")]
[assembly: AssemblyVersion("7.0.6.0")]
[assembly: AssemblyFileVersion("7.0.6.0")]
20 changes: 5 additions & 15 deletions EventDetails.ascx
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@
<div class="SubHead DetailReminderLeft">
<div id="rem1" runat="server" visible="false">
<asp:Image ID="imgNotify" runat="server" ImageUrl="Images/bell.gif"/>&nbsp;
<asp:LinkButton ID="cmdNotify" CssClass="CommandButton" runat="server" BorderStyle="none"
resourcekey="cmdNotify" ValidationGroup="EventEmail" OnClick="cmdNotify_Click">
Notify Me for this Event @
</asp:LinkButton><br/>
<asp:LinkButton ID="cmdNotify" CssClass="CommandButton" runat="server" BorderStyle="none" resourcekey="cmdNotify" ValidationGroup="EventEmail" OnClick="cmdNotify_Click">Notify Me for this Event @</asp:LinkButton><br/>
<asp:CheckBox ID="chkReminderRec" resourcekey="chkReminderRec" Visible="false" runat="server" CssClass="SubHead" Text=""></asp:CheckBox><br/>
</div>
</div>
Expand All @@ -26,8 +23,7 @@
ControlToValidate="txtUserEmail" Display="Dynamic">
</asp:RequiredFieldValidator><br/>
<asp:TextBox ID="txtReminderTime" CssClass="NormalTextBox" runat="server" MaxLength="3" Width="30" Font-Size="8pt">8</asp:TextBox>
<asp:DropDownList
ID="ddlReminderTimeMeasurement" runat="server" Width="90" Font-Size="8pt" CssClass="NormalTextBox">
<asp:DropDownList ID="ddlReminderTimeMeasurement" runat="server" Width="90" Font-Size="8pt" CssClass="NormalTextBox">
<asp:ListItem Value="m" resourcekey="Minutes">Minutes</asp:ListItem>
<asp:ListItem Value="h" resourcekey="Hours" Selected="True">Hours</asp:ListItem>
<asp:ListItem Value="d" resourcekey="Days">Days</asp:ListItem>
Expand All @@ -48,8 +44,7 @@
<div id="divIcalendar" Runat="server" class="DetailClear DetailiCalDiv">
<div class="SubHead DetailiCalLeft">
<asp:Image ID="imgEmail" runat="server" IconKey="Email"/>&nbsp;
<asp:LinkButton ID="cmdEmail" CssClass="CommandButton" runat="server" BorderStyle="none"
resourcekey="cmdEmail" ValidationGroup="EventEmailiCal" OnClick="cmdEmail_Click">
<asp:LinkButton ID="cmdEmail" CssClass="CommandButton" runat="server" BorderStyle="none" resourcekey="cmdEmail" ValidationGroup="EventEmailiCal" OnClick="cmdEmail_Click">
</asp:LinkButton>
</div>
<div class="SubHead DetailiCalRight">
Expand All @@ -70,9 +65,7 @@
<div id="enroll1" runat="server" visible="false">
<asp:Image ID="imgEnroll" runat="server" ImageUrl="Images/enroll.gif"/>&nbsp;
<asp:LinkButton ID="cmdSignup" CssClass="CommandButton" runat="server" BorderStyle="none"
ValidationGroup="EventSignup" OnClick="cmdSignup_Click">
Enroll for this Event?
</asp:LinkButton>
ValidationGroup="EventSignup" OnClick="cmdSignup_Click">Enroll for this Event?</asp:LinkButton>
</div>
<div id="enroll4" runat="server" visible="false">
<asp:Image ID="imgEnrollTooLate" runat="server" ImageUrl="Images/EnrollFull.gif"/>&nbsp;
Expand All @@ -82,10 +75,7 @@
<div class="SubHead DetailEnrollRight">
<div id="enroll3" runat="server" visible="false">
<asp:Label ID="lblNoEnrolee" runat="server" resourcekey="lblNoEnrolee" class="DetailEnrollLabel" Width="100px">No. of Enrolees</asp:Label>&nbsp;
<asp:TextBox ID="txtNoEnrolees" runat="server" CssClass="NormalTextBox"
Font-Size="8pt" MaxLength="3" Width="30">
1
</asp:TextBox>&nbsp;
<asp:TextBox ID="txtNoEnrolees" runat="server" CssClass="NormalTextBox" Font-Size="8pt" MaxLength="3" Width="30">1</asp:TextBox>&nbsp;
<asp:Label ID="lblMaxNoEnrolees" runat="server">(Max 1)</asp:Label>&nbsp;
<asp:RangeValidator ID="valNoEnrolees" runat="server"
ControlToValidate="txtNoEnrolees" MinimumValue="1" MaximumValue="1" Display="Dynamic" Type="Integer" cssclass="dnnFormMessage dnnFormError"
Expand Down
8 changes: 8 additions & 0 deletions Installation/CleanUp/Cleanup.07.00.06.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
'Remove old versions of events
Install\Module\Events_07.00.05_Install.zip

'Remove artifacts from previous incorrect install versions

'Tidy up debug files if any
Bin\DotNetNuke.Modules.Events.pdb
Bin\DotNetNuke.Modules.Events.ScheduleControl.pdb
5 changes: 3 additions & 2 deletions Installation/DNN_Events.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DNN_Events" type="Module" version="7.0.5">
<package name="DNN_Events" type="Module" version="7.0.6">
<friendlyName>Events</friendlyName>
<description>This module renders single and recurring events and includes Master and Sub Calendars with Event Rollup, TimeZone Adjustment, Event Enrollment, and Event Notification.</description>
<iconFile>DesktopModules\Events\DNN_Events.png</iconFile>
Expand All @@ -11,7 +11,7 @@
<email>support@dnnsoftware.com</email>
</owner>
<license src="License.txt"></license>
<releaseNotes src="Release.07.00.05.txt"></releaseNotes>
<releaseNotes src="Release.07.00.06.txt"></releaseNotes>
<azureCompatible>true</azureCompatible>
<dependencies>
<dependency type="CoreVersion">8.0.0</dependency>
Expand Down Expand Up @@ -429,6 +429,7 @@
<component type="Cleanup" version="07.00.03" fileName="Installation\CleanUp\Cleanup.07.00.03.txt" />
<component type="Cleanup" version="07.00.04" fileName="Installation\CleanUp\Cleanup.07.00.04.txt" />
<component type="Cleanup" version="07.00.05" fileName="Installation\CleanUp\Cleanup.07.00.05.txt" />
<component type="Cleanup" version="07.00.06" fileName="Installation\CleanUp\Cleanup.07.00.06.txt" />
<component type="Config">
<config>
<configFile>web.config</configFile>
Expand Down
59 changes: 59 additions & 0 deletions Installation/ReleaseNotes/Release.07.00.06.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<h2>Release notes DNN_Events 07.00.06</h2>
<p>DNN_Events 07.00.06 will work for any DNN version <strong>8.0.1</strong> and up to the latest release of DNNPlatform. Full details on the changes can be found in great detail at <a href="https://github.com/DNNCommunity/DNN.Events/releases" target="_blank">the repository on GitHub</a>.</p>
<p>This is a bug fix release of the DNN_Events module.</p>
<h3>BUG FIXES</h3>
<ul>
<li>Display detail Enrollment box looked empty</li>
</ul>

<hr />
<p>Below updates since the last main release 07.00.00</p>
<h2>DNN_Events 07.00.05</h2>
<h3>BUG FIXES</h3>
<ul>
<li>Several casting errors due to the VB.net/C# conversion fixed</li>
<li>Select date fixed</li>
<li>Auto height in Location & Category table</li>
</ul>

<h2>DNN_Events 07.00.04</h2>
<h3>BUG FIXES</h3>
<ul>
<li>Several casting errors due to the VB.net/C# conversion fixed</li>
<li>Several none functioning buttons and links fixed that were due to the VB.net/C# conversion</li>
<li>Some V6 settings were not carried forward to the new version due to case mismatch in the name of the setting</li>
<li>Select date fixed</li>
<li>Editing event enrolments fixed</li>
<li>Selecting users for enrolment fixed</li>
<li>Approval of enrolments fixed</li>
</ul>
<h3>Other</h3>
<ul>
<li>Code cleanup done</li>
</ul>

<h2>DNN_Events 07.00.03</h2>
<h3>BUG FIXES</h3>
<ul>
<li>Several casting errors due to the VB.net/C# conversion fixed</li>
<li>Several none functioning buttons and links fixed that were due to the VB.net/C# conversion</li>
<li>Some V6 settings were not carried forward to the new version due to case mismatch in the name of the setting</li>
<li>Templates save/update did not work</li>
</ul>

<h2>DNN_Events 07.00.02</h2>
<h3>BUG FIXES</h3>
<ul>
<li>Casting errors due to the VB.net/C# conversion fixed</li>
<li>Fixed an issue where it was impossible to create an event if the edit interval was set to 1440</li>
<li>Fixed an issue where it was impossible to view events after changing months when categories where enabled but none selected</li>
<li>Fixed an issue where it was impossible to view events after changing months when locations where enabled but none selected</li>
<li>Fixed an issue where it was impossible to exit list view mode</li>
</ul>

<h2>DNN_Events 07.00.01</h2>
<h3>BUG FIXES</h3>
<ul>
<li>Casting errors due to the VB.net/C# conversion fixed</li>
<li>URL of image file not saving, solved</li>
</ul>
4 changes: 2 additions & 2 deletions Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:

[assembly: AssemblyVersion("7.0.5.0")]
[assembly: AssemblyFileVersion("7.0.5.0")]
[assembly: AssemblyVersion("7.0.6.0")]
[assembly: AssemblyFileVersion("7.0.6.0")]

0 comments on commit 1175f83

Please sign in to comment.