Skip to content

Commit eed6a65

Browse files
WillStrohlWillStrohl
authored
Merge pull request #308 from DNNCommunity/dev
Merging `dev` into `master` for 07.00.09 Release
2 parents 7a5b8af + cc52725 commit eed6a65

Some content is hidden

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

44 files changed

+783
-397
lines changed

‎ActiveForumViewerSettings.ascx.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public override void UpdateSettings()
8888
{
8989
try
9090
{
91-
var objModules = new Entities.Modules.ModuleController();
91+
var objModules = new DotNetNuke.Entities.Modules.ModuleController();
9292
// Update ModuleSettings
9393
objModules.UpdateModuleSetting(ModuleId, "AFTopicsTemplate", drpTopicsTemplate.SelectedItem.Value);
9494
objModules.UpdateModuleSetting(ModuleId, "AFTopicTemplate", drpTopicTemplate.SelectedItem.Value);
@@ -126,10 +126,10 @@ public void LoadForums()
126126
{
127127

128128
int i = 0;
129-
var mc = new Entities.Modules.ModuleController();
130-
var tc = new Entities.Tabs.TabController();
131-
Entities.Tabs.TabInfo ti;
132-
foreach (Entities.Modules.ModuleInfo mi in mc.GetModules(PortalId))
129+
var mc = new DotNetNuke.Entities.Modules.ModuleController();
130+
var tc = new DotNetNuke.Entities.Tabs.TabController();
131+
DotNetNuke.Entities.Tabs.TabInfo ti;
132+
foreach (DotNetNuke.Entities.Modules.ModuleInfo mi in mc.GetModules(PortalId))
133133
{
134134
if (mi.DesktopModule.ModuleName.Trim().ToLowerInvariant() == Globals.ModuleName.ToLowerInvariant() && mi.IsDeleted == false)
135135
{

‎ActiveForums.csproj

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -654,14 +654,16 @@
654654
<None Include="sql\06.04.01.SqlDataProvider" />
655655
<None Include="sql\07.00.02.SqlDataProvider" />
656656
<None Include="sql\07.00.00.SqlDataProvider" />
657-
<None Include="sql\07.00.02.SqlDataProvider" />
657+
<None Include="sql\07.00.02.SqlDataProvider" />
658658
<None Include="sql\07.00.05.SqlDataProvider" />
659659
<None Include="sql\07.00.06.SqlDataProvider" />
660660
<None Include="sql\07.00.07.SqlDataProvider" />
661661
<None Include="sql\07.00.08.SqlDataProvider" />
662662
<None Include="sql\08.00.00.SqlDataProvider" />
663663
<None Include="sql\07.00.06.SqlDataProvider" />
664664
<None Include="sql\07.00.07.SqlDataProvider" />
665+
<None Include="sql\07.00.08.SqlDataProvider" />
666+
<None Include="sql\07.00.09.SqlDataProvider" />
665667
<None Include="sql\Enterprise.sql" />
666668
<Content Include="config\templates\ModAlert_text.txt" />
667669
<Content Include="config\templates\ModEmail_text.txt" />
@@ -746,8 +748,8 @@
746748
<Compile Include="class\HashtableExtensions.cs" />
747749
<Compile Include="class\DataRowExtensions.cs" />
748750
<Compile Include="class\DataRecordExtensions.cs" />
749-
<Compile Include="class\Likes.cs" />
750-
<Compile Include="class\LikesController.cs" />
751+
<Compile Include="Entities\Like.cs" />
752+
<Compile Include="Controllers\LikeController.cs" />
751753
<Compile Include="class\ParamBuilder.cs" />
752754
<Compile Include="class\StringExtensions.cs" />
753755
<Compile Include="class\WhatsNewModuleSettings.cs" />
@@ -774,6 +776,7 @@
774776
<Compile Include="DAL2\Reply\ReplyController.cs" />
775777
<Compile Include="Extensions\StringExtensions.cs" />
776778
<Compile Include="Services\Controllers\ControllerBase.cs" />
779+
<Compile Include="Services\Controllers\LikeController.cs" />
777780
<Compile Include="Services\ForumAuthorizeAttribute.cs" />
778781
<Compile Include="Services\ServicesHelper.cs" />
779782
<Compile Include="SimulateDateDiff.cs" />
@@ -1362,6 +1365,9 @@
13621365
<ItemGroup>
13631366
<Folder Include="class\API\" />
13641367
<Folder Include="components\Security\" />
1368+
<Folder Include="config\templates\community\" />
1369+
<Folder Include="Controllers\" />
1370+
<Folder Include="Entities\" />
13651371
<Folder Include="Legacy\" />
13661372
</ItemGroup>
13671373
<ItemGroup>

‎ActiveForums.dnn

Lines changed: 86 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<dotnetnuke type="Package" version="5.0">
2-
<packages>
3-
<package name="Active Forums" type="Module" version="07.00.07">
1+
<dotnetnuke type="Package" version="5.0">
2+
<packages>
3+
<package name="Active Forums" type="Module" version="07.00.09">
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>
@@ -72,7 +72,7 @@
7272
<processorCommand>UpgradeModule</processorCommand>
7373
<attributes>
7474
<businessControllerClass>DotNetNuke.Modules.ActiveForums.TopicsController, DotNetNuke.Modules.ActiveForums</businessControllerClass>
75-
<desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
75+
<desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
7676
<upgradeVersionsList>07.00.07</upgradeVersionsList>
7777
</attributes>
7878
</eventMessage>
@@ -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.07</version>
87+
<version>07.00.09</version>
8888
</assembly>
8989
</assemblies>
9090
</component>
@@ -359,10 +359,20 @@
359359
<name>07.00.07.SqlDataProvider</name>
360360
<version>07.00.07</version>
361361
</script>
362+
<script type="Install">
363+
<path>sql</path>
364+
<name>07.00.08.SqlDataProvider</name>
365+
<version>07.00.08</version>
366+
</script>
367+
<script type="Install">
368+
<path>sql</path>
369+
<name>07.00.09.SqlDataProvider</name>
370+
<version>07.00.09</version>
371+
</script>
362372
<script type="UnInstall">
363373
<path>sql</path>
364374
<name>Uninstall.SqlDataProvider</name>
365-
<version>07.00.07</version>
375+
<version>07.00.09</version>
366376
</script>
367377
</scripts>
368378
</component>
@@ -397,8 +407,8 @@
397407
<component type="Cleanup" version="07.00.03" fileName="07.00.03.txt" />
398408
</components>
399409
</package>
400-
401-
<package name="Active Forums What's New" type="Module" version="07.00.07">
410+
411+
<package name="Active Forums What's New" type="Module" version="07.00.09">
402412
<friendlyName>Active Forums What's New</friendlyName>
403413
<foldername>ActiveForumsWhatsNew</foldername>
404414
<description>Community Forums: Display the most recent topics or replies from selected forums on any page within your site.</description>
@@ -467,73 +477,73 @@
467477
</components>
468478
</package>
469479

470-
<package name="Active Forums Viewer" type="Module" version="07.00.07">
471-
<friendlyName>Active Forums Viewer</friendlyName>
472-
<foldername>ActiveForumsViewer</foldername>
473-
<description>Community Forums: Display any forum topic view on any page within your site.</description>
474-
<iconFile>DesktopModules/ActiveForums/images/af6_icon.jpg</iconFile>
475-
<owner>
476-
<name>DNN Community</name>
477-
<organization>DNN Community</organization>
478-
<url>dnncommunity.org</url>
479-
<email>[email protected]</email>
480-
</owner>
481-
<license src="License.txt" />
482-
<releaseNotes src="ReleaseNotes.txt" />
483-
<azureCompatible>true</azureCompatible>
484-
<dependencies>
485-
<dependency type="CoreVersion">09.04.00</dependency>
486-
</dependencies>
487-
<components>
488-
<component type="Module">
489-
<desktopModule>
490-
<moduleName>Active Forums Viewer</moduleName>
491-
<foldername>ActiveForumsViewer</foldername>
492-
<businessControllerClass />
493-
<supportedFeatures />
494-
<moduleDefinitions>
495-
<moduleDefinition>
496-
<friendlyName>Active Forums Viewer</friendlyName>
497-
<definitionName>Active Forums Viewer</definitionName>
498-
<defaultCacheTime>0</defaultCacheTime>
499-
<moduleControls>
500-
<moduleControl>
501-
<controlKey />
502-
<controlSrc>DesktopModules/ActiveForumsViewer/ActiveForumViewer.ascx</controlSrc>
503-
<supportsPartialRendering>False</supportsPartialRendering>
504-
<controlTitle>Active Forums Viewer</controlTitle>
505-
<controlType>View</controlType>
506-
<iconFile />
507-
<helpUrl />
508-
<supportsPopUps>False</supportsPopUps>
509-
<viewOrder>0</viewOrder>
510-
</moduleControl>
511-
<moduleControl>
512-
<controlKey>Settings</controlKey>
513-
<controlSrc>DesktopModules/ActiveForumsViewer/ActiveForumViewerSettings.ascx</controlSrc>
514-
<supportsPartialRendering>False</supportsPartialRendering>
515-
<controlTitle>Settings</controlTitle>
516-
<controlType>Edit</controlType>
517-
<iconFile />
518-
<helpUrl />
519-
<supportsPopUps>False</supportsPopUps>
520-
</moduleControl>
521-
</moduleControls>
522-
</moduleDefinition>
523-
</moduleDefinitions>
524-
</desktopModule>
525-
</component>
526-
<component type="ResourceFile">
527-
<resourceFiles>
528-
<basePath>DesktopModules\ActiveForumsViewer</basePath>
529-
<resourceFile>
530-
<name>ActiveForumsViewerResources.zip</name>
531-
<sourceFileName>ActiveForumsViewerResources.zip</sourceFileName>
532-
</resourceFile>
533-
</resourceFiles>
534-
</component>
535-
</components>
536-
</package>
537-
480+
<package name="Active Forums Viewer" type="Module" version="07.00.09">
481+
<friendlyName>Active Forums Viewer</friendlyName>
482+
<foldername>ActiveForumsViewer</foldername>
483+
<description>Community Forums: Display any forum topic view on any page within your site.</description>
484+
<iconFile>DesktopModules/ActiveForums/images/af6_icon.jpg</iconFile>
485+
<owner>
486+
<name>DNN Community</name>
487+
<organization>DNN Community</organization>
488+
<url>dnncommunity.org</url>
489+
<email>[email protected]</email>
490+
</owner>
491+
<license src="License.txt" />
492+
<releaseNotes src="ReleaseNotes.txt" />
493+
<azureCompatible>true</azureCompatible>
494+
<dependencies>
495+
<dependency type="CoreVersion">09.04.00</dependency>
496+
</dependencies>
497+
<components>
498+
<component type="Module">
499+
<desktopModule>
500+
<moduleName>Active Forums Viewer</moduleName>
501+
<foldername>ActiveForumsViewer</foldername>
502+
<businessControllerClass />
503+
<supportedFeatures />
504+
<moduleDefinitions>
505+
<moduleDefinition>
506+
<friendlyName>Active Forums Viewer</friendlyName>
507+
<definitionName>Active Forums Viewer</definitionName>
508+
<defaultCacheTime>0</defaultCacheTime>
509+
<moduleControls>
510+
<moduleControl>
511+
<controlKey />
512+
<controlSrc>DesktopModules/ActiveForumsViewer/ActiveForumViewer.ascx</controlSrc>
513+
<supportsPartialRendering>False</supportsPartialRendering>
514+
<controlTitle>Active Forums Viewer</controlTitle>
515+
<controlType>View</controlType>
516+
<iconFile />
517+
<helpUrl />
518+
<supportsPopUps>False</supportsPopUps>
519+
<viewOrder>0</viewOrder>
520+
</moduleControl>
521+
<moduleControl>
522+
<controlKey>Settings</controlKey>
523+
<controlSrc>DesktopModules/ActiveForumsViewer/ActiveForumViewerSettings.ascx</controlSrc>
524+
<supportsPartialRendering>False</supportsPartialRendering>
525+
<controlTitle>Settings</controlTitle>
526+
<controlType>Edit</controlType>
527+
<iconFile />
528+
<helpUrl />
529+
<supportsPopUps>False</supportsPopUps>
530+
</moduleControl>
531+
</moduleControls>
532+
</moduleDefinition>
533+
</moduleDefinitions>
534+
</desktopModule>
535+
</component>
536+
<component type="ResourceFile">
537+
<resourceFiles>
538+
<basePath>DesktopModules\ActiveForumsViewer</basePath>
539+
<resourceFile>
540+
<name>ActiveForumsViewerResources.zip</name>
541+
<sourceFileName>ActiveForumsViewerResources.zip</sourceFileName>
542+
</resourceFile>
543+
</resourceFiles>
544+
</component>
545+
</components>
546+
</package>
547+
538548
</packages>
539549
</dotnetnuke>

‎ActiveForums_Symbols.dnn

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
<dotnetnuke type="Package" version="5.0">
2-
<packages>
3-
<package name="Active Forums_Symbols" type="Library" version="07.00.07">
1+
<dotnetnuke type="Package" version="5.0">
2+
<packages>
3+
<package name="Active Forums_Symbols" type="Library" version="07.00.09">
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.7">Active Forums</dependency>
17+
<dependency type="managedPackage" version="7.0.9">Active Forums</dependency>
1818
</dependencies>
1919
<components>
2020
<component type="ResourceFile">

‎BuildScripts/ModulePackage.targets

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -31,35 +31,35 @@ OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3131
</XmlRead>
3232

3333
<ItemGroup>
34-
<InstallInclude Include="**\*.ascx" Exclude="packages\**;node_modules\**;clientApp\**;WhatsNew.ascx;WhatsNewOptions.ascx" />
35-
<InstallInclude Include="**\*.asmx" Exclude="packages\**;node_modules\**;clientApp\**" />
36-
<InstallInclude Include="**\*.ashx" Exclude="packages\**;node_modules\**;clientApp\**" />
37-
<InstallInclude Include="**\*.css" Exclude="packages\**;node_modules\**;clientApp\**" />
38-
<InstallInclude Include="**\*.html" Exclude="packages\**;node_modules\**;clientApp\**" />
39-
<InstallInclude Include="**\*.htm" Exclude="packages\**;node_modules\**;clientApp\**;UpgradeLog*.htm" />
40-
<InstallInclude Include="**\*.resx" Exclude="packages\**;node_modules\**;clientApp\**" />
41-
<InstallInclude Include="**\*.aspx" Exclude="packages\**;node_modules\**;clientApp\**" />
42-
<InstallInclude Include="**\*.js" Exclude="packages\**;node_modules\**;clientApp\**" />
43-
<InstallInclude Include="**\*.js.map" Exclude="packages\**;node_modules\**;clientApp\**" />
44-
<InstallInclude Include="**\*.txt" Exclude="**\obj\**;**\_ReSharper*\**;packages\**;node_modules\**;clientApp\**;readme.txt" />
45-
<InstallInclude Include="**\images\**\*.*" Exclude="packages\**;node_modules\**;clientApp\**" />
46-
<InstallInclude Include="**\*.eot" Exclude="packages\**;node_modules\**;clientApp\**" />
47-
<InstallInclude Include="**\*.svg" Exclude="packages\**;node_modules\**;clientApp\**" />
48-
<InstallInclude Include="**\*.ttf" Exclude="packages\**;node_modules\**;clientApp\**" />
49-
<InstallInclude Include="**\*.woff" Exclude="packages\**;node_modules\**;clientApp\**" />
50-
<InstallInclude Include="**\*.woff2" Exclude="packages\**;node_modules\**;clientApp\**" />
51-
<InstallInclude Include="**\*.swf" Exclude="packages\**;node_modules\**;clientApp\**" />
52-
<InstallInclude Include="**\*.ico" Exclude="packages\**;node_modules\**;clientApp\**" />
53-
<InstallInclude Include="**\*.json" Exclude="packages\**;node_modules\**;clientApp\**;obj\**" />
54-
<InstallInclude Include="**\*.scss" Exclude="packages\**;node_modules\**;clientApp\**" />
55-
<InstallInclude Include="**\*.cshtml" Exclude="packages\**;node_modules\**;clientApp\**" />
56-
<InstallInclude Include="**\*.png" Exclude="packages\**;node_modules\**;clientApp\**" />
57-
<InstallInclude Include="**\*.gif" Exclude="packages\**;node_modules\**;clientApp\**" />
58-
<InstallInclude Include="**\*.jpeg" Exclude="packages\**;node_modules\**;clientApp\**" />
59-
<InstallInclude Include="**\*.jpg" Exclude="packages\**;node_modules\**;clientApp\**" />
60-
<InstallInclude Include="**\*.bmp" Exclude="packages\**;node_modules\**;clientApp\**" />
61-
<InstallInclude Include="**\*.xml" Exclude="packages\**;node_modules\**;clientApp\**;bin\**" />
62-
<InstallInclude Include="**\*.config" Exclude="packages\**;node_modules\**;clientApp\**" />
34+
<InstallInclude Include="**\*.ascx" Exclude="packages\**;node_modules\**;clientApp\**;WhatsNew.ascx;WhatsNewOptions.ascx;.git\**;.vs\**" />
35+
<InstallInclude Include="**\*.asmx" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
36+
<InstallInclude Include="**\*.ashx" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
37+
<InstallInclude Include="**\*.css" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
38+
<InstallInclude Include="**\*.html" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
39+
<InstallInclude Include="**\*.htm" Exclude="packages\**;node_modules\**;clientApp\**;UpgradeLog*.htm;.git\**;.vs\**" />
40+
<InstallInclude Include="**\*.resx" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
41+
<InstallInclude Include="**\*.aspx" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
42+
<InstallInclude Include="**\*.js" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
43+
<InstallInclude Include="**\*.js.map" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
44+
<InstallInclude Include="**\*.txt" Exclude="**\obj\**;**\_ReSharper*\**;packages\**;node_modules\**;clientApp\**;readme.txt;.git\**;.vs\**" />
45+
<InstallInclude Include="**\images\**\*.*" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
46+
<InstallInclude Include="**\*.eot" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
47+
<InstallInclude Include="**\*.svg" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
48+
<InstallInclude Include="**\*.ttf" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
49+
<InstallInclude Include="**\*.woff" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**v" />
50+
<InstallInclude Include="**\*.woff2" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
51+
<InstallInclude Include="**\*.swf" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
52+
<InstallInclude Include="**\*.ico" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
53+
<InstallInclude Include="**\*.json" Exclude="packages\**;node_modules\**;clientApp\**;obj\**;.git\**;.vs\**" />
54+
<InstallInclude Include="**\*.scss" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
55+
<InstallInclude Include="**\*.cshtml" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
56+
<InstallInclude Include="**\*.png" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
57+
<InstallInclude Include="**\*.gif" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
58+
<InstallInclude Include="**\*.jpeg" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
59+
<InstallInclude Include="**\*.jpg" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
60+
<InstallInclude Include="**\*.bmp" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
61+
<InstallInclude Include="**\*.xml" Exclude="packages\**;node_modules\**;clientApp\**;bin\**;.git\**;.vs\**" />
62+
<InstallInclude Include="**\*.config" Exclude="packages\**;node_modules\**;clientApp\**;.git\**;.vs\**" />
6363
</ItemGroup>
6464

6565
<CreateItem Include="$(DNNFileName).dnn">

0 commit comments

Comments
 (0)