Skip to content

Commit e39493f

Browse files
WillStrohlWillStrohl
authored
Merge pull request #277 from DNNCommunity/dev
Sync'ing `dev` and `master`
2 parents fde903e + 2a5102a commit e39493f

File tree

93 files changed

+820
-690
lines changed

Some content is hidden

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

93 files changed

+820
-690
lines changed

‎.github/ISSUE_TEMPLATE/task.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
name: Development task
3+
about: Use for tracking a development or documentation task
4+
5+
---
6+
7+
## Description of task
8+
**Please describe.**
9+
A clear and concise description of the task. Ex. I need to update some code to update a DNN platform API change [...]
10+
11+
## What general area(s)/component(s) are affected?
12+
** check any / all **
13+
[] User interface
14+
[] Database schema
15+
[] Business Logic
16+
[] Dependencies
17+
[] Installation/manifest
18+
19+
20+
## Additional context
21+
Add any other context or screenshots about the task here.

‎.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,8 @@ You can erase any parts of this template not applicable to your Pull Request.
2020
## Please mark which issue is solved
2121
<!-- Type numbers directly after the #, it will show the issues with that number -->
2222

23-
Close #
23+
Close #
24+
## For epic issues, please mark which issue is related
25+
<!-- Type numbers directly after the #, it will show the issues with that number -->
26+
27+
Related to epic issue #

‎ActiveForumViewer.ascx.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ protected override void OnLoad(EventArgs e)
6666
System.Web.UI.HtmlControls.HtmlGenericControl oLink = new System.Web.UI.HtmlControls.HtmlGenericControl("link");
6767
oLink.Attributes["rel"] = "stylesheet";
6868
oLink.Attributes["type"] = "text/css";
69-
oLink.Attributes["href"] = Page.ResolveUrl("~/DesktopModules/ActiveForums/module.css");
69+
oLink.Attributes["href"] = Page.ResolveUrl(Globals.ModulePath + "module.css");
7070
System.Web.UI.Control oCSS = this.Page.FindControl("CSS");
7171
if (oCSS != null)
7272
{

‎ActiveForums.ascx.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,17 +78,17 @@ protected override void OnLoad(EventArgs e)
7878
// Users can only view thier own settings unless they are admin.
7979
if (userId == UserInfo.UserID || UserInfo.IsInRole(PortalSettings.AdministratorRoleName))
8080
{
81-
var userPrefsCtl = (SettingsBase)(LoadControl("~/desktopmodules/activeforums/controls/profile_mypreferences.ascx"));
81+
var userPrefsCtl = (SettingsBase)(LoadControl(Page.ResolveUrl(Globals.ModulePath + "controls/profile_mypreferences.ascx")));
8282
userPrefsCtl.ModuleConfiguration = ModuleConfiguration;
83-
userPrefsCtl.LocalResourceFile = "~/desktopmodules/activeforums/app_localresources/sharedresources.resx";
83+
userPrefsCtl.LocalResourceFile = Page.ResolveUrl(Globals.SharedResourceFile);
8484
plhAF.Controls.Add(userPrefsCtl);
8585
}
8686

8787
return;
8888
}
8989

9090
// Otherwise, just load the normal forum control
91-
var ctl = (ForumBase)(LoadControl("~/desktopmodules/activeforums/classic.ascx"));
91+
var ctl = (ForumBase)(LoadControl(Page.ResolveUrl(Globals.ModulePath + "classic.ascx")));
9292
ctl.ModuleConfiguration = ModuleConfiguration;
9393
plhAF.Controls.Add(ctl);
9494

