Skip to content

Commit

Permalink
Merge pull request #44 from DNNCommunity/develop
Browse files Browse the repository at this point in the history 
Merging for 4.1.0 release
  • Loading branch information
@valadas
valadas authored Jan 16, 2020
2 parents 254be02 + 9c23d71 commit 6605044
Show file tree
Hide file tree
Showing 13 changed files with 200 additions and 248 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ DNN [Pp]latform/Syndication/[Bb]in/*
![Ww]ebsite/[Ii]nstall/[Aa]pp_[Ll]ocal[Rr]esources/*.nl-NL.resx

*.zip.manifest
/Resources.zip

############
## Windows
Expand Down
6 changes: 6 additions & 0 deletions App_LocalResources/Settings.ascx.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -374,6 +374,12 @@
<data name="plEmailOnComment.Text" xml:space="preserve">
<value>Send Email when Comment Posted</value>
</data>
<data name="plEmailOnDownload.Help" xml:space="preserve">
<value>If you want to receive an email when user downloads a file, check this box and enter the email address where you would like the notification sent</value>
</data>
<data name="plEmailOnDownload.Text" xml:space="preserve">
<value>Send Email when user downloads file</value>
</data>
<data name="plEmailOnUpload.Help" xml:space="preserve">
<value>If you want to receive an email when a new item is uploaded, check this box and enter the email address where you would like the notification sent</value>
</data>
Expand Down
2 changes: 1 addition & 1 deletion AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
// </auto-generated>
//------------------------------------------------------------------------------

[assembly: System.Reflection.AssemblyVersion("04.00.00.00")]
[assembly: System.Reflection.AssemblyVersion("04.01.00.00")]


49 changes: 23 additions & 26 deletions DotNetNuke.Modules.Repository.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>obj\</OutputPath>
<OutputPath>bin\</OutputPath>
<DocumentationFile>DotNetNuke.Modules.Repository.xml</DocumentationFile>
<BaseAddress>285212672</BaseAddress>
<ConfigurationOverrideFile />
Expand Down Expand Up @@ -98,23 +98,24 @@
<HintPath>packages\DotNetNuke.Bundle.9.1.1.129\lib\ClientDependency.Core.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="DotNetNuke, Version=9.1.1.3, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\DotNetNuke.Core.9.1.1.3\lib\net40\DotNetNuke.dll</HintPath>
<Reference Include="DotNetNuke">
<HintPath>packages\DotNetNuke.Core.9.1.1.129\lib\net40\DotNetNuke.dll</HintPath>
<SpecificVersion>False</SpecificVersion>
<Private>False</Private>
</Reference>
<Reference Include="DotNetNuke.HttpModules, Version=9.1.1.129, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="DotNetNuke.HttpModules">
<HintPath>packages\DotNetNuke.Bundle.9.1.1.129\lib\DotNetNuke.HttpModules.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="DotNetNuke.Instrumentation, Version=9.1.1.3, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\DotNetNuke.Instrumentation.9.1.1.3\lib\net40\DotNetNuke.Instrumentation.dll</HintPath>
<Reference Include="DotNetNuke.Instrumentation">
<HintPath>packages\DotNetNuke.Instrumentation.9.1.1.129\lib\net40\DotNetNuke.Instrumentation.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="DotNetNuke.Log4Net, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\DotNetNuke.Instrumentation.9.1.1.3\lib\net40\DotNetNuke.Log4Net.dll</HintPath>
<HintPath>packages\DotNetNuke.Instrumentation.9.1.1.129\lib\net40\DotNetNuke.Log4Net.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="DotNetNuke.Modules.DigitalAssets, Version=9.1.1.129, Culture=neutral, processorArchitecture=MSIL">
<Reference Include="DotNetNuke.Modules.DigitalAssets">
<HintPath>packages\DotNetNuke.Bundle.9.1.1.129\lib\DotNetNuke.Modules.DigitalAssets.dll</HintPath>
<Private>False</Private>
</Reference>
Expand All @@ -126,28 +127,28 @@
<HintPath>packages\DotNetNuke.Bundle.9.1.1.129\lib\DotNetNuke.Tests.Utilities.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="DotNetNuke.Web, Version=9.1.1.3, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\DotNetNuke.Web.9.1.1.3\lib\net40\DotNetNuke.Web.dll</HintPath>
<Reference Include="DotNetNuke.Web">
<HintPath>packages\DotNetNuke.Web.9.1.1.129\lib\net40\DotNetNuke.Web.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="DotNetNuke.Web.Client, Version=9.1.1.3, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\DotNetNuke.Web.Client.9.1.1.3\lib\net40\DotNetNuke.Web.Client.dll</HintPath>
<Reference Include="DotNetNuke.Web.Client">
<HintPath>packages\DotNetNuke.Web.Client.9.1.1.129\lib\net40\DotNetNuke.Web.Client.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="DotNetNuke.Web.Deprecated, Version=9.1.1.3, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\DotNetNuke.Web.Deprecated.9.1.1.3\lib\net40\DotNetNuke.Web.Deprecated.dll</HintPath>
<Reference Include="DotNetNuke.Web.Deprecated">
<HintPath>packages\DotNetNuke.Web.Deprecated.9.1.1.129\lib\net40\DotNetNuke.Web.Deprecated.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="DotNetNuke.Web.Mvc, Version=9.1.1.3, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\DotNetNuke.Web.Mvc.9.1.1.3\lib\net45\DotNetNuke.Web.Mvc.dll</HintPath>
<Reference Include="DotNetNuke.Web.Mvc">
<HintPath>packages\DotNetNuke.Web.Mvc.9.1.1.129\lib\net45\DotNetNuke.Web.Mvc.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="DotNetNuke.WebControls, Version=2.4.0.598, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\DotNetNuke.Bundle.9.1.1.129\lib\DotNetNuke.WebControls.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="DotNetNuke.WebUtility, Version=4.2.1.783, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\DotNetNuke.Web.9.1.1.3\lib\net40\DotNetNuke.WebUtility.dll</HintPath>
<HintPath>packages\DotNetNuke.Web.9.1.1.129\lib\net40\DotNetNuke.WebUtility.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="FiftyOne.Foundation, Version=3.2.3.2, Culture=neutral, PublicKeyToken=e967ae578dabd98e, processorArchitecture=MSIL">
Expand All @@ -159,9 +160,9 @@
<Private>False</Private>
</Reference>
<Reference Include="Microsoft.VisualBasic" />
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>packages\Newtonsoft.Json.4.5.6\lib\net40\Newtonsoft.Json.dll</HintPath>
<Private>False</Private>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<SpecificVersion>False</SpecificVersion>
</Reference>
<Reference Include="System">
<Name>System</Name>
Expand All @@ -176,9 +177,8 @@
<Name>System.Drawing</Name>
</Reference>
<Reference Include="System.Net.Http" />
<Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.AspNet.WebApi.Client.4.0.20710.0\lib\net40\System.Net.Http.Formatting.dll</HintPath>
<Private>False</Private>
<Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http.WebRequest" />
<Reference Include="System.Runtime.Serialization">
Expand All @@ -193,9 +193,6 @@
<Reference Include="System.Web">
<Name>System.Web</Name>
</Reference>
<Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<Private>False</Private>
</Reference>
<Reference Include="System.Xml">
<Name>System.XML</Name>
</Reference>
Expand Down
4 changes: 2 additions & 2 deletions DotNetNuke_DotNetNuke.Repository.dnn
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DotNetNuke.Repository" type="Module" version="04.00.00">
<package name="DotNetNuke.Repository" type="Module" version="04.01.00">
<friendlyName>Repository</friendlyName>
<description>A file/object repository module that includes skinning and community features like comments and user ratings.</description>
<iconFile>icon_repository_32px.gif</iconFile>
Expand Down Expand Up @@ -321,7 +321,7 @@
</components>
</package>

<package name="DotNetNuke.Repository.Dashboard" type="Module" version="04.00.00">
<package name="DotNetNuke.Repository.Dashboard" type="Module" version="04.01.00">
<friendlyName>Repository Dashboard</friendlyName>
<description></description>
<owner>
Expand Down
12 changes: 6 additions & 6 deletions Form.ascx.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -605,15 +605,15 @@ private void CreateInputForm()
PlaceHolder.Controls.Add(objDeleteButton);
break;
case "CATEGORIES":
RepositoryCategoryController categories = new RepositoryCategoryController();
RepositoryCategoryController categories = new RepositoryCategoryController();
RepositoryCategoryInfo category = null;
RepositoryObjectCategoriesController repositoryObjectCategories = new RepositoryObjectCategoriesController();
RepositoryObjectCategoriesInfo repositoryObjectCategory = null;
object obj = null;
// get control type for categories
string controlType = oRepositoryBusinessController.GetSkinAttribute(xmlDoc, "Categories", "Select", "MULTIPLE");
if (controlType == "TREE") {
var objTree = new DnnTree();
var objTree = new DnnTree();
objTree.ID = "__Categories";
objTree.SystemImagesPath = ResolveUrl("~/images/");
objTree.ImageList.Add(ResolveUrl("~/images/folder.gif"));
Expand All @@ -623,9 +623,9 @@ private void CreateInputForm()
objTree.EnableViewState = true;
objTree.CheckBoxes = true;
ArrayList ArrCategories = categories.GetRepositoryCategories(ModuleId, -1);
oRepositoryBusinessController.AddCategoryToTreeObject(ModuleId, itemId, ArrCategories, objTree.TreeNodes[0], "", false);
PlaceHolder.Controls.Add(objTree);
} else {
oRepositoryBusinessController.AddCategoryToTreeObject(ModuleId, itemId, ArrCategories, objTree.TreeNodes, "", false);
PlaceHolder.Controls.Add(objTree);
} else {
switch (Strings.UCase(controlType)) {
case "SINGLE":
var objSingle = new RadioButtonList();
Expand Down Expand Up @@ -688,7 +688,7 @@ private void CreateInputForm()
}

}
break;
break;
case "ATTRIBUTES":
RepositoryAttributesController attributes = new RepositoryAttributesController();
RepositoryAttributesInfo attribute = null;
Expand Down
Loading

0 comments on commit 6605044

Please sign in to comment.