Skip to content

Commit

Permalink
Merge pull request #308 from DNNCommunity/dev
Browse files Browse the repository at this point in the history
Merging `dev` into `master` for 07.00.09 Release
  • Loading branch information
WillStrohl authored Jun 10, 2023
2 parents 7a5b8af + cc52725 commit eed6a65
Show file tree
Hide file tree
Showing 44 changed files with 783 additions and 397 deletions.
10 changes: 5 additions & 5 deletions ActiveForumViewerSettings.ascx.cs
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public override void UpdateSettings()
{
try
{
var objModules = new Entities.Modules.ModuleController();
var objModules = new DotNetNuke.Entities.Modules.ModuleController();
// Update ModuleSettings
objModules.UpdateModuleSetting(ModuleId, "AFTopicsTemplate", drpTopicsTemplate.SelectedItem.Value);
objModules.UpdateModuleSetting(ModuleId, "AFTopicTemplate", drpTopicTemplate.SelectedItem.Value);
Expand Down Expand Up @@ -126,10 +126,10 @@ public void LoadForums()
{

int i = 0;
var mc = new Entities.Modules.ModuleController();
var tc = new Entities.Tabs.TabController();
Entities.Tabs.TabInfo ti;
foreach (Entities.Modules.ModuleInfo mi in mc.GetModules(PortalId))
var mc = new DotNetNuke.Entities.Modules.ModuleController();
var tc = new DotNetNuke.Entities.Tabs.TabController();
DotNetNuke.Entities.Tabs.TabInfo ti;
foreach (DotNetNuke.Entities.Modules.ModuleInfo mi in mc.GetModules(PortalId))
{
if (mi.DesktopModule.ModuleName.Trim().ToLowerInvariant() == Globals.ModuleName.ToLowerInvariant() && mi.IsDeleted == false)
{
Expand Down
12 changes: 9 additions & 3 deletions ActiveForums.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -654,14 +654,16 @@
<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.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\07.00.07.SqlDataProvider" />
<None Include="sql\07.00.08.SqlDataProvider" />
<None Include="sql\07.00.09.SqlDataProvider" />
<None Include="sql\Enterprise.sql" />
<Content Include="config\templates\ModAlert_text.txt" />
<Content Include="config\templates\ModEmail_text.txt" />
Expand Down Expand Up @@ -746,8 +748,8 @@
<Compile Include="class\HashtableExtensions.cs" />
<Compile Include="class\DataRowExtensions.cs" />
<Compile Include="class\DataRecordExtensions.cs" />
<Compile Include="class\Likes.cs" />
<Compile Include="class\LikesController.cs" />
<Compile Include="Entities\Like.cs" />
<Compile Include="Controllers\LikeController.cs" />
<Compile Include="class\ParamBuilder.cs" />
<Compile Include="class\StringExtensions.cs" />
<Compile Include="class\WhatsNewModuleSettings.cs" />
Expand All @@ -774,6 +776,7 @@
<Compile Include="DAL2\Reply\ReplyController.cs" />
<Compile Include="Extensions\StringExtensions.cs" />
<Compile Include="Services\Controllers\ControllerBase.cs" />
<Compile Include="Services\Controllers\LikeController.cs" />
<Compile Include="Services\ForumAuthorizeAttribute.cs" />
<Compile Include="Services\ServicesHelper.cs" />
<Compile Include="SimulateDateDiff.cs" />
Expand Down Expand Up @@ -1362,6 +1365,9 @@
<ItemGroup>
<Folder Include="class\API\" />
<Folder Include="components\Security\" />
<Folder Include="config\templates\community\" />
<Folder Include="Controllers\" />
<Folder Include="Entities\" />
<Folder Include="Legacy\" />
</ItemGroup>
<ItemGroup>
Expand Down
162 changes: 86 additions & 76 deletions ActiveForums.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="Active Forums" type="Module" version="07.00.07">
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="Active Forums" type="Module" version="07.00.09">
<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>
Expand Down Expand Up @@ -72,7 +72,7 @@
<processorCommand>UpgradeModule</processorCommand>
<attributes>
<businessControllerClass>DotNetNuke.Modules.ActiveForums.TopicsController, DotNetNuke.Modules.ActiveForums</businessControllerClass>
<desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
<desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
<upgradeVersionsList>07.00.07</upgradeVersionsList>
</attributes>
</eventMessage>
Expand All @@ -84,7 +84,7 @@
<assembly>
<name>DotNetNuke.Modules.ActiveForums.dll</name>
<sourceFileName>bin\DotNetNuke.Modules.ActiveForums.dll</sourceFileName>
<version>07.00.07</version>
<version>07.00.09</version>
</assembly>
</assemblies>
</component>
Expand Down Expand Up @@ -359,10 +359,20 @@
<name>07.00.07.SqlDataProvider</name>
<version>07.00.07</version>
</script>
<script type="Install">
<path>sql</path>
<name>07.00.08.SqlDataProvider</name>
<version>07.00.08</version>
</script>
<script type="Install">
<path>sql</path>
<name>07.00.09.SqlDataProvider</name>
<version>07.00.09</version>
</script>
<script type="UnInstall">
<path>sql</path>
<name>Uninstall.SqlDataProvider</name>
<version>07.00.07</version>
<version>07.00.09</version>
</script>
</scripts>
</component>
Expand Down Expand Up @@ -397,8 +407,8 @@
<component type="Cleanup" version="07.00.03" fileName="07.00.03.txt" />
</components>
</package>

<package name="Active Forums What's New" type="Module" version="07.00.07">
<package name="Active Forums What's New" type="Module" version="07.00.09">
<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>
Expand Down Expand Up @@ -467,73 +477,73 @@
</components>
</package>

<package name="Active Forums Viewer" type="Module" version="07.00.07">
<friendlyName>Active Forums Viewer</friendlyName>
<foldername>ActiveForumsViewer</foldername>
<description>Community Forums: Display any forum topic view on any page within your site.</description>
<iconFile>DesktopModules/ActiveForums/images/af6_icon.jpg</iconFile>
<owner>
<name>DNN Community</name>
<organization>DNN Community</organization>
<url>dnncommunity.org</url>
<email>[email protected]</email>
</owner>
<license src="License.txt" />
<releaseNotes src="ReleaseNotes.txt" />
<azureCompatible>true</azureCompatible>
<dependencies>
<dependency type="CoreVersion">09.04.00</dependency>
</dependencies>
<components>
<component type="Module">
<desktopModule>
<moduleName>Active Forums Viewer</moduleName>
<foldername>ActiveForumsViewer</foldername>
<businessControllerClass />
<supportedFeatures />
<moduleDefinitions>
<moduleDefinition>
<friendlyName>Active Forums Viewer</friendlyName>
<definitionName>Active Forums Viewer</definitionName>
<defaultCacheTime>0</defaultCacheTime>
<moduleControls>
<moduleControl>
<controlKey />
<controlSrc>DesktopModules/ActiveForumsViewer/ActiveForumViewer.ascx</controlSrc>
<supportsPartialRendering>False</supportsPartialRendering>
<controlTitle>Active Forums Viewer</controlTitle>
<controlType>View</controlType>
<iconFile />
<helpUrl />
<supportsPopUps>False</supportsPopUps>
<viewOrder>0</viewOrder>
</moduleControl>
<moduleControl>
<controlKey>Settings</controlKey>
<controlSrc>DesktopModules/ActiveForumsViewer/ActiveForumViewerSettings.ascx</controlSrc>
<supportsPartialRendering>False</supportsPartialRendering>
<controlTitle>Settings</controlTitle>
<controlType>Edit</controlType>
<iconFile />
<helpUrl />
<supportsPopUps>False</supportsPopUps>
</moduleControl>
</moduleControls>
</moduleDefinition>
</moduleDefinitions>
</desktopModule>
</component>
<component type="ResourceFile">
<resourceFiles>
<basePath>DesktopModules\ActiveForumsViewer</basePath>
<resourceFile>
<name>ActiveForumsViewerResources.zip</name>
<sourceFileName>ActiveForumsViewerResources.zip</sourceFileName>
</resourceFile>
</resourceFiles>
</component>
</components>
</package>

<package name="Active Forums Viewer" type="Module" version="07.00.09">
<friendlyName>Active Forums Viewer</friendlyName>
<foldername>ActiveForumsViewer</foldername>
<description>Community Forums: Display any forum topic view on any page within your site.</description>
<iconFile>DesktopModules/ActiveForums/images/af6_icon.jpg</iconFile>
<owner>
<name>DNN Community</name>
<organization>DNN Community</organization>
<url>dnncommunity.org</url>
<email>[email protected]</email>
</owner>
<license src="License.txt" />
<releaseNotes src="ReleaseNotes.txt" />
<azureCompatible>true</azureCompatible>
<dependencies>
<dependency type="CoreVersion">09.04.00</dependency>
</dependencies>
<components>
<component type="Module">
<desktopModule>
<moduleName>Active Forums Viewer</moduleName>
<foldername>ActiveForumsViewer</foldername>
<businessControllerClass />
<supportedFeatures />
<moduleDefinitions>
<moduleDefinition>
<friendlyName>Active Forums Viewer</friendlyName>
<definitionName>Active Forums Viewer</definitionName>
<defaultCacheTime>0</defaultCacheTime>
<moduleControls>
<moduleControl>
<controlKey />
<controlSrc>DesktopModules/ActiveForumsViewer/ActiveForumViewer.ascx</controlSrc>
<supportsPartialRendering>False</supportsPartialRendering>
<controlTitle>Active Forums Viewer</controlTitle>
<controlType>View</controlType>
<iconFile />
<helpUrl />
<supportsPopUps>False</supportsPopUps>
<viewOrder>0</viewOrder>
</moduleControl>
<moduleControl>
<controlKey>Settings</controlKey>
<controlSrc>DesktopModules/ActiveForumsViewer/ActiveForumViewerSettings.ascx</controlSrc>
<supportsPartialRendering>False</supportsPartialRendering>
<controlTitle>Settings</controlTitle>
<controlType>Edit</controlType>
<iconFile />
<helpUrl />
<supportsPopUps>False</supportsPopUps>
</moduleControl>
</moduleControls>
</moduleDefinition>
</moduleDefinitions>
</desktopModule>
</component>
<component type="ResourceFile">
<resourceFiles>
<basePath>DesktopModules\ActiveForumsViewer</basePath>
<resourceFile>
<name>ActiveForumsViewerResources.zip</name>
<sourceFileName>ActiveForumsViewerResources.zip</sourceFileName>
</resourceFile>
</resourceFiles>
</component>
</components>
</package>
</packages>
</dotnetnuke>
8 changes: 4 additions & 4 deletions ActiveForums_Symbols.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="Active Forums_Symbols" type="Library" version="07.00.07">
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="Active Forums_Symbols" type="Library" version="07.00.09">
<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>
Expand All @@ -14,7 +14,7 @@
<releaseNotes src="ReleaseNotes.txt" />
<azureCompatible>True</azureCompatible>
<dependencies>
<dependency type="managedPackage" version="7.0.7">Active Forums</dependency>
<dependency type="managedPackage" version="7.0.9">Active Forums</dependency>
</dependencies>
<components>
<component type="ResourceFile">
Expand Down
58 changes: 29 additions & 29 deletions BuildScripts/ModulePackage.targets
Original file line number Diff line number Diff line change
Expand Up @@ -31,35 +31,35 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
</XmlRead>

<ItemGroup>
<InstallInclude Include="**\*.ascx" Exclude="packages\**;node_modules\**;clientApp\**;WhatsNew.ascx;WhatsNewOptions.ascx" />
<InstallInclude Include="**\*.asmx" Exclude="packages\**;node_modules\**;clientApp\**" />
<InstallInclude Include="**\*.ashx" Exclude="packages\**;node_modules\**;clientApp\**" />
<InstallInclude Include="**\*.css" Exclude="packages\**;node_modules\**;clientApp\**" />
<InstallInclude Include="**\*.html" Exclude="packages\**;node_modules\**;clientApp\**" />
<InstallInclude Include="**\*.htm" Exclude="packages\**;node_modules\**;clientApp\**;UpgradeLog*.htm" />
<InstallInclude Include="**\*.resx" Exclude="packages\**;node_modules\**;clientApp\**" />
<InstallInclude Include="**\*.aspx" Exclude="packages\**;node_modules\**;clientApp\**" />
<InstallInclude Include="**\*.js" Exclude="packages\**;node_modules\**;clientApp\**" />
<InstallInclude Include="**\*.js.map" Exclude="packages\**;node_modules\**;clientApp\**" />
<InstallInclude Include="**\*.txt" Exclude="**\obj\**;**\_ReSharper*\**;packages\**;node_modules\**;clientApp\**;readme.txt" />
<InstallInclude Include="**\images\**\*.*" Exclude="packages\**;node_modules\**;clientApp\**" />
<InstallInclude Include="**\*.eot" Exclude="packages\**;node_modules\**;clientApp\**" />
<InstallInclude Include="**\*.svg" Exclude="packages\**;node_modules\**;clientApp\**" />
<InstallInclude Include="**\*.ttf" Exclude="packages\**;node_modules\**;clientApp\**" />
<InstallInclude Include="**\*.woff" Exclude="packages\**;node_modules\**;clientApp\**" />
<InstallInclude Include="**\*.woff2" Exclude="packages\**;node_modules\**;clientApp\**" />
<InstallInclude Include="**\*.swf" Exclude="packages\**;node_modules\**;clientApp\**" />
<InstallInclude Include="**\*.ico" Exclude="packages\**;node_modules\**;clientApp\**" />
<InstallInclude Include="**\*.json" Exclude="packages\**;node_modules\**;clientApp\**;obj\**" />
<InstallInclude Include="**\*.scss" Exclude="packages\**;node_modules\**;clientApp\**" />
<InstallInclude Include="**\*.cshtml" Exclude="packages\**;node_modules\**;clientApp\**" />
<InstallInclude Include="**\*.png" Exclude="packages\**;node_modules\**;clientApp\**" />
<InstallInclude Include="**\*.gif" Exclude="packages\**;node_modules\**;clientApp\**" />
<InstallInclude Include="**\*.jpeg" Exclude="packages\**;node_modules\**;clientApp\**" />
<InstallInclude Include="**\*.jpg" Exclude="packages\**;node_modules\**;clientApp\**" />
<InstallInclude Include="**\*.bmp" Exclude="packages\**;node_modules\**;clientApp\**" />
<InstallInclude Include="**\*.xml" Exclude="packages\**;node_modules\**;clientApp\**;bin\**" />
<InstallInclude Include="**\*.config" Exclude="packages\**;node_modules\**;clientApp\**" />
<InstallInclude Include="**\*.ascx" Exclude="packages\**;node_modules\**;clientApp\**;WhatsNew.ascx;WhatsNewOptions.ascx;.git\**;.vs\**" />
<InstallInclude Include="**\*.asmx" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
<InstallInclude Include="**\*.ashx" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
<InstallInclude Include="**\*.css" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
<InstallInclude Include="**\*.html" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
<InstallInclude Include="**\*.htm" Exclude="packages\**;node_modules\**;clientApp\**;UpgradeLog*.htm;.git\**;.vs\**" />
<InstallInclude Include="**\*.resx" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
<InstallInclude Include="**\*.aspx" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
<InstallInclude Include="**\*.js" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
<InstallInclude Include="**\*.js.map" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
<InstallInclude Include="**\*.txt" Exclude="**\obj\**;**\_ReSharper*\**;packages\**;node_modules\**;clientApp\**;readme.txt;.git\**;.vs\**" />
<InstallInclude Include="**\images\**\*.*" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
<InstallInclude Include="**\*.eot" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
<InstallInclude Include="**\*.svg" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
<InstallInclude Include="**\*.ttf" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
<InstallInclude Include="**\*.woff" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**v" />
<InstallInclude Include="**\*.woff2" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
<InstallInclude Include="**\*.swf" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
<InstallInclude Include="**\*.ico" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
<InstallInclude Include="**\*.json" Exclude="packages\**;node_modules\**;clientApp\**;obj\**;.git\**;.vs\**" />
<InstallInclude Include="**\*.scss" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
<InstallInclude Include="**\*.cshtml" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
<InstallInclude Include="**\*.png" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
<InstallInclude Include="**\*.gif" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
<InstallInclude Include="**\*.jpeg" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
<InstallInclude Include="**\*.jpg" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
<InstallInclude Include="**\*.bmp" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
<InstallInclude Include="**\*.xml" Exclude="packages\**;node_modules\**;clientApp\**;bin\**;.git\**;.vs\**" />
<InstallInclude Include="**\*.config" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
</ItemGroup>

<CreateItem Include="$(DNNFileName).dnn">
Expand Down
Loading

0 comments on commit eed6a65

Please sign in to comment.