‎ActiveForums.csproj

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<DebugSymbols>true</DebugSymbols>
4848
<Optimize>false</Optimize>
4949
<WarningLevel>1</WarningLevel>
50-
<WarningLevel>1</WarningLevel>
50+
<WarningLevel>3</WarningLevel>
5151
<DebugType>full</DebugType>
5252
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
5353
<UseVSHostingProcess>true</UseVSHostingProcess>
@@ -59,7 +59,7 @@
5959
<DefineConstants>TRACE;</DefineConstants>
6060
<DebugSymbols>false</DebugSymbols>
6161
<Optimize>true</Optimize>
62-
<WarningLevel>1</WarningLevel>
62+
<WarningLevel>4</WarningLevel>
6363
<DebugType>none</DebugType>
6464
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
6565
<Prefer32Bit>false</Prefer32Bit>
@@ -269,11 +269,15 @@
269269
<Content Include="handlers\adminhelper.ashx" />
270270
<Content Include="images\add-circle.png" />
271271
<Content Include="images\af-fileicon.png" />
272+
<Content Include="images\arrows_down.png" />
273+
<Content Include="images\arrows_left.png" />
272274
<Content Include="images\arrow_down.png" />
273275
<Content Include="images\arrow_up.png" />
274276
<Content Include="images\check32.png" />
275277
<Content Include="images\checkbox.png" />
276278
<Content Include="images\checkbox_unchecked.png" />
279+
<Content Include="images\close.png" />
280+
<Content Include="images\delete_new.gif" />
277281
<Content Include="images\execute16.png" />
278282
<Content Include="images\delete16.png" />
279283
<Content Include="images\info32.png" />
@@ -284,7 +288,10 @@
284288
<Content Include="images\modal_top_left.png" />
285289
<Content Include="images\modal_top_right.png" />
286290
<Content Include="images\progress.gif" />
291+
<Content Include="images\search.gif" />
287292
<Content Include="images\sort_16.png" />
293+
<Content Include="images\spinner-lg.gif" />
294+
<Content Include="images\spinner.gif" />
288295
<Content Include="images\testrun16.png" />
289296
<Content Include="images\roles_add.png" />
290297
<Content Include="images\save16.png" />
@@ -534,7 +541,9 @@
534541
<Content Include="controls\admin_filters.ascx" />
535542
<Content Include="controls\admin_home.ascx" />
536543
<Content Include="controls\admin_manageforums_home.ascx" />
537-
<Content Include="controls\admin_ranks.ascx" />
544+
<Content Include="controls\admin_ranks.ascx">
545+
<SubType>ASPXCodeBehind</SubType>
546+
</Content>
538547
<Content Include="controls\admin_tags.ascx">
539548
<SubType>ASPXCodeBehind</SubType>
540549
</Content>
@@ -644,7 +653,13 @@
644653
<None Include="sql\06.04.01.SqlDataProvider" />
645654
<None Include="sql\07.00.02.SqlDataProvider" />
646655
<None Include="sql\07.00.00.SqlDataProvider" />
656+
<None Include="sql\07.00.02.SqlDataProvider" />
647657
<None Include="sql\07.00.05.SqlDataProvider" />
658+
<None Include="sql\07.00.06.SqlDataProvider" />
659+
<None Include="sql\07.00.07.SqlDataProvider" />
660+
<None Include="sql\07.00.08.SqlDataProvider" />
661+
<None Include="sql\08.00.00.SqlDataProvider" />
662+
<None Include="sql\07.00.06.SqlDataProvider" />
648663
<None Include="sql\Enterprise.sql" />
649664
<Content Include="config\templates\ModAlert_text.txt" />
650665
<Content Include="config\templates\ModEmail_text.txt" />
@@ -1365,4 +1380,4 @@
13651380
<!--<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />-->
13661381
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
13671382
<Import Project="Module.Build" />
1368-
</Project>
1383+
</Project>

‎ActiveForums.dnn

