Skip to content

Commit

Permalink
Merge pull request #62 from EPTamminga/Issue_55
Browse files Browse the repository at this point in the history
Updates for Reports 06.02.00
  • Loading branch information
EPTamminga authored Feb 5, 2020
2 parents 2051c5f + faf606a commit 201a9f9
Show file tree
Hide file tree
Showing 8 changed files with 266 additions and 270 deletions.
27 changes: 4 additions & 23 deletions Installation/DNN_Reports.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_Reports" type="Module" version="6.1.0">
<package name="DNN_Reports" type="Module" version="6.2.0">
<friendlyName>Reports</friendlyName>
<description>The ReportsModule allows users to quickly display data retrieved from many data sources. An extensible architecture allows the use of custom Data Sources and Visualization systems to display data from any tabular data source, in many ways.</description>
<iconFile>DesktopModules\Reports\DNN_Reports.png</iconFile>
Expand All @@ -11,11 +11,9 @@
<email>support@dnnsoftware.com</email>
</owner>
<license src="License.txt"></license>
<releaseNotes src="Release.06.01.00.txt"></releaseNotes>
<releaseNotes src="Release.06.02.00.txt"></releaseNotes>
<azureCompatible>true</azureCompatible>
<dependencies>
<dependency type="CoreVersion">8.0.1</dependency>
</dependencies>
<dependencies></dependencies>
<components>
<component type="Script">
<scripts>
Expand Down Expand Up @@ -71,24 +69,6 @@
<controlType>Edit</controlType>
<helpUrl></helpUrl>
</moduleControl>
<moduleControl>
<controlKey>Settings</controlKey>
<controlSrc>DesktopModules/Reports/Settings.ascx</controlSrc>
<supportsPartialRendering>false</supportsPartialRendering>
<supportsPopUps>false</supportsPopUps>
<controlTitle>Reports Settings</controlTitle>
<controlType>Edit</controlType>
<helpUrl></helpUrl>
</moduleControl>
<moduleControl>
<controlKey></controlKey>
<controlSrc>DesktopModules/Reports/ViewReports.ascx</controlSrc>
<supportsPartialRendering>false</supportsPartialRendering>
<supportsPopUps>false</supportsPopUps>
<controlTitle></controlTitle>
<controlType>View</controlType>
<helpUrl></helpUrl>
</moduleControl>
</moduleControls>
<permissions></permissions>
</moduleDefinition>
Expand Down Expand Up @@ -117,6 +97,7 @@
<component type="Cleanup" version="05.07.01" fileName="Installation\CleanUp\Cleanup.05.07.01.txt" />
<component type="Cleanup" version="06.00.00" fileName="Installation\CleanUp\Cleanup.06.00.00.txt" />
<component type="Cleanup" version="06.01.00" fileName="Installation\CleanUp\Cleanup.06.01.00.txt" />
<component type="Cleanup" version="06.01.01" fileName="Installation\CleanUp\Cleanup.06.01.01.txt" />
</components>
</package>
</packages>
Expand Down
Binary file removed Installation/DNN_Reports_06.01.00_Install.zip
Binary file not shown.
Binary file added Installation/DNN_Reports_06.02.00_Install.zip
Binary file not shown.
13 changes: 13 additions & 0 deletions Installation/ReleaseNotes/Release.06.02.00.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<h2>Release notes DNN Reports 06.02.00</h2>
<p>DNN Reports 06.02.00 will work for any DNN version <strong>8.0.1</strong> and up.
Full details on the changes can be found in great detail at <a href="https://github.com/DNNCommunity/DNN.Reports/releases">https://github.com/DNNCommunity/DNN.Reports/releases</a>. </p>
<h3>ENHANCEMENTS</h3>
<ul>
<li>Added an option for Export to Excel</li>
<li>Added an option for DNN Token replacement</li>
</ul>
<h3>CHANGES</h3>
<ul>
<li>Removed the js stripping from the HTML visualizer</li>
<li>Code cleanup on several code files</li>
</ul>
4 changes: 2 additions & 2 deletions Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@
// by using the '*' as shown below:
// <Assembly: AssemblyVersion("1.0.*")>

[assembly: AssemblyVersion("6.1.0.0")]
[assembly: AssemblyFileVersion("6.1.0.0")]
[assembly: AssemblyVersion("6.2.0.0")]
[assembly: AssemblyFileVersion("6.2.0.0")]
[assembly: WebResource("dnn.reports.js", "text/javascript")]
[assembly: WebResource("CssForm.css", "test/css")]
[assembly: WebResource("CssForm.debug.css", "text/css")]
343 changes: 172 additions & 171 deletions Settings.ascx.cs

Large diffs are not rendered by default.

Loading

0 comments on commit 201a9f9

Please sign in to comment.