Skip to content

Commit 9678afc

Browse files
authored
Merge pull request #83 from valadas/dnn940
Bumped DNN dependency to 9.4.0
2 parents 9242561 + 29dfe34 commit 9678afc

File tree

8 files changed

+24
-190
lines changed

8 files changed

+24
-190
lines changed

AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
[assembly: ComVisible(false)]
1010

1111

12-
[assembly: AssemblyVersion("06.05.04.00")]
12+
[assembly: AssemblyVersion("06.05.05.00")]
1313
[assembly: CLSCompliant(true)]
14-
[assembly: AssemblyFileVersion("06.05.04.00")]
14+
[assembly: AssemblyFileVersion("06.05.05.00")]
1515

Components/UserDefinedTableController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ public DataTable Context(ModuleInfo moduleInfo, UserInfo userInfo, string search
353353
row["LocalizedString_Previous"] = Localization.GetString("PagingPrevious.Text", Definition.SharedRessources);
354354
row["LocalizedString_Next"] = Localization.GetString("PagingNext.Text", Definition.SharedRessources);
355355
row["LocalizedString_Last"] = Localization.GetString("PagingLast.Text", Definition.SharedRessources);
356-
var d = DateUtils.GetDatabaseTime();
356+
var d = DateUtils.GetDatabaseUtcTime();
357357
var timeZone = userInfo.Username != null
358358
? userInfo.Profile.PreferredTimeZone
359359
: portalSettings.TimeZone;

DataTypes/ChangedAt.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class EditChangedAt : EditCreatedAt
1414
{
1515
public override string Value
1616
{
17-
get { return Common.Utilities.DateUtils.GetDatabaseTime().ToString("s"); }
17+
get { return Common.Utilities.DateUtils.GetDatabaseUtcTime().ToString("s"); }
1818

1919
set { base.Value = value; }
2020
}

DataTypes/CreatedAt.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public override string Value
2727
{
2828
if (ViewState[TimeStamp] == null)
2929
{
30-
return Common.Utilities.DateUtils.GetDatabaseTime().ToString("s");
30+
return Common.Utilities.DateUtils.GetDatabaseUtcTime().ToString("s");
3131
}
3232
return DateTime.Parse((string)ViewState[TimeStamp]).ToString("s");
3333
}

FormAndList.csproj

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<OutputType>Library</OutputType>
1919
<RootNamespace>DotNetNuke.Modules.UserDefinedTable</RootNamespace>
2020
<AssemblyName>DotNetNuke.Modules.UserDefinedTable</AssemblyName>
21-
<TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
21+
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
2222
<OptionExplicit>On</OptionExplicit>
2323
<OptionCompare>Binary</OptionCompare>
2424
<OptionStrict>On</OptionStrict>
@@ -61,31 +61,25 @@
6161
<Prefer32Bit>false</Prefer32Bit>
6262
</PropertyGroup>
6363
<ItemGroup>
64-
<Reference Include="DotNetNuke, Version=8.0.4.226, Culture=neutral, processorArchitecture=MSIL">
65-
<HintPath>packages\DotNetNuke.Core.8.0.4.226\lib\net40\DotNetNuke.dll</HintPath>
66-
<Private>False</Private>
64+
<Reference Include="DotNetNuke, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
65+
<HintPath>packages\DotNetNuke.Core.9.4.0\lib\net45\DotNetNuke.dll</HintPath>
6766
</Reference>
68-
<Reference Include="DotNetNuke.Web, Version=8.0.4.226, Culture=neutral, processorArchitecture=MSIL">
69-
<HintPath>packages\DotNetNuke.Web.8.0.4.226\lib\net40\DotNetNuke.Web.dll</HintPath>
70-
<Private>False</Private>
67+
<Reference Include="DotNetNuke.Web, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
68+
<HintPath>packages\DotNetNuke.Web.9.4.0\lib\net45\DotNetNuke.Web.dll</HintPath>
7169
</Reference>
72-
<Reference Include="DotNetNuke.Web.Client, Version=8.0.4.226, Culture=neutral, processorArchitecture=MSIL">
73-
<HintPath>packages\DotNetNuke.Web.Client.8.0.4.226\lib\net40\DotNetNuke.Web.Client.dll</HintPath>
74-
<Private>False</Private>
70+
<Reference Include="DotNetNuke.Web.Client, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
71+
<HintPath>packages\DotNetNuke.Web.Client.9.4.0\lib\net45\DotNetNuke.Web.Client.dll</HintPath>
7572
</Reference>
7673
<Reference Include="DotNetNuke.WebUtility, Version=4.2.1.783, Culture=neutral, processorArchitecture=MSIL">
77-
<HintPath>packages\DotNetNuke.Web.8.0.4.226\lib\net40\DotNetNuke.WebUtility.dll</HintPath>
78-
<Private>False</Private>
74+
<HintPath>packages\DotNetNuke.Web.9.4.0\lib\net45\DotNetNuke.WebUtility.dll</HintPath>
7975
</Reference>
8076
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
81-
<HintPath>packages\DotNetNuke.Core.8.0.4.226\lib\net40\Microsoft.ApplicationBlocks.Data.dll</HintPath>
82-
<Private>False</Private>
77+
<HintPath>packages\DotNetNuke.Core.9.4.0\lib\net45\Microsoft.ApplicationBlocks.Data.dll</HintPath>
8378
</Reference>
8479
<Reference Include="Microsoft.VisualBasic" />
8580
<Reference Include="mscorlib" />
86-
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
87-
<HintPath>packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
88-
<Private>False</Private>
81+
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
82+
<HintPath>packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
8983
</Reference>
9084
<Reference Include="System" />
9185
<Reference Include="System.Data" />

FormAndList.dnn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
3-
<package name="DNN_UserDefinedTable" type="Module" version="06.05.04">
3+
<package name="DNN_UserDefinedTable" type="Module" version="06.05.05">
44
<friendlyName>Form and List</friendlyName>
55
<description>Create a simple form or a view of repetitive and simple data.</description>
66
<iconFile>desktopmodules/userdefinedtable/icon_fnl_32px.gif</iconFile>
@@ -13,7 +13,7 @@
1313
<license src="License.htm"/>
1414
<releaseNotes src="ReleaseNotes.htm" />
1515
<dependencies>
16-
<dependency type="CoreVersion">08.00.04</dependency>
16+
<dependency type="CoreVersion">09.04.00</dependency>
1717
</dependencies>
1818
<azureCompatible>true</azureCompatible>
1919
<components>

packages.config

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="DotNetNuke.Core" version="8.0.4.226" targetFramework="net451" developmentDependency="true" />
4-
<package id="DotNetNuke.Web" version="8.0.4.226" targetFramework="net451" developmentDependency="true" />
5-
<package id="DotNetNuke.Web.Client" version="8.0.4.226" targetFramework="net451" developmentDependency="true"/>
3+
<package id="DotNetNuke.Core" version="9.4.0" targetFramework="net451" developmentDependency="true" />
4+
<package id="DotNetNuke.Web" version="9.4.0" targetFramework="net451" developmentDependency="true" />
5+
<package id="DotNetNuke.Web.Client" version="9.4.0" targetFramework="net451" developmentDependency="true" />
66
<package id="MSBuildTasks" version="1.5.0.235" targetFramework="net451" developmentDependency="true" />
7-
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" developmentDependency="true" />
8-
</packages>
7+
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net451" developmentDependency="true" />
8+
</packages>

releasenotes.htm

Lines changed: 1 addition & 161 deletions
Original file line numberDiff line numberDiff line change
@@ -1,163 +1,3 @@
11
<h3>Release Notes</h3>
22

3-
<h2>DNN Form and List 06.05.04</h2>
4-
<p>Changes</p>
5-
<ul>
6-
<li>Fix: Track number of clicks for Url and Download</li>
7-
</ul>
8-
9-
<h2>DNN Form and List 06.05.03</h2>
10-
<p>Changes</p>
11-
<ul>
12-
<li>Fix: required for Data types "Date" and "Time"</li>
13-
<li>Fix: List of values editor working again</li>
14-
</ul>
15-
16-
<h2>DNN Form and List 06.05.02</h2>
17-
<p>Changes</p>
18-
<ul>
19-
<li>Fixed typo; Weekdays are now displayed correctly in DatePicker</li>
20-
</ul>
21-
22-
<h2>DNN Form and List 06.05.01</h2>
23-
<p>Changes</p>
24-
<ul>
25-
<li>Fixed Nuget packagesto compile against DNN 8.0.4, removed unneeded dependencies</li>
26-
<li>Uses again DateUtils.GetDatabaseTime, even if it gets deprecated in DNN9 as DateUtils.GetDatabaseUtcTime is not yet available</li>
27-
<li>Html decodes default values to support Umlauts and other special characters in edit forms.</li>
28-
<li>Weekdays are now displayed correctly in DatePicker</li>
29-
</ul>
30-
31-
32-
<h2>DNN Form and List 06.05.00</h2>
33-
<p>Changes</p>
34-
<ul>
35-
<li>Build process updated to use Nuget packages, module can now be built on vanilla Visual Studio setup even without Dnn present.</li>
36-
<li>Fixes and issue with the Dnn captcha not showing, adds support (optionnaly) to replace Dnn Captcha by Google ReCatcha.(Issues 21)</li>
37-
<li>Fixed an issue where it was impossible to apply a template created by one module into another module (Issue 26)</li>
38-
<li>Prevents creating fields with a pipe ( | ) in the title, which made the module break (Issue 9)</li>
39-
<li>Fixed an issue where the search would not work after clicking on Show Records and clicking Reset Search would redirect the user to the form instead of staying in the list mode (Issue 14)</li>
40-
</ul>
41-
42-
<h2>DNN Form and List 06.04.00</h2>
43-
<p>Changes</p>
44-
<ul>
45-
<li>Indexing now based on ModuleSearchBase instead of ISearchable</li>
46-
<li>Replaced all calls to deprecated methods to DNN with alternatives</li>
47-
<li>Removed all dependencies to Telerik</li>
48-
<li>Simple Search can now be styled with css and has by default a bigger margin on the buttom </li>
49-
</ul>
50-
51-
<h2>DNN Form and List 06.03.03</h2>
52-
<p>Changes</p>
53-
<ul>
54-
<li>fixing Integer type with spaces on edit row mode</li>
55-
</ul>
56-
<h2>DNN Form and List 06.03.02</h2>
57-
<p>Changes</p>
58-
<ul>
59-
<li>Separators are rendered as fieldsets within form generator </li>
60-
<li>Fixed: Custom form did not work with field names containing whitespace</li>
61-
62-
</ul>
63-
<h2>DNN Form and List 06.03.01</h2>
64-
<p>Changes to 6.3.1</p>
65-
<ul>
66-
<li>Fixed: Custom form did not work with non AlphaNumeric field names </li>
67-
<li>Source: Referenced DNN assemblies are included, allowing development under newest version while targeting older version.</li>
68-
</ul>
69-
<h2>DNN Form and List 06.03.00</h2>
70-
<p>Changes to 6.3.0</p>
71-
<ul>
72-
<li>New Feature: Custom forms </li>
73-
<li>New feature: Syntax highlighting for templates (XSL and Form)</li>
74-
<li>Fixed: Loads Jquery (prevents error "dnnpanel is not a function")</li>
75-
<li>Fixed: Calculated Columns (typo in DataTypes.Config)</li>
76-
</ul>
77-
<h2>DotNetNuke Form and List 06.02.00</h2>
78-
<p>Changes to 6.2.0</p>
79-
<ul>
80-
<li>Upgraded to depend on .NET framework 4.5.1 to be able to reference DNN 8.0.0</li>
81-
<li>Removed warnings signaled by the Extension Verification System</li>
82-
</ul>
83-
<h2>DotNetNuke Form and List 06.01.00</h2>
84-
<p>Changes to 6.1.0</p>
85-
<ul>
86-
<li>Fix for DNN 7.2.2.</li>
87-
<li>
88-
Allowed for custom datatypes.config (to be placed in Portals/_default/UserDefinedTable).
89-
<p>datatypes.config in the DesktopModules/UserDefinedTable will remain to be overwritten on installation of a new version. However, if you copy it to the folder mentioned above, your customizations will not be overwritten on installation anymore.</p>
90-
</li>
91-
</ul>
92-
<p>Changes to 6.0.7</p>
93-
<ul>
94-
<li>Corrected an error in datatypes.config.</li>
95-
</ul>
96-
<p>Changes to 6.0.6</p>
97-
<ul>
98-
<li>Add in Sql to remove 'text on row' setting for UserDefinedTable to make SQL Azure compatible.</li>
99-
<li>Add new azureCompatible element to manifest.</li>
100-
<li>Added a fix for importing templates.</li>
101-
</ul>
102-
<p>Changes to 6.0.2</p>
103-
<ul>
104-
<li>Fix: MakeThumbnail was broken if the application pool was configured to .Net 4</li>
105-
<li>Change: Data is now stored in nvarchar(max) instead of ntext</li>
106-
</ul>
107-
<p>Changes to 6.0.1</p>
108-
<ul>
109-
<li>Scripts now compatible with SQL Azure.</li>
110-
</ul>
111-
<p>Changes to 6.0.0</p>
112-
<ul>
113-
<li>Icons are shown in module action buttons (workaraound to core issue eith IconAPI)</li>
114-
<li>Fix to Token2XSL Editor, changing List type raised exception</li>
115-
<li>MakeTumbnail and ShowXml handlers had been missing in install package</li>
116-
<li>Updated help texts for better understanding of filter statement, token support in email subject and css style</li>
117-
</ul>
118-
<p>
119-
Major changes (for 6.0.x):
120-
</p>
121-
<ul>
122-
<li>DNN 6 Form Patterns including modal PopUps and Tabs</li>
123-
<li>DST Support for following data types: Time, DateTime, CreatedAt, ChangedAt</li>
124-
<li>
125-
New FileManager API for XSLT scripts and following data types: Url, Download,
126-
Image
127-
</li>
128-
<li>Usage of Telerik Controls</li>
129-
<li>
130-
Some JQuery candy: changing of field order with drag&#39;n&#39;drop, new editor for
131-
multiple field values
132-
</li>
133-
<li>
134-
New field settings (similar to module settings)&nbsp; facilitates more special
135-
settings by type.
136-
</li>
137-
<li>Form is now WAI compliant</li>
138-
<li>Multi value option for data type &#39;Text&#39;</li>
139-
<li>Support of Icon API</li>
140-
<li>
141-
Moved module wide data type settings (e.g. thumbnail height/width) directly to
142-
data type
143-
</li>
144-
<li>
145-
Rendering methods are now reduced to DataGrid and XSLT. The option for predefined XSLT scripts was removed.
146-
The old scripts are no longer delivered with the module. If an existing instance still uses an old script,
147-
the script will be copied into the portal (folder XslStylesheet/UDT Legacy).
148-
</li>
149-
<li>
150-
Removed few settings/ features in exchange of a better UI and a lighter code
151-
base.
152-
</li>
153-
<li>It is now converted to C#</li>
154-
<li>
155-
<strong>Important for updates</strong><br />
156-
The switch to Form Pattern has an effect on how the form is rendered. CSS tweaks for the old form will certainly fail.
157-
Please <strong>test</strong> the new UI before upgrading.
158-
</li>
159-
</ul>
160-
<p>
161-
This release is compiled against the .Net 3.5 Framework using VS2010.<br />
162-
Minimum DotNetNuke core version is 6.1.0
163-
</p>
3+
<p>Release notes are available at <a href="https://github.com/DNNCommunity/DNN.FormAndList/releases">https://github.com/DNNCommunity/DNN.FormAndList/releases</a></p>

0 commit comments

Comments
 (0)