Merge pull request #277 from DNNCommunity/dev

Sync'ing `dev` and `master`
DNNCommunity · Apr 13, 2023 · e39493f · e39493f
2 parents fde903e + 2a5102a
commit e39493f
Show file tree

Hide file tree

Showing 93 changed files with 820 additions and 690 deletions.
diff --git a/.github/ISSUE_TEMPLATE/task.md b/.github/ISSUE_TEMPLATE/task.md
@@ -0,0 +1,21 @@
+---
+name: Development task
+about: Use for tracking a development or documentation task
+
+---
+
+## Description of task
+**Please describe.**
+A clear and concise description of the task. Ex. I need to update some code to update a DNN platform API change [...]
+
+## What general area(s)/component(s) are affected?
+** check any / all **
+[] User interface
+[] Database schema
+[] Business Logic
+[] Dependencies
+[] Installation/manifest
+
+
+## Additional context
+Add any other context or screenshots about the task here.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -20,4 +20,8 @@ You can erase any parts of this template not applicable to your Pull Request.
 ## Please mark which issue is solved
 <!-- Type numbers directly after the #, it will show the issues with that number -->
 
-Close #
+Close #
+## For epic issues, please mark which issue is related
+<!-- Type numbers directly after the #, it will show the issues with that number -->
+
+Related to epic issue #
diff --git a/ActiveForumViewer.ascx.cs b/ActiveForumViewer.ascx.cs
@@ -66,7 +66,7 @@ protected override void OnLoad(EventArgs e)
                     System.Web.UI.HtmlControls.HtmlGenericControl oLink = new System.Web.UI.HtmlControls.HtmlGenericControl("link");
                     oLink.Attributes["rel"] = "stylesheet";
                     oLink.Attributes["type"] = "text/css";
-                    oLink.Attributes["href"] = Page.ResolveUrl("~/DesktopModules/ActiveForums/module.css");
+                    oLink.Attributes["href"] = Page.ResolveUrl(Globals.ModulePath + "module.css");
                     System.Web.UI.Control oCSS = this.Page.FindControl("CSS");
                     if (oCSS != null)
                     {

diff --git a/ActiveForums.ascx.cs b/ActiveForums.ascx.cs
@@ -78,17 +78,17 @@ protected override void  OnLoad(EventArgs e)
                 // Users can only view thier own settings unless they are admin.
                 if (userId == UserInfo.UserID || UserInfo.IsInRole(PortalSettings.AdministratorRoleName))
                 {
-                    var userPrefsCtl = (SettingsBase)(LoadControl("~/desktopmodules/activeforums/controls/profile_mypreferences.ascx"));
+                    var userPrefsCtl = (SettingsBase)(LoadControl(Page.ResolveUrl(Globals.ModulePath + "controls/profile_mypreferences.ascx")));
                     userPrefsCtl.ModuleConfiguration = ModuleConfiguration;
-                    userPrefsCtl.LocalResourceFile = "~/desktopmodules/activeforums/app_localresources/sharedresources.resx";
+                    userPrefsCtl.LocalResourceFile = Page.ResolveUrl(Globals.SharedResourceFile);
                     plhAF.Controls.Add(userPrefsCtl);
                 }
 
                 return;
             }
 
             // Otherwise, just load the normal forum control
-            var ctl = (ForumBase)(LoadControl("~/desktopmodules/activeforums/classic.ascx"));
+            var ctl = (ForumBase)(LoadControl(Page.ResolveUrl(Globals.ModulePath + "classic.ascx")));
             ctl.ModuleConfiguration = ModuleConfiguration;
             plhAF.Controls.Add(ctl);
 

diff --git a/ActiveForums.csproj b/ActiveForums.csproj
@@ -47,7 +47,7 @@
     <DebugSymbols>true</DebugSymbols>
     <Optimize>false</Optimize>
     <WarningLevel>1</WarningLevel>
-    <WarningLevel>1</WarningLevel>
+    <WarningLevel>3</WarningLevel>
     <DebugType>full</DebugType>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <UseVSHostingProcess>true</UseVSHostingProcess>
@@ -59,7 +59,7 @@
     <DefineConstants>TRACE;</DefineConstants>
     <DebugSymbols>false</DebugSymbols>
     <Optimize>true</Optimize>
-    <WarningLevel>1</WarningLevel>
+    <WarningLevel>4</WarningLevel>
     <DebugType>none</DebugType>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
@@ -269,11 +269,15 @@
     <Content Include="handlers\adminhelper.ashx" />
     <Content Include="images\add-circle.png" />
     <Content Include="images\af-fileicon.png" />
+    <Content Include="images\arrows_down.png" />
+    <Content Include="images\arrows_left.png" />
     <Content Include="images\arrow_down.png" />
     <Content Include="images\arrow_up.png" />
     <Content Include="images\check32.png" />
     <Content Include="images\checkbox.png" />
     <Content Include="images\checkbox_unchecked.png" />
+    <Content Include="images\close.png" />
+    <Content Include="images\delete_new.gif" />
     <Content Include="images\execute16.png" />
     <Content Include="images\delete16.png" />
     <Content Include="images\info32.png" />
@@ -284,7 +288,10 @@
     <Content Include="images\modal_top_left.png" />
     <Content Include="images\modal_top_right.png" />
     <Content Include="images\progress.gif" />
+    <Content Include="images\search.gif" />
     <Content Include="images\sort_16.png" />
+    <Content Include="images\spinner-lg.gif" />
+    <Content Include="images\spinner.gif" />
     <Content Include="images\testrun16.png" />
     <Content Include="images\roles_add.png" />
     <Content Include="images\save16.png" />
