Skip to content

Commit

Permalink
bump to YAF 3.1.15
Browse files Browse the repository at this point in the history
  • Loading branch information
w8tcha committed Sep 3, 2023
1 parent bfb956a commit 101d7d5
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 12 deletions.
6 changes: 4 additions & 2 deletions yaf_dnn/BuildScripts/ModulePackage.targets
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@
<DefaultExclude Include="**\_source\**" />
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\jquery.FileUpload\**\*.js" />
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\forum\**\*.js" />
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\yafEditor\autoCloseTags.js" />
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\yafEditor\undoManager.js" />
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\yafEditor\yafeditor.comb.js" />
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\yafEditor\yafEditor.js" />
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\blueimp-gallery\blueimp-gallery.js" />
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\blueimp-gallery\blueimp-gallery-indicator.js" />
Expand All @@ -67,8 +70,7 @@
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\jquery.ForumAdminExtensions.min.js" />
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\jquery.ForumAdminExtensionsDnn.js" />
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\jquery.selectedQuoting.js" />
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\jquery-3.6.2.js" />
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\jquery-3.6.2.min.js" />
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\jquery.js" />
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\prism.js" />
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\select2.js" />
<DefaultExclude Include="$(MSBuildProjectDirectory)\..\yafsrc\YetAnotherForum.NET\Scripts\select2.min.js" />
Expand Down
3 changes: 1 addition & 2 deletions yaf_dnn/Components/WebAPI/ThankYouController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,7 @@ public IHttpActionResult RemoveThanks([NotNull] int id)

this.GetRepository<Thanks>().RemoveMessageThanks(
BoardContext.Current.PageUserID,
id,
this.Get<BoardSettings>().EnableDisplayName);
id);

this.GetRepository<Activity>().Delete(a => a.MessageID == id && (a.Flags == 1024 || a.Flags == 2048));

Expand Down
14 changes: 7 additions & 7 deletions yaf_dnn/Installation/YAF.DotNetNuke.Module.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="YetAnotherForumDotNet" type="Module" version="03.19.006126">
<package name="YetAnotherForumDotNet" type="Module" version="03.19.006127">
<friendlyName>YAF.NET Forums</friendlyName>
<description>
&lt;strong&gt;YetAnotherForum.NET&lt;/strong&gt; as DNN Module. Yet Another Forum.NET (YAF) is an open source ASP.NET forum system.&lt;br /&gt;
Expand Down Expand Up @@ -70,7 +70,7 @@
<attributes>
<businessControllerClass>YAF.DotNetNuke.Components.Controllers.UpgradeController, YAF.DotNetNuke.Module</businessControllerClass>
<desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
<upgradeVersionsList>03.00.006100,03.13.006107,03.15.006109,03.15.006110,03.15.006111,03.16.006112,03.16.006118,03.17.006119,03.18.006120,03.19.006121,03.19.006122,03.19.006123,03.19.006124,03.19.006125,03.19.006126</upgradeVersionsList>
<upgradeVersionsList>03.00.006100,03.13.006107,03.15.006109,03.15.006110,03.15.006111,03.16.006112,03.16.006118,03.17.006119,03.18.006120,03.19.006121,03.19.006122,03.19.006123,03.19.006124,03.19.006125,03.19.006126,03.19.006127</upgradeVersionsList>
</attributes>
</eventMessage>
</component>
Expand Down Expand Up @@ -512,7 +512,7 @@
</component>
</components>
</package>
<package name="YAF.WhatsNew" type="Module" version="03.19.006126">
<package name="YAF.WhatsNew" type="Module" version="03.19.006127">
<friendlyName>YAF.NET Forums What's New</friendlyName>
<description>
&lt;p&gt;This Module displays the Latest Posts from a &lt;strong&gt;YetAnotherForum.NET&lt;/strong&gt; Module. Based on the Current Users Authorization Level. You can define Which Forum should been used, and how many Posts should displayed.
Expand Down Expand Up @@ -573,7 +573,7 @@
<attributes>
<businessControllerClass>YAF.DotNetNuke.Components.Controllers.UpgradeController, YAF.DotNetNuke.Module</businessControllerClass>
<desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
<upgradeVersionsList>03.00.006100,03.13.006107,03.15.006109,03.15.006110,03.15.006111,03.16.006112,03.16.006118,03.17.006119,03.18.006120,03.19.006121,03.19.006122,03.19.006123,03.19.006124,03.19.006125,03.19.006126</upgradeVersionsList>
<upgradeVersionsList>03.00.006100,03.13.006107,03.15.006109,03.15.006110,03.15.006111,03.16.006112,03.16.006118,03.17.006119,03.18.006120,03.19.006121,03.19.006122,03.19.006123,03.19.006124,03.19.006125,03.19.006126,03.19.006127</upgradeVersionsList>
</attributes>
</eventMessage>
</component>
Expand Down Expand Up @@ -612,8 +612,8 @@
</component>
</components>
</package>
<package name="bootstrap-bundle" type="JavaScript_Library" version="05.30.006126">
<friendlyName>Bootstrap v5.3.0 JavaScript Bundle (width Popper.js)</friendlyName>
<package name="bootstrap-bundle" type="JavaScript_Library" version="05.30.006127">
<friendlyName>Bootstrap v5.3.1 JavaScript Bundle (width Popper.js)</friendlyName>
<description>
<![CDATA[<p>Bootstrap is a sleek, intuitive, and powerful front-end framework for faster and easier web development, created and maintained by <a href="http://twitter.com/mdo">Mark Otto</a> and <a href="http://twitter.com/fat">Jacob Thornton</a>.</p>
<p>To get started, check out <a href="http://getbootstrap.com">http://getbootstrap.com</a>!</p>]]>
Expand All @@ -633,7 +633,7 @@
<javaScriptLibrary>
<libraryName>bootstrap-bundle</libraryName>
<fileName>bootstrap.bundle.min.js</fileName>
<CDNPath>https://maxcdn.bootstrapcdn.com/bootstrap/5.3.0/js/bootstrap.bundle.min.js</CDNPath>
<CDNPath>https://maxcdn.bootstrapcdn.com/bootstrap/5.3.1/js/bootstrap.bundle.min.js</CDNPath>
<objectName>jQuery.fn.scrollspy</objectName>
</javaScriptLibrary>
</component>
Expand Down
3 changes: 2 additions & 1 deletion yaf_dnn/YAF.DNN.Module.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
Expand All @@ -13,6 +13,7 @@
<RootNamespace>YAF.DotNetNuke</RootNamespace>
<AssemblyName>YAF.DotNetNuke.Module</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<RuntimeIdentifier>win</RuntimeIdentifier>
<FileUpgradeFlags>
</FileUpgradeFlags>
<OldToolsVersion>4.0</OldToolsVersion>
Expand Down

0 comments on commit 101d7d5

Please sign in to comment.