Skip to content

Commit 6605044

Browse files
valadasvaladas
authored
Merge pull request #44 from DNNCommunity/develop
Merging for 4.1.0 release
2 parents 254be02 + 9c23d71 commit 6605044

13 files changed

Lines changed: 200 additions & 248 deletions

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ DNN [Pp]latform/Syndication/[Bb]in/*
206206
![Ww]ebsite/[Ii]nstall/[Aa]pp_[Ll]ocal[Rr]esources/*.nl-NL.resx
207207

208208
*.zip.manifest
209+
/Resources.zip
209210

210211
############
211212
## Windows

‎App_LocalResources/Settings.ascx.resx‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,12 @@
374374
<data name="plEmailOnComment.Text" xml:space="preserve">
375375
<value>Send Email when Comment Posted</value>
376376
</data>
377+
<data name="plEmailOnDownload.Help" xml:space="preserve">
378+
<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>
379+
</data>
380+
<data name="plEmailOnDownload.Text" xml:space="preserve">
381+
<value>Send Email when user downloads file</value>
382+
</data>
377383
<data name="plEmailOnUpload.Help" xml:space="preserve">
378384
<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>
379385
</data>

‎AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
// </auto-generated>
99
//------------------------------------------------------------------------------
1010

11-
[assembly: System.Reflection.AssemblyVersion("04.00.00.00")]
11+
[assembly: System.Reflection.AssemblyVersion("04.01.00.00")]
1212

1313

‎DotNetNuke.Modules.Repository.csproj‎

Lines changed: 23 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
<Prefer32Bit>false</Prefer32Bit>
7171
</PropertyGroup>
7272
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
73-
<OutputPath>obj\</OutputPath>
73+
<OutputPath>bin\</OutputPath>
7474
<DocumentationFile>DotNetNuke.Modules.Repository.xml</DocumentationFile>
7575
<BaseAddress>285212672</BaseAddress>
7676
<ConfigurationOverrideFile />
@@ -98,23 +98,24 @@
9898
<HintPath>packages\DotNetNuke.Bundle.9.1.1.129\lib\ClientDependency.Core.dll</HintPath>
9999
<Private>False</Private>
100100
</Reference>
101-
<Reference Include="DotNetNuke, Version=9.1.1.3, Culture=neutral, processorArchitecture=MSIL">
102-
<HintPath>packages\DotNetNuke.Core.9.1.1.3\lib\net40\DotNetNuke.dll</HintPath>
101+
<Reference Include="DotNetNuke">
102+
<HintPath>packages\DotNetNuke.Core.9.1.1.129\lib\net40\DotNetNuke.dll</HintPath>
103+
<SpecificVersion>False</SpecificVersion>
103104
<Private>False</Private>
104105
</Reference>
105-
<Reference Include="DotNetNuke.HttpModules, Version=9.1.1.129, Culture=neutral, processorArchitecture=MSIL">
106+
<Reference Include="DotNetNuke.HttpModules">
106107
<HintPath>packages\DotNetNuke.Bundle.9.1.1.129\lib\DotNetNuke.HttpModules.dll</HintPath>
107108
<Private>False</Private>
108109
</Reference>
109-
<Reference Include="DotNetNuke.Instrumentation, Version=9.1.1.3, Culture=neutral, processorArchitecture=MSIL">
110-
<HintPath>packages\DotNetNuke.Instrumentation.9.1.1.3\lib\net40\DotNetNuke.Instrumentation.dll</HintPath>
110+
<Reference Include="DotNetNuke.Instrumentation">
111+
<HintPath>packages\DotNetNuke.Instrumentation.9.1.1.129\lib\net40\DotNetNuke.Instrumentation.dll</HintPath>
111112
<Private>False</Private>
112113
</Reference>
113114
<Reference Include="DotNetNuke.Log4Net, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
114-
<HintPath>packages\DotNetNuke.Instrumentation.9.1.1.3\lib\net40\DotNetNuke.Log4Net.dll</HintPath>
115+
<HintPath>packages\DotNetNuke.Instrumentation.9.1.1.129\lib\net40\DotNetNuke.Log4Net.dll</HintPath>
115116
<Private>False</Private>
116117
</Reference>
117-
<Reference Include="DotNetNuke.Modules.DigitalAssets, Version=9.1.1.129, Culture=neutral, processorArchitecture=MSIL">
118+
<Reference Include="DotNetNuke.Modules.DigitalAssets">
118119
<HintPath>packages\DotNetNuke.Bundle.9.1.1.129\lib\DotNetNuke.Modules.DigitalAssets.dll</HintPath>
119120
<Private>False</Private>
120121
</Reference>
@@ -126,28 +127,28 @@
126127
<HintPath>packages\DotNetNuke.Bundle.9.1.1.129\lib\DotNetNuke.Tests.Utilities.dll</HintPath>
127128
<Private>False</Private>
128129
</Reference>
129-
<Reference Include="DotNetNuke.Web, Version=9.1.1.3, Culture=neutral, processorArchitecture=MSIL">
130-
<HintPath>packages\DotNetNuke.Web.9.1.1.3\lib\net40\DotNetNuke.Web.dll</HintPath>
130+
<Reference Include="DotNetNuke.Web">
131+
<HintPath>packages\DotNetNuke.Web.9.1.1.129\lib\net40\DotNetNuke.Web.dll</HintPath>
131132
<Private>False</Private>
132133
</Reference>
133-
<Reference Include="DotNetNuke.Web.Client, Version=9.1.1.3, Culture=neutral, processorArchitecture=MSIL">
134-
<HintPath>packages\DotNetNuke.Web.Client.9.1.1.3\lib\net40\DotNetNuke.Web.Client.dll</HintPath>
134+
<Reference Include="DotNetNuke.Web.Client">
135+
<HintPath>packages\DotNetNuke.Web.Client.9.1.1.129\lib\net40\DotNetNuke.Web.Client.dll</HintPath>
135136
<Private>False</Private>
136137
</Reference>
137-
<Reference Include="DotNetNuke.Web.Deprecated, Version=9.1.1.3, Culture=neutral, processorArchitecture=MSIL">
138-
<HintPath>packages\DotNetNuke.Web.Deprecated.9.1.1.3\lib\net40\DotNetNuke.Web.Deprecated.dll</HintPath>
138+
<Reference Include="DotNetNuke.Web.Deprecated">
139+
<HintPath>packages\DotNetNuke.Web.Deprecated.9.1.1.129\lib\net40\DotNetNuke.Web.Deprecated.dll</HintPath>
139140
<Private>False</Private>
140141
</Reference>
141-
<Reference Include="DotNetNuke.Web.Mvc, Version=9.1.1.3, Culture=neutral, processorArchitecture=MSIL">
142-
<HintPath>packages\DotNetNuke.Web.Mvc.9.1.1.3\lib\net45\DotNetNuke.Web.Mvc.dll</HintPath>
142+
<Reference Include="DotNetNuke.Web.Mvc">
143+
<HintPath>packages\DotNetNuke.Web.Mvc.9.1.1.129\lib\net45\DotNetNuke.Web.Mvc.dll</HintPath>
143144
<Private>False</Private>
144145
</Reference>
145146
<Reference Include="DotNetNuke.WebControls, Version=2.4.0.598, Culture=neutral, processorArchitecture=MSIL">
146147
<HintPath>packages\DotNetNuke.Bundle.9.1.1.129\lib\DotNetNuke.WebControls.dll</HintPath>
147148
<Private>False</Private>
148149
</Reference>
149150
<Reference Include="DotNetNuke.WebUtility, Version=4.2.1.783, Culture=neutral, processorArchitecture=MSIL">
150-
<HintPath>packages\DotNetNuke.Web.9.1.1.3\lib\net40\DotNetNuke.WebUtility.dll</HintPath>
151+
<HintPath>packages\DotNetNuke.Web.9.1.1.129\lib\net40\DotNetNuke.WebUtility.dll</HintPath>
151152
<Private>False</Private>
152153
</Reference>
153154
<Reference Include="FiftyOne.Foundation, Version=3.2.3.2, Culture=neutral, PublicKeyToken=e967ae578dabd98e, processorArchitecture=MSIL">
@@ -159,9 +160,9 @@
159160
<Private>False</Private>
160161
</Reference>
161162
<Reference Include="Microsoft.VisualBasic" />
162-
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
163-
<HintPath>packages\Newtonsoft.Json.4.5.6\lib\net40\Newtonsoft.Json.dll</HintPath>
164-
<Private>False</Private>
163+
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
164+
<HintPath>packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
165+
<SpecificVersion>False</SpecificVersion>
165166
</Reference>
166167
<Reference Include="System">
167168
<Name>System</Name>
@@ -176,9 +177,8 @@
176177
<Name>System.Drawing</Name>
177178
</Reference>
178179
<Reference Include="System.Net.Http" />
179-
<Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
180-
<HintPath>packages\Microsoft.AspNet.WebApi.Client.4.0.20710.0\lib\net40\System.Net.Http.Formatting.dll</HintPath>
181-
<Private>False</Private>
180+
<Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
181+
<HintPath>packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
182182
</Reference>
183183
<Reference Include="System.Net.Http.WebRequest" />
184184
<Reference Include="System.Runtime.Serialization">
@@ -193,9 +193,6 @@
193193
<Reference Include="System.Web">
194194
<Name>System.Web</Name>
195195
</Reference>
196-
<Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
197-
<Private>False</Private>
198-
</Reference>
199196
<Reference Include="System.Xml">
200197
<Name>System.XML</Name>
201198
</Reference>

‎DotNetNuke_DotNetNuke.Repository.dnn‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<dotnetnuke type="Package" version="5.0">
22
<packages>
3-
<package name="DotNetNuke.Repository" type="Module" version="04.00.00">
3+
<package name="DotNetNuke.Repository" type="Module" version="04.01.00">
44
<friendlyName>Repository</friendlyName>
55
<description>A file/object repository module that includes skinning and community features like comments and user ratings.</description>
66
<iconFile>icon_repository_32px.gif</iconFile>
@@ -321,7 +321,7 @@
321321
</components>
322322
</package>
323323

324-
<package name="DotNetNuke.Repository.Dashboard" type="Module" version="04.00.00">
324+
<package name="DotNetNuke.Repository.Dashboard" type="Module" version="04.01.00">
325325
<friendlyName>Repository Dashboard</friendlyName>
326326
<description></description>
327327
<owner>

‎Form.ascx.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -605,15 +605,15 @@ private void CreateInputForm()
605605
PlaceHolder.Controls.Add(objDeleteButton);
606606
break;
607607
case "CATEGORIES":
608-
RepositoryCategoryController categories = new RepositoryCategoryController();
608+
RepositoryCategoryController categories = new RepositoryCategoryController();
609609
RepositoryCategoryInfo category = null;
610610
RepositoryObjectCategoriesController repositoryObjectCategories = new RepositoryObjectCategoriesController();
611611
RepositoryObjectCategoriesInfo repositoryObjectCategory = null;
612612
object obj = null;
613613
// get control type for categories
614614
string controlType = oRepositoryBusinessController.GetSkinAttribute(xmlDoc, "Categories", "Select", "MULTIPLE");
615615
if (controlType == "TREE") {
616-
var objTree = new DnnTree();
616+
var objTree = new DnnTree();
617617
objTree.ID = "__Categories";
618618
objTree.SystemImagesPath = ResolveUrl("~/images/");
619619
objTree.ImageList.Add(ResolveUrl("~/images/folder.gif"));
@@ -623,9 +623,9 @@ private void CreateInputForm()
623623
objTree.EnableViewState = true;
624624
objTree.CheckBoxes = true;
625625
ArrayList ArrCategories = categories.GetRepositoryCategories(ModuleId, -1);
626-
oRepositoryBusinessController.AddCategoryToTreeObject(ModuleId, itemId, ArrCategories, objTree.TreeNodes[0], "", false);
627-
PlaceHolder.Controls.Add(objTree);
628-
} else {
626+
oRepositoryBusinessController.AddCategoryToTreeObject(ModuleId, itemId, ArrCategories, objTree.TreeNodes, "", false);
627+
PlaceHolder.Controls.Add(objTree);
628+
} else {
629629
switch (Strings.UCase(controlType)) {
630630
case "SINGLE":
631631
var objSingle = new RadioButtonList();
@@ -688,7 +688,7 @@ private void CreateInputForm()
688688
}
689689

690690
}
691-
break;
691+
break;
692692
case "ATTRIBUTES":
693693
RepositoryAttributesController attributes = new RepositoryAttributesController();
694694
RepositoryAttributesInfo attribute = null;

0 commit comments

Comments
 (0)