@@ -534,7 +541,9 @@
     <Content Include="controls\admin_filters.ascx" />
     <Content Include="controls\admin_home.ascx" />
     <Content Include="controls\admin_manageforums_home.ascx" />
-    <Content Include="controls\admin_ranks.ascx" />
+    <Content Include="controls\admin_ranks.ascx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
     <Content Include="controls\admin_tags.ascx">
       <SubType>ASPXCodeBehind</SubType>
     </Content>
@@ -644,7 +653,13 @@
     <None Include="sql\06.04.01.SqlDataProvider" />
     <None Include="sql\07.00.02.SqlDataProvider" />
     <None Include="sql\07.00.00.SqlDataProvider" />
+    <None Include="sql\07.00.02.SqlDataProvider" />
     <None Include="sql\07.00.05.SqlDataProvider" />
+    <None Include="sql\07.00.06.SqlDataProvider" />
+    <None Include="sql\07.00.07.SqlDataProvider" />
+    <None Include="sql\07.00.08.SqlDataProvider" />
+    <None Include="sql\08.00.00.SqlDataProvider" />
+    <None Include="sql\07.00.06.SqlDataProvider" />
     <None Include="sql\Enterprise.sql" />
     <Content Include="config\templates\ModAlert_text.txt" />
     <Content Include="config\templates\ModEmail_text.txt" />
@@ -1365,4 +1380,4 @@
   <!--<Import Project="$(VSToolsPath)\WebApplications\Microsoft.WebApplication.targets" Condition="'$(VSToolsPath)' != ''" />-->
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\WebApplications\Microsoft.WebApplication.targets" Condition="false" />
   <Import Project="Module.Build" />
-</Project>
+</Project>
diff --git a/ActiveForums.dnn b/ActiveForums.dnn
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="Active Forums" type="Module" version="07.00.05">
+    <package name="Active Forums" type="Module" version="07.00.06">
       <friendlyName>Active Forums</friendlyName>
       <description>Community Forums: The official online forums module for the DNN Community.</description>
       <iconFile>DesktopModules/ActiveForums/images/af6_icon.jpg</iconFile>
@@ -73,7 +73,7 @@
             <attributes>
               <businessControllerClass>DotNetNuke.Modules.ActiveForums.TopicsController, DotNetNuke.Modules.ActiveForums</businessControllerClass>
               <desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
-              <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>
+              <upgradeVersionsList>07.00.06</upgradeVersionsList>
             </attributes>
           </eventMessage>
         </component>
@@ -84,7 +84,7 @@
             <assembly>
               <name>DotNetNuke.Modules.ActiveForums.dll</name>
               <sourceFileName>bin\DotNetNuke.Modules.ActiveForums.dll</sourceFileName>
-              <version>07.00.05</version>
+              <version>07.00.06</version>
             </assembly>
           </assemblies>
         </component>
@@ -349,10 +349,15 @@
                <name>07.00.05.SqlDataProvider</name>
                <version>07.00.05</version>
              </script>
+             <script type="UnInstall">
+              <path>sql</path>
+              <name>07.00.06.SqlDataProvider</name>
+              <version>07.00.06</version>
+             </script>
              <script type="UnInstall">
               <path>sql</path>
               <name>Uninstall.SqlDataProvider</name>
-              <version>07.00.05</version>
+              <version>07.00.06</version>
             </script>
           </scripts>
         </component>
@@ -388,7 +393,7 @@
       </components>
     </package>
 
-    <package name="Active Forums What's New" type="Module" version="07.00.05">
+    <package name="Active Forums What's New" type="Module" version="07.00.06">
       <friendlyName>Active Forums What's New</friendlyName>
       <foldername>ActiveForumsWhatsNew</foldername>
       <description>Community Forums: Display the most recent topics or replies from selected forums on any page within your site.</description>
@@ -457,7 +462,7 @@
       </components>
     </package>
 
-    <package name="Active Forums Viewer" type="Module" version="07.00.05">
+    <package name="Active Forums Viewer" type="Module" version="07.00.06">
 		  <friendlyName>Active Forums Viewer</friendlyName>
 		  <foldername>ActiveForumsViewer</foldername>
 		  <description>Community Forums: Display any forum topic view on any page within your site.</description>

diff --git a/ActiveForums_Symbols.dnn b/ActiveForums_Symbols.dnn
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="Active Forums_Symbols" type="Library" version="07.00.05">
+    <package name="Active Forums_Symbols" type="Library" version="07.00.06">
       <friendlyName>Active Forums Symbols</friendlyName>
       <description>Community Forums: The official online forums module for the DNN Community.</description>
       <iconFile>DesktopModules/ActiveForums/images/af6_icon.jpg</iconFile>
@@ -14,7 +14,7 @@
       <releaseNotes src="ReleaseNotes.txt" />
       <azureCompatible>True</azureCompatible>
       <dependencies>
-        <dependency type="managedPackage" version="7.0.5">Active Forums</dependency>
+        <dependency type="managedPackage" version="7.0.6">Active Forums</dependency>
       </dependencies>
       <components>
         <component type="ResourceFile">

diff --git a/App_LocalResources/SharedResources.resx b/App_LocalResources/SharedResources.resx
@@ -1648,10 +1648,10 @@ From,
   <data name="[RESX:SubscribedTopicForumName].Text" xml:space="preserve">
     <value>Subscribed Topic {0} on Forum {1}</value>
   </data>
-  <data name="[RESX:postedIn.Text]" xml:space="preserve">
-    <value>posted in</value>
+  <data name="[RESX:PostedTo].Text" xml:space="preserve">
+    <value>posted to</value>
   </data>
-  <data name="[RESX:repliedto.Text]" xml:space="preserve">
+  <data name="[RESX:RepliedTo].Text" xml:space="preserve">
     <value>replied to</value>
   </data>
-</root>
+</root>