Lines changed: 11 additions & 6 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="Active Forums" type="Module" version="07.00.05">
3+
<package name="Active Forums" type="Module" version="07.00.06">
44
<friendlyName>Active Forums</friendlyName>
55
<description>Community Forums: The official online forums module for the DNN Community.</description>
66
<iconFile>DesktopModules/ActiveForums/images/af6_icon.jpg</iconFile>
@@ -73,7 +73,7 @@
7373
<attributes>
7474
<businessControllerClass>DotNetNuke.Modules.ActiveForums.TopicsController, DotNetNuke.Modules.ActiveForums</businessControllerClass>
7575
<desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
76-
<upgradeVersionsList>06.04.00,06.04.01,06.05.00,06.05.01,06.06.00,07.00.00,07.00.01,07.00.02,07.00.03,07.00.04,07.00.05</upgradeVersionsList>
76+
<upgradeVersionsList>07.00.06</upgradeVersionsList>
7777
</attributes>
7878
</eventMessage>
7979
</component>
@@ -84,7 +84,7 @@
8484
<assembly>
8585
<name>DotNetNuke.Modules.ActiveForums.dll</name>
8686
<sourceFileName>bin\DotNetNuke.Modules.ActiveForums.dll</sourceFileName>
87-
<version>07.00.05</version>
87+
<version>07.00.06</version>
8888
</assembly>
8989
</assemblies>
9090
</component>
@@ -349,10 +349,15 @@
349349
<name>07.00.05.SqlDataProvider</name>
350350
<version>07.00.05</version>
351351
</script>
352+
<script type="UnInstall">
353+
<path>sql</path>
354+
<name>07.00.06.SqlDataProvider</name>
355+
<version>07.00.06</version>
356+
</script>
352357
<script type="UnInstall">
353358
<path>sql</path>
354359
<name>Uninstall.SqlDataProvider</name>
355-
<version>07.00.05</version>
360+
<version>07.00.06</version>
356361
</script>
357362
</scripts>
358363
</component>
@@ -388,7 +393,7 @@
388393
</components>
389394
</package>
390395

391-
<package name="Active Forums What's New" type="Module" version="07.00.05">
396+
<package name="Active Forums What's New" type="Module" version="07.00.06">
392397
<friendlyName>Active Forums What's New</friendlyName>
393398
<foldername>ActiveForumsWhatsNew</foldername>
394399
<description>Community Forums: Display the most recent topics or replies from selected forums on any page within your site.</description>
@@ -457,7 +462,7 @@
457462
</components>
458463
</package>
459464

460-
<package name="Active Forums Viewer" type="Module" version="07.00.05">
465+
<package name="Active Forums Viewer" type="Module" version="07.00.06">
461466
<friendlyName>Active Forums Viewer</friendlyName>
462467
<foldername>ActiveForumsViewer</foldername>
463468
<description>Community Forums: Display any forum topic view on any page within your site.</description>

‎ActiveForums_Symbols.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="Active Forums_Symbols" type="Library" version="07.00.05">
3+
<package name="Active Forums_Symbols" type="Library" version="07.00.06">
44
<friendlyName>Active Forums Symbols</friendlyName>
55
<description>Community Forums: The official online forums module for the DNN Community.</description>
66
<iconFile>DesktopModules/ActiveForums/images/af6_icon.jpg</iconFile>
@@ -14,7 +14,7 @@
1414
<releaseNotes src="ReleaseNotes.txt" />
1515
<azureCompatible>True</azureCompatible>
1616
<dependencies>
17-
<dependency type="managedPackage" version="7.0.5">Active Forums</dependency>
17+
<dependency type="managedPackage" version="7.0.6">Active Forums</dependency>
1818
</dependencies>
1919
<components>
2020
<component type="ResourceFile">

‎App_LocalResources/SharedResources.resx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1648,10 +1648,10 @@ From,
16481648
<data name="[RESX:SubscribedTopicForumName].Text" xml:space="preserve">
16491649
<value>Subscribed Topic {0} on Forum {1}</value>
16501650
</data>
1651-
<data name="[RESX:postedIn.Text]" xml:space="preserve">
1652-
<value>posted in</value>
1651+
<data name="[RESX:PostedTo].Text" xml:space="preserve">
1652+
<value>posted to</value>
16531653
</data>
1654-
<data name="[RESX:repliedto.Text]" xml:space="preserve">
1654+
<data name="[RESX:RepliedTo].Text" xml:space="preserve">
16551655
<value>replied to</value>
16561656
</data>
1657-
</root>
1657+
</root>

0 commit comments

Comments
 (0)