yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev-v8' into U4-8194

Browse Source 
# Conflicts:
#	src/Umbraco.Web.UI/config/trees.Release.config
#	src/Umbraco.Web.UI/config/trees.config
#	src/Umbraco.Web/Umbraco.Web.csproj
#	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadDictionary.cs
This commit is contained in:
James Coxhead
2016-03-24 20:56:44 +00:00
parent d99aef5ee8 e6a187a3d6
commit efa8bf44f9
263 changed files with 1164 additions and 9902 deletions
Download Patch File Download Diff File Expand all files Collapse all files

271
.gitignore vendored
View File

@@ -1,135 +1,136 @@
*.obj
*.pdb
*.user
*.aps
*.pch
*.vspscc
.DS_Store
._.DS_Store
[Bb]in
[Db]ebug*/
obj/
[Rr]elease*/
_ReSharper*/
_NCrunch_*/
*.ncrunchsolution
*.ncrunchsolution.user
*.ncrunchproject
*.crunchsolution.cache
[Tt]est[Rr]esult*
[Bb]uild[Ll]og.*
*.[Pp]ublish.xml
*.suo
[sS]ource
[sS]andbox
umbraco.config
*.vs10x
App_Data/TEMP/*
[Uu]mbraco/[Pp]resentation/[Uu]mbraco/[Pp]lugins/*
[Uu]mbraco/[Pp]resentation/[Uu]ser[Cc]ontrols/*
[Uu]mbraco/[Pp]resentation/[Ss]cripts/*
[Uu]mbraco/[Pp]resentation/[Ff]onts/*
[Uu]mbraco/[Pp]resentation/[Cc]ss/*
src/Umbraco.Web.UI/[Cc]ss/*
src/Umbraco.Web.UI/App_Code/*
src/Umbraco.Web.UI/App_Data/*
src/Umbraco.Tests/App_Data/*
src/Umbraco.Web.UI/[Mm]edia/*
src/Umbraco.Web.UI/[Mm]aster[Pp]ages/*
src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/*
!src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/[Ww]eb.[Cc]onfig
src/Umbraco.Web.UI/[Xx]slt/*
src/Umbraco.Web.UI/[Ii]mages/*
src/Umbraco.Web.UI/[Ss]cripts/*
src/Umbraco.Web.UI/Web.*.config.transformed
umbraco/presentation/umbraco/plugins/uComponents/uComponentsInstaller.ascx
umbraco/presentation/packages/uComponents/MultiNodePicker/CustomTreeService.asmx
_BuildOutput/*
*.ncrunchsolution
build/UmbracoCms.AllBinaries*zip
build/UmbracoCms.WebPI*zip
build/UmbracoCms*zip
build/UmbracoExamine.PDF*zip
build/*.nupkg
src/Umbraco.Tests/config/applications.config
src/Umbraco.Tests/config/trees.config
src/Umbraco.Web.UI/web.config
*.orig
src/Umbraco.Tests/config/404handlers.config
src/Umbraco.Web.UI/[Vv]iews/*.cshtml
src/Umbraco.Web.UI/[Vv]iews/*.vbhtml
src/Umbraco.Tests/[Cc]onfig/umbracoSettings.config
src/Umbraco.Web.UI/[Vv]iews/*
src/packages/
src/packages/repositories.config
src/Umbraco.Web.UI/[Ww]eb.config
*.transformed
webpihash.txt
node_modules
src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/umbraco.*
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.dev.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.dev.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.panel.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.palettes.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.loader.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.front.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.config.js
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.css
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
src/Umbraco.Web.UI.Client/[Bb]uild/*
src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/
build/_BuildOutput/
src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
tools/NDepend/
src/Umbraco.Web.UI/App_Plugins/*
src/*.psess
src/*.vspx
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js.*
NDependOut/*
*.ndproj
QueryResult.htm
*.ndproj
src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
src/Umbraco.Web.UI/[Cc]onfig/appSettings.config
src/Umbraco.Web.UI/[Cc]onfig/connectionStrings.config
src/Umbraco.Web.UI/umbraco/plugins/*
src/Umbraco.Web.UI/umbraco/js/init.js
build/ApiDocs/*
build/ApiDocs/Output/*
src/Umbraco.Web.UI.Client/bower_components/*
/src/Umbraco.Web.UI/Umbraco/preview
#Ignore Rule for output of generated documentation files from Grunt docserve
src/Umbraco.Web.UI.Client/docs/api
src/*.boltdata/
/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.loader.js
/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.palettes.js
/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.panel.js
/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.config.js
/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.front.js
src/umbraco.sln.ide/*
build/UmbracoCms.*/
src/.vs/
src/Umbraco.Web.UI/umbraco/js/install.loader.js
src/Umbraco.Web.UI/js/*
*.obj
*.pdb
*.user
*.aps
*.pch
*.vspscc
.DS_Store
._.DS_Store
[Bb]in
[Db]ebug*/
obj/
[Rr]elease*/
_ReSharper*/
_NCrunch_*/
*.ncrunchsolution
*.ncrunchsolution.user
*.ncrunchproject
*.crunchsolution.cache
[Tt]est[Rr]esult*
[Bb]uild[Ll]og.*
*.[Pp]ublish.xml
*.suo
[sS]ource
[sS]andbox
umbraco.config
*.vs10x
App_Data/TEMP/*
[Uu]mbraco/[Pp]resentation/[Uu]mbraco/[Pp]lugins/*
[Uu]mbraco/[Pp]resentation/[Uu]ser[Cc]ontrols/*
[Uu]mbraco/[Pp]resentation/[Ss]cripts/*
[Uu]mbraco/[Pp]resentation/[Ff]onts/*
[Uu]mbraco/[Pp]resentation/[Cc]ss/*
src/Umbraco.Web.UI/[Cc]ss/*
src/Umbraco.Web.UI/App_Code/*
src/Umbraco.Web.UI/App_Data/*
src/Umbraco.Tests/App_Data/*
src/Umbraco.Web.UI/[Mm]edia/*
src/Umbraco.Web.UI/[Mm]aster[Pp]ages/*
src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/*
!src/Umbraco.Web.UI/[Mm]acro[Ss]cripts/[Ww]eb.[Cc]onfig
src/Umbraco.Web.UI/[Xx]slt/*
src/Umbraco.Web.UI/[Ii]mages/*
src/Umbraco.Web.UI/[Ss]cripts/*
src/Umbraco.Web.UI/Web.*.config.transformed
umbraco/presentation/umbraco/plugins/uComponents/uComponentsInstaller.ascx
umbraco/presentation/packages/uComponents/MultiNodePicker/CustomTreeService.asmx
_BuildOutput/*
*.ncrunchsolution
build/UmbracoCms.AllBinaries*zip
build/UmbracoCms.WebPI*zip
build/UmbracoCms*zip
build/UmbracoExamine.PDF*zip
build/*.nupkg
src/Umbraco.Tests/config/applications.config
src/Umbraco.Tests/config/trees.config
src/Umbraco.Web.UI/web.config
*.orig
src/Umbraco.Tests/config/404handlers.config
src/Umbraco.Web.UI/[Vv]iews/*.cshtml
src/Umbraco.Web.UI/[Vv]iews/*.vbhtml
src/Umbraco.Tests/[Cc]onfig/umbracoSettings.config
src/Umbraco.Web.UI/[Vv]iews/*
src/packages/
src/packages/repositories.config
src/Umbraco.Web.UI/[Ww]eb.config
*.transformed
webpihash.txt
node_modules
src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/umbraco.*
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.dev.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/loader.dev.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.panel.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.palettes.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.loader.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.front.js
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/tuning.config.js
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.css
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
src/Umbraco.Web.UI.Client/[Bb]uild/*
src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/
build/_BuildOutput/
src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
tools/NDepend/
src/Umbraco.Web.UI/App_Plugins/*
src/*.psess
src/*.vspx
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/routes.js.*
NDependOut/*
*.ndproj
QueryResult.htm
*.ndproj
src/Umbraco.Web.UI/[Uu]mbraco/[Aa]ssets/*
src/Umbraco.Web.UI/[Uu]mbraco/[Ll]ib/*
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.html
src/Umbraco.Web.UI/[Uu]mbraco/[Vv]iews/**/*.js
src/Umbraco.Web.UI/[Cc]onfig/appSettings.config
src/Umbraco.Web.UI/[Cc]onfig/connectionStrings.config
src/Umbraco.Web.UI/umbraco/plugins/*
src/Umbraco.Web.UI/umbraco/js/init.js
build/ApiDocs/*
build/ApiDocs/Output/*
src/Umbraco.Web.UI.Client/bower_components/*
/src/Umbraco.Web.UI/Umbraco/preview
#Ignore Rule for output of generated documentation files from Grunt docserve
src/Umbraco.Web.UI.Client/docs/api
src/*.boltdata/
/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.loader.js
/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.palettes.js
/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.panel.js
/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.config.js
/src/Umbraco.Web.UI/Umbraco/Js/canvasdesigner.front.js
src/umbraco.sln.ide/*
build/UmbracoCms.*/
src/.vs/
src/Umbraco.Web.UI/umbraco/js/install.loader.js
src/Umbraco.Web.UI/js/*
src/Umbraco.Tests/media

34
build/NuSpecs/UmbracoCms.Core.nuspec
View File

@@ -21,7 +21,7 @@
<dependency id="Microsoft.Owin.Security.Cookies" version="[3.0.1, 4.0.0)" />
<dependency id="Microsoft.Owin.Security.OAuth" version="[3.0.1, 4.0.0)" />
<dependency id="Microsoft.Owin.Host.SystemWeb" version="[3.0.1, 4.0.0)" />
<dependency id="MiniProfiler" version="[2.1.0, 3.0.0)" />
<dependency id="MiniProfiler" version="[3.2.0.157, 4.0.0)" />
<dependency id="HtmlAgilityPack" version="[1.4.9, 2.0.0)" />
<dependency id="Lucene.Net" version="[2.9.4.1, 3.0.0.0)" />
<dependency id="SharpZipLib" version="[0.86.0, 1.0.0)" />
@@ -29,44 +29,38 @@
<dependency id="xmlrpcnet" version="[2.5.0, 3.0.0)" />
<dependency id="ClientDependency" version="[1.8.4, 2.0.0)" />
<dependency id="ClientDependency-Mvc5" version="[1.8.0, 2.0.0)" />
<dependency id="AutoMapper" version="[3.0.0, 3.1.0)" />
<dependency id="Newtonsoft.Json" version="[6.0.8, 9.0.0)" />
<dependency id="AutoMapper" version="[4.2.1, 5.0.0)" />
<dependency id="LightInject" version="[4.0.8, 5.0.0)" />
<dependency id="LightInject.Mvc" version="[1.0.0.4, 2.0.0)" />
<dependency id="LightInject.Web" version="[1.0.0.7, 2.0.0)" />
<dependency id="LightInject.WebApi" version="[1.0.0.4, 2.0.0)" />
<dependency id="Newtonsoft.Json" version="[8.0.3, 9.0.0)" />
<dependency id="Examine" version="[0.1.68, 1.0.0)" />
<dependency id="ImageProcessor" version="[2.3.3, 3.0.0)" />
<dependency id="ImageProcessor.Web" version="[4.5.3, 5.0.0)" />
<dependency id="semver" version="[1.1.2, 2.0.0)" />
<dependency id="UrlRewritingNet" version="[2.0.7, 3.0.0)" />
<dependency id="Markdown" version="[1.14.4, 2.0.0)" />
<dependency id="Markdown" version="[1.14.4, 2.0.0)" />
<dependency id="log4net" version="[2.0.5, 3.0.0)" />
</dependencies>
</metadata>
<files>
<file src="..\_BuildOutput\WebApp\bin\businesslogic.dll" target="lib\businesslogic.dll" />
<file src="..\_BuildOutput\WebApp\bin\businesslogic.xml" target="lib\businesslogic.xml" />
<file src="..\_BuildOutput\WebApp\bin\cms.dll" target="lib\cms.dll" />
<file src="..\_BuildOutput\WebApp\bin\cms.xml" target="lib\cms.xml" />
<file src="..\_BuildOutput\WebApp\bin\controls.dll" target="lib\controls.dll" />
<file src="..\_BuildOutput\WebApp\bin\controls.xml" target="lib\controls.xml" />
<file src="..\_BuildOutput\WebApp\bin\interfaces.dll" target="lib\interfaces.dll" />
<file src="..\_BuildOutput\WebApp\bin\interfaces.xml" target="lib\interfaces.xml" />
<file src="..\_BuildOutput\WebApp\bin\log4net.dll" target="lib\log4net.dll" />
<file src="..\_BuildOutput\WebApp\bin\Microsoft.ApplicationBlocks.Data.dll" target="lib\Microsoft.ApplicationBlocks.Data.dll" />
<file src="..\_BuildOutput\WebApp\bin\SQLCE4Umbraco.dll" target="lib\SQLCE4Umbraco.dll" />
<file src="..\_BuildOutput\WebApp\bin\SQLCE4Umbraco.xml" target="lib\SQLCE4Umbraco.xml" />
<file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.dll" target="lib\System.Data.SqlServerCe.dll" />
<file src="..\_BuildOutput\WebApp\bin\System.Data.SqlServerCe.Entity.dll" target="lib\System.Data.SqlServerCe.Entity.dll" />
<file src="..\_BuildOutput\WebApp\bin\TidyNet.dll" target="lib\TidyNet.dll" />
<file src="..\_BuildOutput\WebApp\bin\Umbraco.Core.dll" target="lib\Umbraco.Core.dll" />
<file src="..\_BuildOutput\WebApp\bin\Umbraco.Core.xml" target="lib\Umbraco.Core.xml" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.DataLayer.dll" target="lib\umbraco.DataLayer.dll" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.DataLayer.xml" target="lib\umbraco.DataLayer.xml" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.dll" target="lib\umbraco.dll" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.xml" target="lib\umbraco.xml" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.editorControls.dll" target="lib\umbraco.editorControls.dll" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.editorControls.xml" target="lib\umbraco.editorControls.xml" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.dll" target="lib\umbraco.MacroEngines.dll" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.MacroEngines.xml" target="lib\umbraco.MacroEngines.xml" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.providers.dll" target="lib\umbraco.providers.dll" />
<file src="..\_BuildOutput\WebApp\bin\umbraco.providers.xml" target="lib\umbraco.providers.xml" />
<file src="..\_BuildOutput\WebApp\bin\Umbraco.Web.UI.dll" target="lib\Umbraco.Web.UI.dll" />
<file src="..\_BuildOutput\WebApp\bin\Umbraco.Web.UI.xml" target="lib\Umbraco.Web.UI.xml" />
<file src="..\_BuildOutput\WebApp\bin\UmbracoExamine.dll" target="lib\UmbracoExamine.dll" />
@@ -76,24 +70,14 @@
<!-- Added to be able to produce a symbols package -->
<file src="..\_BuildOutput\bin\SQLCE4Umbraco.pdb" target="lib" />
<file src="..\..\src\SQLCE4Umbraco\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\SQLCE4Umbraco" />
<file src="..\_BuildOutput\bin\businesslogic.pdb" target="lib" />
<file src="..\..\src\umbraco.businesslogic\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.businesslogic" />
<file src="..\_BuildOutput\bin\cms.pdb" target="lib" />
<file src="..\..\src\umbraco.cms\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.cms" />
<file src="..\_BuildOutput\bin\controls.pdb" target="lib" />
<file src="..\..\src\umbraco.controls\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.controls" />
<file src="..\_BuildOutput\bin\interfaces.pdb" target="lib" />
<file src="..\..\src\umbraco.interfaces\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.interfaces" />
<file src="..\_BuildOutput\bin\Umbraco.Core.pdb" target="lib" />
<file src="..\..\src\Umbraco.Core\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Core" />
<file src="..\_BuildOutput\bin\umbraco.DataLayer.pdb" target="lib" />
<file src="..\..\src\umbraco.datalayer\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.datalayer" />
<file src="..\_BuildOutput\bin\umbraco.editorControls.pdb" target="lib" />
<file src="..\..\src\umbraco.editorControls\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.editorControls" />
<file src="..\_BuildOutput\bin\umbraco.MacroEngines.pdb" target="lib" />
<file src="..\..\src\umbraco.MacroEngines\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.MacroEngines" />
<file src="..\_BuildOutput\bin\umbraco.providers.pdb" target="lib" />
<file src="..\..\src\umbraco.providers\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\umbraco.providers" />
<file src="..\_BuildOutput\bin\umbraco.pdb" target="lib" />
<file src="..\..\src\Umbraco.Web\**\*.cs" exclude="..\..\src\**\TemporaryGeneratedFile*.cs" target="src\Umbraco.Web" />
<file src="..\_BuildOutput\bin\Umbraco.Web.UI.pdb" target="lib" />

2
build/NuSpecs/UmbracoCms.nuspec
View File

@@ -17,7 +17,7 @@
<dependencies>
<dependency id="UmbracoCms.Core" version="[$version$]" />
<dependency id="Newtonsoft.Json" version="[6.0.8, 9.0.0)" />
<dependency id="Umbraco.ModelsBuilder" version="[3.0.1, 4.0.0)" />
<dependency id="Umbraco.ModelsBuilder" version="[3.0.2, 4.0.0)" />
</dependencies>
</metadata>
<files>

2
src/SQLCE4Umbraco/app.config
View File

@@ -4,7 +4,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />

4
src/SolutionInfo.cs
View File

@@ -11,5 +11,5 @@ using System.Resources;
[assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyFileVersion("7.4.1")]
[assembly: AssemblyInformationalVersion("7.4.1")]
[assembly: AssemblyFileVersion("7.4.3")]
[assembly: AssemblyInformationalVersion("7.4.3")]

12
src/Umbraco.Core/Cache/FullDataSetRepositoryCachePolicy.cs
View File

@@ -163,17 +163,7 @@ namespace Umbraco.Core.Cache
return entityCollection;
}
/// <summary>
/// For this type of caching policy, we don't cache individual items
/// </summary>
/// <param name="cacheKey"></param>
/// <param name="entity"></param>
protected void SetCacheAction(string cacheKey, TEntity entity)
{
//No-op
}
/// <summary>
/// Sets the action to execute on disposal for an entity collection
/// </summary>

32
src/Umbraco.Core/Configuration/UmbracoSettings/CustomBooleanTypeConverter.cs
View File

@@ -1,32 +0,0 @@
using System;
using System.ComponentModel;
namespace Umbraco.Core.Configuration.UmbracoSettings
{
/// <summary>
/// Allows for converting string representations of 0 and 1 to boolean
/// </summary>
internal class CustomBooleanTypeConverter : BooleanConverter
{
public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
{
if (sourceType == typeof(string))
{
return true;
}
return base.CanConvertFrom(context, sourceType);
}
public override object ConvertFrom(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value)
{
if (value is string)
{
var str = (string)value;
if (str == "1") return true;
if (str == "0" || str == "") return false;
}
return base.ConvertFrom(context, culture, value);
}
}
}

62
src/Umbraco.Core/Configuration/UmbracoSettings/LinkElement.cs
View File

@@ -1,62 +0,0 @@
using System.Configuration;
namespace Umbraco.Core.Configuration.UmbracoSettings
{
internal class LinkElement : ConfigurationElement, ILink
{
[ConfigurationProperty("application")]
internal string Application
{
get { return (string)base["application"]; }
}
[ConfigurationProperty("applicationUrl")]
internal string ApplicationUrl
{
get { return (string)base["applicationUrl"]; }
}
[ConfigurationProperty("language")]
internal string Language
{
get { return (string)base["language"]; }
}
[ConfigurationProperty("userType")]
internal string UserType
{
get { return (string)base["userType"]; }
}
[ConfigurationProperty("helpUrl")]
internal string HelpUrl
{
get { return (string)base["helpUrl"]; }
}
string ILink.Application
{
get { return Application; }
}
string ILink.ApplicationUrl
{
get { return ApplicationUrl; }
}
string ILink.Language
{
get { return Language; }
}
string ILink.UserType
{
get { return UserType; }
}
string ILink.HelpUrl
{
get { return HelpUrl; }
}
}
}

34
src/Umbraco.Core/Configuration/UmbracoSettings/LinksCollection.cs
View File

@@ -1,34 +0,0 @@
using System.Collections.Generic;
using System.Configuration;
namespace Umbraco.Core.Configuration.UmbracoSettings
{
internal class LinksCollection : ConfigurationElementCollection, IEnumerable<ILink>
{
protected override ConfigurationElement CreateNewElement()
{
return new LinkElement();
}
protected override object GetElementKey(ConfigurationElement element)
{
return ((LinkElement)element).Application
+ ((LinkElement)element).ApplicationUrl
+ ((LinkElement)element).Language
+ ((LinkElement)element).UserType;
}
IEnumerator<ILink> IEnumerable<ILink>.GetEnumerator()
{
for (var i = 0; i < Count; i++)
{
yield return BaseGet(i) as ILink;
}
}
System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
{
return GetEnumerator();
}
}
}

5
src/Umbraco.Core/Constants-Applications.cs
View File

@@ -107,6 +107,11 @@
public const string Languages = "languages";
/// <summary>
/// alias for the user types tree.
/// </summary>
public const string UserTypes = "userTypes";
//TODO: Fill in the rest!
}
}

7
src/Umbraco.Core/Constants-Web.cs
View File

@@ -4,7 +4,7 @@ using System.ComponentModel;
namespace Umbraco.Core
{
public static partial class Constants
{
{
/// <summary>
/// Defines the identifiers for Umbraco system nodes.
/// </summary>
@@ -54,5 +54,10 @@ namespace Umbraco.Core
public const string SessionIdClaimType = "http://umbraco.org/2015/02/identity/claims/backoffice/sessionid";
}
public static class IO
{
public const string MediaFileSystemProvider = "media";
}
}
}

46
src/Umbraco.Core/ControlExtensions.cs
View File

@@ -1,46 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Web.UI;
namespace Umbraco.Core
{
internal static class ControlExtensions
{
/// <summary>
/// Recursively finds a control with the specified identifier.
/// </summary>
/// <typeparam name="T">
/// The type of control to be found.
/// </typeparam>
/// <param name="parent">
/// The parent control from which the search will start.
/// </param>
/// <param name="id">
/// The identifier of the control to be found.
/// </param>
/// <returns>
/// The control with the specified identifier, otherwise <see langword="null"/> if the control
/// is not found.
/// </returns>
public static T FindControlRecursive<T>(this Control parent, string id) where T : Control
{
if ((parent is T) && (parent.ID == id))
{
return (T)parent;
}
foreach (Control control in parent.Controls)
{
var foundControl = FindControlRecursive<T>(control, id);
if (foundControl != null)
{
return foundControl;
}
}
return default(T);
}
}
}

25
src/Umbraco.Core/CoreBootManager.cs
View File

@@ -28,6 +28,8 @@ using Umbraco.Core.PropertyEditors;
using Umbraco.Core.Publishing;
using Umbraco.Core.Macros;
using Umbraco.Core.Manifest;
using Umbraco.Core.Models.Identity;
using Umbraco.Core.Models.Membership;
using Umbraco.Core.Services;
using Umbraco.Core.Sync;
using Umbraco.Core.Strings;
@@ -183,6 +185,9 @@ namespace Umbraco.Core
//Data Services/ServiceContext/etc...
container.RegisterFrom<ServicesCompositionRoot>();
//ModelMappers
container.RegisterFrom<CoreModelMappersCompositionRoot>();
container.RegisterSingleton<IServiceProvider, ActivatorServiceProvider>();
container.RegisterSingleton<PluginManager>(factory => PluginManager);
@@ -221,22 +226,18 @@ namespace Umbraco.Core
}
/// <summary>
/// This method allows for configuration of model mappers
/// </summary>
/// <remarks>
/// Model mappers MUST be defined on ApplicationEventHandler instances with the interface IMapperConfiguration.
/// This allows us to search for less types on startup.
/// </remarks>
/// This method initializes all of the model mappers registered in the container
/// </summary>
protected void InitializeModelMappers()
{
Mapper.Initialize(configuration =>
{
//foreach (var m in ApplicationEventsResolver.Current.ApplicationEventHandlers.OfType<IMapperConfiguration>())
foreach (var m in Container.GetAllInstances<ModelMapperConfiguration>())
{
//foreach (var m in ApplicationEventsResolver.Current.ApplicationEventHandlers.OfType<IMapperConfiguration>())
foreach (var m in _appStartupEvtContainer.GetAllInstances<IApplicationEventHandler>().OfType<IMapperConfiguration>())
{
m.ConfigureMappings(configuration, ApplicationContext);
}
});
m.ConfigureMappings(configuration, ApplicationContext);
}
});
}
/// <summary>

13
src/Umbraco.Core/DependencyInjection/CoreModelMappersCompositionRoot.cs Normal file
View File

@@ -0,0 +1,13 @@
using LightInject;
using Umbraco.Core.Models.Identity;
namespace Umbraco.Core.DependencyInjection
{
public sealed class CoreModelMappersCompositionRoot : ICompositionRoot
{
public void Compose(IServiceRegistry container)
{
container.Register<IdentityModelMappings>();
}
}
}

1
src/Umbraco.Core/DependencyInjection/ServicesCompositionRoot.cs
View File

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.IO;
using System.Linq;
using LightInject;

69
src/Umbraco.Core/Dynamics/ExtensionMethods.cs
View File

@@ -1,69 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Umbraco.Core.Models;
namespace Umbraco.Core.Dynamics
{
[Obsolete("This class should not be used, it is just referenced by already obsoleted code and will be removed in the future")]
internal static class ExtensionMethods
{
//public static IEnumerable<TSource> Map<TSource>(
// this IEnumerable<TSource> source,
// Func<TSource, bool> selectorFunction,
// Func<TSource, IEnumerable<TSource>> getChildrenFunction)
//{
// if (!source.Any())
// {
// return source;
// }
// // Add what we have to the stack
// var flattenedList = source.Where(selectorFunction);
// // Go through the input enumerable looking for children,
// // and add those if we have them
// foreach (TSource element in source)
// {
// var secondInner = getChildrenFunction(element);
// if (secondInner.Any())
// {
// secondInner = secondInner.Map(selectorFunction, getChildrenFunction);
// }
// flattenedList = flattenedList.Concat(secondInner);
// }
// return flattenedList;
//}
[Obsolete("This method should not be used and will be removed in the future")]
public static bool ContainsAny(this string haystack, IEnumerable<string> needles)
{
return StringExtensions.ContainsAny(haystack, needles);
}
[Obsolete("This method should not be used and will be removed in the future")]
public static bool ContainsAny(this string haystack, params string[] needles)
{
return StringExtensions.ContainsAny(haystack, needles);
}
[Obsolete("This method should not be used and will be removed in the future")]
public static bool ContainsAny(this string haystack, StringComparison comparison, IEnumerable<string> needles)
{
return StringExtensions.ContainsAny(haystack, needles, comparison);
}
[Obsolete("This method should not be used and will be removed in the future")]
public static bool ContainsAny(this string haystack, StringComparison comparison, params string[] needles)
{
return StringExtensions.ContainsAny(haystack, needles, comparison);
}
[Obsolete("This method should not be used and will be removed in the future")]
public static bool ContainsInsensitive(this string haystack, string needle)
{
if (haystack == null) throw new ArgumentNullException("haystack");
return haystack.IndexOf(needle, StringComparison.CurrentCultureIgnoreCase) >= 0;
}
[Obsolete("This method should not be used and will be removed in the future")]
public static bool HasValue(this string s)
{
return !string.IsNullOrWhiteSpace(s);
}
}
}

13
src/Umbraco.Core/IO/FileSystemProviderConstants.cs
View File

@@ -1,13 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Umbraco.Core.CodeAnnotations;
namespace Umbraco.Core.IO
{
internal class FileSystemProviderConstants
{
public const string Media = "media";
}
}

41
src/Umbraco.Core/IO/IOHelper.cs
View File

@@ -114,33 +114,6 @@ namespace Umbraco.Core.IO
}
}
[Obsolete("Use Umbraco.Web.Templates.TemplateUtilities.ResolveUrlsFromTextString instead, this method on this class will be removed in future versions")]
internal static string ResolveUrlsFromTextString(string text)
{
if (UmbracoConfig.For.UmbracoSettings().Content.ResolveUrlsFromTextString)
{
using (DisposableTimer.DebugDuration(typeof(IOHelper), "ResolveUrlsFromTextString starting", "ResolveUrlsFromTextString complete"))
{
// find all relative urls (ie. urls that contain ~)
var tags = ResolveUrlPattern.Matches(text);
foreach (Match tag in tags)
{
string url = "";
if (tag.Groups[1].Success)
url = tag.Groups[1].Value;
if (String.IsNullOrEmpty(url) == false)
{
string resolvedUrl = (url.Substring(0, 1) == "/") ? ResolveUrl(url.Substring(1)) : ResolveUrl(url);
text = text.Replace(url, resolvedUrl);
}
}
}
}
return text;
}
public static string MapPath(string path, bool useHttpContext)
{
// Check if the path is already mapped
@@ -254,20 +227,6 @@ namespace Umbraco.Core.IO
return false;
}
/// <summary>
/// Validates that the current filepath matches one of several directories where the user is allowed to edit a file.
/// </summary>
/// <param name="filePath">The filepath to validate.</param>
/// <param name="validDirs">The valid directories.</param>
/// <returns>True, if the filepath is valid, else an exception is thrown.</returns>
/// <exception cref="FileSecurityException">The filepath is invalid.</exception>
internal static bool ValidateEditPath(string filePath, IEnumerable<string> validDirs)
{
if (VerifyEditPath(filePath, validDirs) == false)
throw new FileSecurityException(String.Format("The filepath '{0}' is not within an allowed directory for this type of files", filePath.Replace(MapPath(SystemDirectories.Root), "")));
return true;
}
/// <summary>
/// Verifies that the current filepath has one of several authorized extensions.
/// </summary>

16
src/Umbraco.Core/IO/SystemFiles.cs
View File

@@ -11,15 +11,6 @@ namespace Umbraco.Core.IO
{
public class SystemFiles
{
[Obsolete("This file is no longer used and should not be accessed!")]
public static string AccessXml
{
get
{
return SystemDirectories.Data + "/access.config";
}
}
public static string CreateUiXml
{
get
@@ -71,11 +62,6 @@ namespace Umbraco.Core.IO
return IOHelper.ReturnPath("umbracoContentXML", "~/App_Data/umbraco.config");
}
}
[Obsolete("Use GlobalSettings.ContentCacheXmlStoredInCodeGen instead")]
internal static bool ContentCacheXmlStoredInCodeGen
{
get { return GlobalSettings.ContentCacheXmlStoredInCodeGen; }
}
}
}

35
src/Umbraco.Core/IO/ViewHelper.cs
View File

@@ -20,30 +20,7 @@ namespace Umbraco.Core.IO
internal bool ViewExists(ITemplate t)
{
return _viewFileSystem.FileExists(ViewPath(t.Alias));
}
[Obsolete("This is only used for legacy purposes and will be removed in future versions")]
internal string GetPhysicalFilePath(ITemplate t)
{
return _viewFileSystem.GetFullPath(ViewPath(t.Alias));
}
internal string GetFileContents(ITemplate t)
{
string viewContent = "";
string path = ViewPath(t.Alias);
if (_viewFileSystem.FileExists(path))
{
using (var tr = new StreamReader(_viewFileSystem.OpenFile(path)))
{
viewContent = tr.ReadToEnd();
tr.Close();
}
}
return viewContent;
}
}
public string CreateView(ITemplate t, bool overWrite = false)
{
@@ -158,16 +135,6 @@ namespace Umbraco.Core.IO
return t.Content;
}
internal void RemoveViewFile(string alias)
{
if (string.IsNullOrWhiteSpace(alias) == false)
{
var file = ViewPath(alias);
if (_viewFileSystem.FileExists(file))
_viewFileSystem.DeleteFile(file);
}
}
public string ViewPath(string alias)
{
return _viewFileSystem.GetRelativePath(alias.Replace(" ", "") + ".cshtml");

22
src/Umbraco.Core/Logging/Logger.cs
View File

@@ -37,28 +37,6 @@ namespace Umbraco.Core.Logging
{
return new Logger();
}
///<summary>
/// Returns a logger for the type specified
///</summary>
///<typeparam name="T"></typeparam>
///<returns></returns>
internal ILog LoggerFor<T>()
{
return LogManager.GetLogger(typeof(T));
}
/// <summary>
/// Returns a logger for the object's type
/// </summary>
/// <param name="getTypeFromInstance"></param>
/// <returns></returns>
internal ILog LoggerFor(object getTypeFromInstance)
{
if (getTypeFromInstance == null) throw new ArgumentNullException("getTypeFromInstance");
return LogManager.GetLogger(getTypeFromInstance.GetType());
}
public void Error(Type callingType, string message, Exception exception)
{

11
src/Umbraco.Core/Logging/LoggerResolver.cs
View File

@@ -14,16 +14,7 @@ namespace Umbraco.Core.Logging
: base(logger)
{
}
/// <summary>
/// Method allowing to change the logger during startup
/// </summary>
/// <param name="profiler"></param>
internal void SetLogger(ILogger profiler)
{
Value = profiler;
}
}
/// <summary>
/// Gets the current logger

68
src/Umbraco.Core/Macros/PersistableMacroProperty.cs
View File

@@ -1,68 +0,0 @@
using System;
using System.Collections;
namespace Umbraco.Core.Macros
{
/// <summary>
/// NOTE: This is legacy code, might require a cleanup
/// </summary>
[Serializable]
internal class PersistableMacroProperty
{
#region Private Fields
private string _name;
private string _alias;
private string _value;
private string _assemblyName;
private string _typeName;
#endregion
#region Properties
/// <summary>
/// Macro Caption
/// </summary>
public string Name
{
get { return _name; }
set { _name = value; }
}
/// <summary>
/// Macro Alias
/// </summary>
public string Alias
{
get { return _alias; }
set { _alias = value; }
}
/// <summary>
/// Macro Value
/// </summary>
public string Value
{
get { return _value; }
set { _value = value; }
}
/// <summary>
/// AssemblyName of the Property of teh Macro
/// </summary>
public string AssemblyName
{
get { return _assemblyName; }
set { _assemblyName = value; }
}
/// <summary>
/// TypeName of the property of the macro
/// </summary>
public string TypeName
{
get { return _typeName; }
set { _typeName = value; }
}
#endregion
}
}

38
src/Umbraco.Core/Media/Exif/ExifExceptions.cs
View File

@@ -19,25 +19,7 @@ namespace Umbraco.Core.Media.Exif
{
;
}
}
/// <summary>
/// The exception that is thrown when the IFD section ID could not be understood.
/// </summary>
internal class UnknownIFDSectionException : Exception
{
public UnknownIFDSectionException()
: base("Unknown IFD section.")
{
;
}
public UnknownIFDSectionException(string message)
: base(message)
{
;
}
}
}
/// <summary>
/// The exception that is thrown when an invalid enum type is given to an
@@ -57,22 +39,4 @@ namespace Umbraco.Core.Media.Exif
;
}
}
/// <summary>
/// The exception that is thrown when the 0th IFD section does not contain any fields.
/// </summary>
internal class IFD0IsEmptyException : Exception
{
public IFD0IsEmptyException()
: base("0th IFD section cannot be empty.")
{
;
}
public IFD0IsEmptyException(string message)
: base(message)
{
;
}
}
}

18
src/Umbraco.Core/Media/Exif/JPEGExceptions.cs
View File

@@ -2,24 +2,6 @@
namespace Umbraco.Core.Media.Exif
{
/// <summary>
/// The exception that is thrown when the format of the image file
/// could not be understood.
/// </summary>
internal class UnknownImageFormatException : Exception
{
public UnknownImageFormatException()
: base("Unkown image format.")
{
;
}
public UnknownImageFormatException(string message)
: base(message)
{
;
}
}
/// <summary>
/// The exception that is thrown when the format of the image file

15
src/Umbraco.Core/ModelMapperHelper.cs
View File

@@ -1,15 +0,0 @@
using AutoMapper;
namespace Umbraco.Core
{
/// <summary>
/// Helper class for static model mapping with automapper
/// </summary>
internal static class ModelMapperHelper
{
internal static IMappingExpression<TSource, TSource> SelfMap<TSource>(this IConfiguration config)
{
return config.CreateMap<TSource, TSource>();
}
}
}

28
src/Umbraco.Core/Models/IMacroPropertyType.cs
View File

@@ -1,28 +0,0 @@
namespace Umbraco.Core.Models
{
/// <summary>
/// Defines a PropertyType (plugin) for a Macro
/// </summary>
internal interface IMacroPropertyType
{
/// <summary>
/// Gets the unique Alias of the Property Type
/// </summary>
string Alias { get; }
/// <summary>
/// Gets the name of the Assembly used to render the Property Type
/// </summary>
string RenderingAssembly { get; }
/// <summary>
/// Gets the name of the Type used to render the Property Type
/// </summary>
string RenderingType { get; }
/// <summary>
/// Gets the Base Type for storing the PropertyType (Int32, String, Boolean)
/// </summary>
MacroPropertyTypeBaseTypes BaseType { get; }
}
}

18
src/Umbraco.Core/Models/Identity/IdentityModelMappings.cs
View File

@@ -1,21 +1,20 @@
using System;
using System.Linq;
using AutoMapper;
using Umbraco.Core.Models.Mapping;
using Umbraco.Core.Models.Membership;
using Umbraco.Core.Security;
namespace Umbraco.Core.Models.Identity
{
public class IdentityModelMappings : MapperConfiguration
public class IdentityModelMappings : ModelMapperConfiguration
{
public override void ConfigureMappings(IConfiguration config, ApplicationContext applicationContext)
public override void ConfigureMappings(IMapperConfiguration config, ApplicationContext applicationContext)
{
config.CreateMap<IUser, BackOfficeIdentityUser>()
.ForMember(user => user.Email, expression => expression.MapFrom(user => user.Email))
.ForMember(user => user.Id, expression => expression.MapFrom(user => user.Id))
.ForMember(user => user.LockoutEndDateUtc, expression => expression.MapFrom(user => user.IsLockedOut ? DateTime.MaxValue.ToUniversalTime() : (DateTime?)null))
.ForMember(user => user.LockoutEndDateUtc, expression => expression.MapFrom(user => user.IsLockedOut ? DateTime.MaxValue.ToUniversalTime() : (DateTime?) null))
.ForMember(user => user.UserName, expression => expression.MapFrom(user => user.Username))
.ForMember(user => user.PasswordHash, expression => expression.MapFrom(user => GetPasswordHash(user.RawPasswordValue)))
.ForMember(user => user.Culture, expression => expression.MapFrom(user => user.GetUserCulture(applicationContext.Services.TextService)))
@@ -24,7 +23,16 @@ namespace Umbraco.Core.Models.Identity
.ForMember(user => user.StartContentId, expression => expression.MapFrom(user => user.StartContentId))
.ForMember(user => user.UserTypeAlias, expression => expression.MapFrom(user => user.UserType.Alias))
.ForMember(user => user.AccessFailedCount, expression => expression.MapFrom(user => user.FailedPasswordAttempts))
.ForMember(user => user.AllowedSections, expression => expression.MapFrom(user => user.AllowedSections.ToArray()));
.ForMember(user => user.AllowedSections, expression => expression.MapFrom(user => user.AllowedSections.ToArray()))
.ForMember(user => user.LockoutEnabled, expression => expression.Ignore())
.ForMember(user => user.Logins, expression => expression.Ignore())
.ForMember(user => user.LoginsChanged, expression => expression.Ignore())
.ForMember(user => user.EmailConfirmed, expression => expression.Ignore())
.ForMember(user => user.PhoneNumber, expression => expression.Ignore())
.ForMember(user => user.PhoneNumberConfirmed, expression => expression.Ignore())
.ForMember(user => user.TwoFactorEnabled, expression => expression.Ignore())
.ForMember(user => user.Roles, expression => expression.Ignore())
.ForMember(user => user.Claims, expression => expression.Ignore());
config.CreateMap<BackOfficeIdentityUser, UserData>()
.ConstructUsing((BackOfficeIdentityUser user) => new UserData(Guid.NewGuid().ToString("N"))) //this is the 'session id'

20
src/Umbraco.Core/Models/MacroPropertyTypeBaseTypes.cs
View File

@@ -1,20 +0,0 @@
using System;
using System.Runtime.Serialization;
namespace Umbraco.Core.Models
{
/// <summary>
/// Enum for the three allowed BaseTypes
/// </summary>
[Serializable]
[DataContract(IsReference = true)]
internal enum MacroPropertyTypeBaseTypes
{
[EnumMember]
Int32,
[EnumMember]
Boolean,
[EnumMember]
String
}
}

22
src/Umbraco.Core/Models/Mapping/IMapperConfiguration.cs
View File

@@ -1,22 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using AutoMapper;
namespace Umbraco.Core.Models.Mapping
{
/// <summary>
/// This is used to explicitly decorate any ApplicationEventHandler class if there are
/// AutoMapper configurations defined.
/// </summary>
/// <remarks>
/// All automapper configurations are done during startup
/// inside an Automapper Initialize call which is better for performance
/// </remarks>
public interface IMapperConfiguration : IApplicationEventHandler
{
void ConfigureMappings(IConfiguration config, ApplicationContext applicationContext);
}
}

20
src/Umbraco.Core/Models/Mapping/MappingExpressionExtensions.cs
View File

@@ -1,20 +0,0 @@
using AutoMapper;
namespace Umbraco.Core.Models.Mapping
{
internal static class MappingExpressionExtensions
{
/// <summary>
/// Ignores all unmapped members by default - Use with caution!
/// </summary>
/// <typeparam name="TSource"></typeparam>
/// <typeparam name="TDest"></typeparam>
/// <param name="expression"></param>
/// <returns></returns>
public static IMappingExpression<TSource, TDest> IgnoreAllUnmapped<TSource, TDest>(this IMappingExpression<TSource, TDest> expression)
{
expression.ForAllMembers(opt => opt.Ignore());
return expression;
}
}
}

32
src/Umbraco.Core/Models/Mapping/MapperConfiguration.cs → src/Umbraco.Core/Models/Mapping/ModelMapperConfiguration.cs
View File

@@ -1,17 +1,17 @@
using AutoMapper;
namespace Umbraco.Core.Models.Mapping
{
/// <summary>
/// Used to declare a mapper configuration
/// </summary>
/// <remarks>
/// Use this class if your mapper configuration isn't also explicitly an ApplicationEventHandler.
/// </remarks>
public abstract class MapperConfiguration : ApplicationEventHandler, IMapperConfiguration
{
public abstract void ConfigureMappings(IConfiguration config, ApplicationContext applicationContext);
}
using AutoMapper;
namespace Umbraco.Core.Models.Mapping
{
/// <summary>
/// Used to declare a mapper configuration
/// </summary>
/// <remarks>
/// Use this class if your mapper configuration isn't also explicitly an ApplicationEventHandler.
/// </remarks>
public abstract class ModelMapperConfiguration
{
public abstract void ConfigureMappings(IMapperConfiguration config, ApplicationContext applicationContext);
}
}

20
src/Umbraco.Core/Models/Membership/UserGroup.cs
View File

@@ -1,20 +0,0 @@
using System;
using System.Runtime.Serialization;
using Umbraco.Core.Models.EntityBase;
namespace Umbraco.Core.Models.Membership
{
/// <summary>
/// Represents a Group for a Backoffice User
/// </summary>
/// <remarks>
/// Should be internal until a proper user/membership implementation
/// is part of the roadmap.
/// </remarks>
[Serializable]
[DataContract(IsReference = true)]
internal class UserGroup : Entity
{
//Add UserCollection ?
}
}

18
src/Umbraco.Core/Packaging/PackageBuilding.cs
View File

@@ -1,18 +0,0 @@
using Umbraco.Core.Services;
namespace Umbraco.Core.Packaging
{
internal interface IPackageBuilding
{
}
internal class PackageBuilding : IPackageBuilding
{
private readonly IPackagingService _packagingService;
public PackageBuilding(IPackagingService packagingService)
{
_packagingService = packagingService;
}
}
}

35
src/Umbraco.Core/Persistence/Factories/UserSectionFactory.cs
View File

@@ -1,35 +0,0 @@
using System.Collections.Generic;
using System.Linq;
using AutoMapper;
using Umbraco.Core.Models;
using Umbraco.Core.Models.Membership;
using Umbraco.Core.Models.Rdbms;
namespace Umbraco.Core.Persistence.Factories
{
internal class UserSectionFactory
{
private readonly IUser _user;
public UserSectionFactory(IUser user)
{
_user = user;
}
public IEnumerable<string> BuildEntity(IEnumerable<User2AppDto> dto)
{
return dto.Select(x => x.AppAlias);
}
public IEnumerable<User2AppDto> BuildDto(IEnumerable<string> entity)
{
return entity.Select(x => new User2AppDto
{
//NOTE: We're force casting to int here! this might not work in the future
UserId = (int)_user.Id,
AppAlias = x
});
}
}
}

1
src/Umbraco.Core/Persistence/Migrations/Initial/BaseDataCreation.cs
View File

@@ -174,6 +174,7 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
_database.Insert("umbracoUser2app", "user", false, new User2AppDto { UserId = 0, AppAlias = Constants.Applications.Settings });
_database.Insert("umbracoUser2app", "user", false, new User2AppDto { UserId = 0, AppAlias = Constants.Applications.Users });
_database.Insert("umbracoUser2app", "user", false, new User2AppDto { UserId = 0, AppAlias = Constants.Applications.Forms });
_database.Insert("umbracoUser2app", "user", false, new User2AppDto { UserId = 0, AppAlias = Constants.Applications.Translation });
}
private void CreateCmsPropertyTypeGroupData()

2
src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/MovePublicAccessXmlDataToDb.cs
View File

@@ -29,7 +29,7 @@ namespace Umbraco.Core.Persistence.Migrations.Upgrades.TargetVersionSevenThreeZe
if (dataExists.Any()) return;
}
var xmlFile = IOHelper.MapPath(SystemFiles.AccessXml);
var xmlFile = IOHelper.MapPath(SystemDirectories.Data + "/access.config");
if (File.Exists(xmlFile) == false) return;

1
src/Umbraco.Core/Persistence/Repositories/Interfaces/INotificationsRepository.cs
View File

@@ -13,5 +13,6 @@ namespace Umbraco.Core.Persistence.Repositories
int DeleteNotifications(IUser user, IEntity entity);
IEnumerable<Notification> GetEntityNotifications(IEntity entity);
IEnumerable<Notification> GetUserNotifications(IUser user);
IEnumerable<Notification> SetNotifications(IUser user, IEntity entity, string[] actions);
}
}

12
src/Umbraco.Core/Persistence/Repositories/NotificationsRepository.cs
View File

@@ -36,6 +36,18 @@ namespace Umbraco.Core.Persistence.Repositories
return dtos.Select(d => new Notification(d.id, d.userId, d.action, d.nodeObjectType)).ToList();
}
public IEnumerable<Notification> SetNotifications(IUser user, IEntity entity, string[] actions)
{
var notifications = new List<Notification>();
using (var t = _unitOfWork.Database.GetTransaction())
{
DeleteNotifications(user, entity);
notifications.AddRange(actions.Select(action => CreateNotification(user, entity, action)));
t.Complete();
}
return notifications;
}
public IEnumerable<Notification> GetEntityNotifications(IEntity entity)
{
var sql = new Sql()

52
src/Umbraco.Core/PluginManager.cs
View File

@@ -524,16 +524,7 @@ namespace Umbraco.Core
internal IEnumerable<Type> ResolveAssignedMapperTypes()
{
return ResolveTypesWithAttribute<BaseMapper, MapperForAttribute>();
}
/// <summary>
/// Returns all SqlSyntaxProviders with the SqlSyntaxProviderAttribute
/// </summary>
/// <returns></returns>
internal IEnumerable<Type> ResolveSqlSyntaxProviders()
{
return ResolveTypesWithAttribute<ISqlSyntaxProvider, SqlSyntaxProviderAttribute>();
}
}
/// <summary>
/// Gets/sets which assemblies to scan when type finding, generally used for unit testing, if not explicitly set
@@ -543,46 +534,7 @@ namespace Umbraco.Core
{
get { return _assemblies ?? (_assemblies = TypeFinder.GetAssembliesWithKnownExclusions()); }
set { _assemblies = value; }
}
/// <summary>
/// Used to resolve and create instances of the specified type based on the resolved/cached plugin types
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="throwException">set to true if an exception is to be thrown if there is an error during instantiation</param>
/// <param name="cacheResult"></param>
/// <param name="specificAssemblies"></param>
/// <returns></returns>
internal IEnumerable<T> FindAndCreateInstances<T>(bool throwException = false, bool cacheResult = true, IEnumerable<Assembly> specificAssemblies = null)
{
var types = ResolveTypes<T>(cacheResult, specificAssemblies);
return CreateInstances<T>(types, throwException);
}
/// <summary>
/// Used to create instances of the specified type based on the resolved/cached plugin types
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="types"></param>
/// <param name="throwException">set to true if an exception is to be thrown if there is an error during instantiation</param>
/// <returns></returns>
internal IEnumerable<T> CreateInstances<T>(IEnumerable<Type> types, bool throwException = false)
{
return _serviceProvider.CreateInstances<T>(types, _logger.Logger, throwException);
}
/// <summary>
/// Used to create an instance of the specified type based on the resolved/cached plugin types
/// </summary>
/// <typeparam name="T"></typeparam>
/// <param name="type"></param>
/// <param name="throwException"></param>
/// <returns></returns>
internal T CreateInstance<T>(Type type, bool throwException = false)
{
var instances = CreateInstances<T>(new[] { type }, throwException);
return instances.FirstOrDefault();
}
}
private IEnumerable<Type> ResolveTypes<T>(
Func<IEnumerable<Type>> finder,

20
src/Umbraco.Core/Security/AuthenticationExtensions.cs
View File

@@ -169,25 +169,7 @@ namespace Umbraco.Core.Security
{
if (http == null) throw new ArgumentNullException("http");
Logout(http, UmbracoConfig.For.UmbracoSettings().Security.AuthCookieName);
}
/// <summary>
/// This clears the forms authentication cookie for webapi since cookies are handled differently
/// </summary>
/// <param name="response"></param>
[Obsolete("Use OWIN IAuthenticationManager.SignOut instead", true)]
[EditorBrowsable(EditorBrowsableState.Never)]
public static void UmbracoLogoutWebApi(this HttpResponseMessage response)
{
throw new NotSupportedException("This method is not supported and should not be used, it has been removed in Umbraco 7.4");
}
[Obsolete("Use WebSecurity.SetPrincipalForRequest", true)]
[EditorBrowsable(EditorBrowsableState.Never)]
public static FormsAuthenticationTicket UmbracoLoginWebApi(this HttpResponseMessage response, IUser user)
{
throw new NotSupportedException("This method is not supported and should not be used, it has been removed in Umbraco 7.4");
}
}
/// <summary>
/// This clears the forms authentication cookie

11
src/Umbraco.Core/Services/INotificationService.cs
View File

@@ -72,6 +72,17 @@ namespace Umbraco.Core.Services
/// <param name="entity"></param>
void DeleteNotifications(IUser user, IEntity entity);
/// <summary>
/// Sets the specific notifications for the user and entity
/// </summary>
/// <param name="user"></param>
/// <param name="entity"></param>
/// <param name="actions"></param>
/// <remarks>
/// This performs a full replace
/// </remarks>
IEnumerable<Notification> SetNotifications(IUser user, IEntity entity, string[] actions);
/// <summary>
/// Creates a new notification
/// </summary>

16
src/Umbraco.Core/Services/NotificationService.cs
View File

@@ -174,6 +174,22 @@ namespace Umbraco.Core.Services
repository.DeleteNotifications(user, entity);
}
/// <summary>
/// Sets the specific notifications for the user and entity
/// </summary>
/// <param name="user"></param>
/// <param name="entity"></param>
/// <param name="actions"></param>
/// <remarks>
/// This performs a full replace
/// </remarks>
public IEnumerable<Notification> SetNotifications(IUser user, IEntity entity, string[] actions)
{
var uow = _uowProvider.GetUnitOfWork();
var repository = _repositoryFactory.CreateNotificationsRepository(uow);
return repository.SetNotifications(user, entity, actions);
}
/// <summary>
/// Creates a new notification
/// </summary>

7
src/Umbraco.Core/Services/UserService.cs
View File

@@ -146,9 +146,10 @@ namespace Umbraco.Core.Services
IsLockedOut = false,
IsApproved = true
};
//adding default sections content and media
user.AddAllowedSection("content");
user.AddAllowedSection("media");
//adding default sections content, media + translation
user.AddAllowedSection(Constants.Applications.Content);
user.AddAllowedSection(Constants.Applications.Media);
user.AddAllowedSection(Constants.Applications.Translation);
if (SavingUser.IsRaisedEventCancelled(new SaveEventArgs<IUser>(user), this))
return user;

46
src/Umbraco.Core/TypeHelper.cs
View File

@@ -16,17 +16,7 @@ namespace Umbraco.Core
private static readonly ConcurrentDictionary<Type, FieldInfo[]> GetFieldsCache = new ConcurrentDictionary<Type, FieldInfo[]>();
private static readonly ConcurrentDictionary<Tuple<Type, bool, bool, bool>, PropertyInfo[]> GetPropertiesCache = new ConcurrentDictionary<Tuple<Type, bool, bool, bool>, PropertyInfo[]>();
/// <summary>
/// Checks if the method is actually overriding a base method
/// </summary>
/// <param name="m"></param>
/// <returns></returns>
public static bool IsOverride(MethodInfo m)
{
return m.GetBaseDefinition().DeclaringType != m.DeclaringType;
}
/// <summary>
/// Find all assembly references that are referencing the assignTypeFrom Type's assembly found in the assemblyList
/// </summary>
@@ -167,24 +157,7 @@ namespace Umbraco.Core
if (implementation == null) throw new ArgumentNullException("implementation");
return IsTypeAssignableFrom<TContract>(implementation.GetType());
}
/// <summary>
/// A method to determine whether <paramref name="implementation"/> represents a value type.
/// </summary>
/// <param name="implementation">The implementation.</param>
public static bool IsValueType(Type implementation)
{
return implementation.IsValueType || implementation.IsPrimitive;
}
/// <summary>
/// A method to determine whether <paramref name="implementation"/> is an implied value type (<see cref="Type.IsValueType"/>, <see cref="Type.IsEnum"/> or a string).
/// </summary>
/// <param name="implementation">The implementation.</param>
public static bool IsImplicitValueType(Type implementation)
{
return IsValueType(implementation) || implementation.IsEnum || implementation == typeof (string);
}
/// <summary>
/// Returns (and caches) a PropertyInfo from a type
@@ -211,21 +184,6 @@ namespace Umbraco.Core
});
}
/// <summary>
/// Gets (and caches) <see cref="FieldInfo"/> discoverable in the current <see cref="AppDomain"/> for a given <paramref name="type"/>.
/// </summary>
/// <param name="type">The source.</param>
/// <returns></returns>
public static FieldInfo[] CachedDiscoverableFields(Type type)
{
return GetFieldsCache.GetOrAdd(
type,
x => type
.GetFields(BindingFlags.Public | BindingFlags.Instance)
.Where(y => !y.IsInitOnly)
.ToArray());
}
/// <summary>
/// Gets (and caches) <see cref="PropertyInfo"/> discoverable in the current <see cref="AppDomain"/> for a given <paramref name="type"/>.
/// </summary>

32
src/Umbraco.Core/Umbraco.Core.csproj
View File

@@ -37,8 +37,8 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="AutoMapper, Version=4.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
<HintPath>..\packages\AutoMapper.4.1.1\lib\net45\AutoMapper.dll</HintPath>
<Reference Include="AutoMapper, Version=4.2.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
<HintPath>..\packages\AutoMapper.4.2.1\lib\net45\AutoMapper.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="HtmlAgilityPack, Version=1.4.9.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
@@ -48,8 +48,8 @@
<Reference Include="ICSharpCode.SharpZipLib">
<HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="LightInject, Version=4.0.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LightInject.4.0.3\lib\net46\LightInject.dll</HintPath>
<Reference Include="LightInject, Version=4.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LightInject.4.0.8\lib\net46\LightInject.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
@@ -88,8 +88,8 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MySql.Data.6.9.8\lib\net45\MySql.Data.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Owin">
@@ -174,9 +174,9 @@
<Compile Include="Cache\DeepCloneRuntimeCacheProvider.cs" />
<Compile Include="CodeAnnotations\FriendlyNameAttribute.cs" />
<Compile Include="CodeAnnotations\UmbracoObjectTypeAttribute.cs" />
<Compile Include="CodeAnnotations\UmbracoProposedPublicAttribute.cs" />
<Compile Include="CodeAnnotations\UmbracoWillObsoleteAttribute.cs" />
<Compile Include="CodeAnnotations\UmbracoExperimentalFeatureAttribute.cs" />
<Compile Include="CodeAnnotations\UmbracoProposedPublicAttribute.cs" />
<Compile Include="Collections\DeepCloneableList.cs" />
<Compile Include="Collections\ListCloneBehavior.cs" />
<Compile Include="ConcurrentHashSet.cs" />
@@ -225,7 +225,6 @@
<Compile Include="Configuration\UmbracoSettings\ImagingAutoFillUploadFieldElement.cs" />
<Compile Include="Configuration\UmbracoSettings\ContentImagingElement.cs" />
<Compile Include="Configuration\UmbracoSettings\ContentScriptEditorElement.cs" />
<Compile Include="Configuration\UmbracoSettings\CustomBooleanTypeConverter.cs" />
<Compile Include="Configuration\UmbracoSettings\DeveloperElement.cs" />
<Compile Include="Configuration\UmbracoSettings\DisabledLogTypesCollection.cs" />
<Compile Include="Configuration\UmbracoSettings\DistributedCallElement.cs" />
@@ -253,8 +252,6 @@
<Compile Include="Configuration\UmbracoSettings\ITemplatesSection.cs" />
<Compile Include="Configuration\UmbracoSettings\IUmbracoSettingsSection.cs" />
<Compile Include="Configuration\UmbracoSettings\IWebRoutingSection.cs" />
<Compile Include="Configuration\UmbracoSettings\LinkElement.cs" />
<Compile Include="Configuration\UmbracoSettings\LinksCollection.cs" />
<Compile Include="Configuration\UmbracoSettings\LoggingElement.cs" />
<Compile Include="Configuration\UmbracoSettings\LogTypeElement.cs" />
<Compile Include="Configuration\UmbracoSettings\NotificationsElement.cs" />
@@ -281,13 +278,13 @@
<Compile Include="Attempt.cs" />
<Compile Include="Constants-Examine.cs" />
<Compile Include="Constants-Icons.cs" />
<Compile Include="ControlExtensions.cs" />
<Compile Include="CoreBootManager.cs" />
<Compile Include="DatabaseContext.cs" />
<Compile Include="DataTableExtensions.cs" />
<Compile Include="DateTimeExtensions.cs" />
<Compile Include="DelegateExtensions.cs" />
<Compile Include="DependencyInjection\ConfigurationCompositionRoot.cs" />
<Compile Include="DependencyInjection\CoreModelMappersCompositionRoot.cs" />
<Compile Include="DependencyInjection\RepositoryCompositionRoot.cs" />
<Compile Include="DependencyInjection\ServicesCompositionRoot.cs" />
<Compile Include="DictionaryExtensions.cs" />
@@ -362,7 +359,6 @@
<Compile Include="Models\IMigrationEntry.cs" />
<Compile Include="Models\IPublishedContentWithKey.cs" />
<Compile Include="Models\IServerRegistration.cs" />
<Compile Include="Models\Mapping\MappingExpressionExtensions.cs" />
<Compile Include="Models\MigrationEntry.cs" />
<Compile Include="Models\PartialViewType.cs" />
<Compile Include="Models\PublicAccessEntry.cs" />
@@ -542,7 +538,6 @@
<Compile Include="Manifest\PropertyEditorConverter.cs" />
<Compile Include="Media\ImageHelper.cs" />
<Compile Include="Media\MediaSubfolderCounter.cs" />
<Compile Include="ModelMapperHelper.cs" />
<Compile Include="Models\ContentBase.cs" />
<Compile Include="Models\ContentExtensions.cs" />
<Compile Include="Enum.cs" />
@@ -593,7 +588,6 @@
<Compile Include="Packaging\Models\InstallationSummary.cs" />
<Compile Include="Packaging\Models\MetaData.cs" />
<Compile Include="Packaging\Models\PackageAction.cs" />
<Compile Include="Packaging\PackageBuilding.cs" />
<Compile Include="Packaging\PackageExtraction.cs" />
<Compile Include="Packaging\PackageInstallation.cs" />
<Compile Include="Packaging\PackageBinaryInspector.cs" />
@@ -671,7 +665,6 @@
<Compile Include="Models\ILanguage.cs" />
<Compile Include="Models\IMacro.cs" />
<Compile Include="Models\IMacroProperty.cs" />
<Compile Include="Models\IMacroPropertyType.cs" />
<Compile Include="Models\ITag.cs" />
<Compile Include="Models\Macro.cs" />
<Compile Include="Models\PublishedContent\PublishedContentExtended.cs" />
@@ -679,13 +672,11 @@
<Compile Include="Models\PublishedContent\PublishedContentExtensionsForModels.cs" />
<Compile Include="Models\MacroProperty.cs" />
<Compile Include="Models\MacroPropertyCollection.cs" />
<Compile Include="Models\MacroPropertyTypeBaseTypes.cs" />
<Compile Include="Models\MacroTypes.cs" />
<Compile Include="Models\PublishedContent\PublishedContentWrapped.cs" />
<Compile Include="Models\PublishedContent\PublishedContentType.cs" />
<Compile Include="Models\PublishedContent\PublishedPropertyType.cs" />
<Compile Include="Models\Mapping\IMapperConfiguration.cs" />
<Compile Include="Models\Mapping\MapperConfiguration.cs" />
<Compile Include="Models\Mapping\ModelMapperConfiguration.cs" />
<Compile Include="Models\Membership\EntityPermission.cs" />
<Compile Include="Models\IMember.cs" />
<Compile Include="Models\IMemberType.cs" />
@@ -710,7 +701,6 @@
<Compile Include="Models\Membership\IUser.cs" />
<Compile Include="Models\Membership\IUserType.cs" />
<Compile Include="Models\Membership\User.cs" />
<Compile Include="Models\Membership\UserGroup.cs" />
<Compile Include="Models\Membership\UserType.cs" />
<Compile Include="Models\PropertyExtensions.cs" />
<Compile Include="Models\PublishedItemType.cs" />
@@ -743,7 +733,6 @@
<Compile Include="Persistence\Factories\ServerRegistrationFactory.cs" />
<Compile Include="Persistence\Factories\TagFactory.cs" />
<Compile Include="Persistence\Factories\UmbracoEntityFactory.cs" />
<Compile Include="Persistence\Factories\UserSectionFactory.cs" />
<Compile Include="Persistence\FaultHandling\ITransientErrorDetectionStrategy.cs" />
<Compile Include="Persistence\FaultHandling\RetryingEventArgs.cs" />
<Compile Include="Persistence\FaultHandling\RetryLimitExceededException.cs" />
@@ -1094,7 +1083,6 @@
<Compile Include="Dynamics\DynamicQueryableGetMemberBinder.cs" />
<Compile Include="Dynamics\DynamicXml.cs" />
<Compile Include="Dynamics\ExtensionMethodFinder.cs" />
<Compile Include="Dynamics\ExtensionMethods.cs" />
<Compile Include="Dynamics\PropertyResultType.cs" />
<Compile Include="IO\FileSystemProviderAttribute.cs" />
<Compile Include="IO\FileSystemExtensions.cs" />
@@ -1185,7 +1173,6 @@
<Compile Include="Logging\AsynchronousRollingFileAppender.cs" />
<Compile Include="Logging\LoggingTaskExtension.cs" />
<Compile Include="Logging\LogHelper.cs" />
<Compile Include="Macros\PersistableMacroProperty.cs" />
<Compile Include="ObjectExtensions.cs" />
<Compile Include="ObjectResolution\ManyObjectsResolverBase.cs" />
<Compile Include="ObjectResolution\ObjectLifetimeScope.cs" />
@@ -1356,7 +1343,6 @@
<Compile Include="IfExtensions.cs" />
<Compile Include="PluginManager.cs" />
<Compile Include="IO\FileSecurityException.cs" />
<Compile Include="IO\FileSystemProviderConstants.cs" />
<Compile Include="IO\FileSystemProviderManager.cs" />
<Compile Include="IO\IFileSystem.cs" />
<Compile Include="IO\IOHelper.cs" />

4
src/Umbraco.Core/Xml/XPath/MacroNavigator.cs
View File

@@ -971,10 +971,6 @@ namespace Umbraco.Core.Xml.XPath
ParameterNavigator
};
// gets the state
// for unit tests only
internal State InternalState { get { return _state; } }
// represents the XPathNavigator state
internal class State
{

2
src/Umbraco.Core/app.config
View File

@@ -4,7 +4,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" culture="neutral" />

6
src/Umbraco.Core/packages.config
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AutoMapper" version="4.1.1" targetFramework="net461" />
<package id="AutoMapper" version="4.2.1" targetFramework="net461" />
<package id="HtmlAgilityPack" version="1.4.9" targetFramework="net45" />
<package id="LightInject" version="4.0.3" targetFramework="net461" />
<package id="LightInject" version="4.0.8" targetFramework="net461" />
<package id="log4net" version="2.0.5" targetFramework="net461" />
<package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net45" />
<package id="Microsoft.AspNet.Identity.Owin" version="2.2.1" targetFramework="net45" />
@@ -12,7 +12,7 @@
<package id="Microsoft.Owin.Security.OAuth" version="3.0.1" targetFramework="net45" />
<package id="MiniProfiler" version="3.2.0.157" targetFramework="net461" />
<package id="MySql.Data" version="6.9.8" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net461" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="semver" version="1.1.2" targetFramework="net461" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net4" />

2
src/Umbraco.Tests/App.config
View File

@@ -124,7 +124,7 @@
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>

3
src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config
View File

@@ -60,9 +60,6 @@
<!-- http://our.umbraco.org/documentation/using-umbraco/config-files/umbracoSettings/#Providers -->
<providers/>
<!-- http://our.umbraco.org/documentation/using-umbraco/config-files/umbracoSettings/#Help -->
<help/>
<!-- http://our.umbraco.org/documentation/using-umbraco/config-files/umbracoSettings/#WebRouting -->
<web.routing/>

20
src/Umbraco.Tests/CoreXml/NavigableNavigatorTests.cs
View File

@@ -1002,25 +1002,7 @@ namespace Umbraco.Tests.CoreXml
Root = new TestRootContent(type).WithChildren(1);
}
}
class TestSource3 : TestSourceBase
{
public TestSource3()
{
LastAttributeIndex = 1;
var prop1 = new TestPropertyType("prop1");
var prop2 = new TestPropertyType("prop2");
var prop3 = new TestPropertyType("prop3");
var type = new TestRootContentType(this, prop1, prop2);
var type1 = type.CreateType("type1", prop3);
Content[1] = new TestContent(type1, 1, 1).WithValues("1:p1", "1:p2", "1:p3").WithChildren(2);
Content[2] = new TestContent(type1, 2, 1).WithValues("2:p1", "2:p2", "2:p3");
Root = new TestRootContent(type).WithChildren(1);
}
}
class TestSource4 : TestSourceBase
{

3
src/Umbraco.Tests/IO/FileSystemProviderManagerTests.cs
View File

@@ -4,6 +4,7 @@ using System.IO;
using System.Linq;
using System.Text;
using NUnit.Framework;
using Umbraco.Core;
using Umbraco.Core.IO;
using Umbraco.Tests.TestHelpers;
@@ -23,7 +24,7 @@ namespace Umbraco.Tests.IO
[Test]
public void Can_Get_Base_File_System()
{
var fs = FileSystemProviderManager.Current.GetUnderlyingFileSystemProvider(FileSystemProviderConstants.Media);
var fs = FileSystemProviderManager.Current.GetUnderlyingFileSystemProvider(Constants.IO.MediaFileSystemProvider);
Assert.NotNull(fs);
}

136
src/Umbraco.Tests/Macros/MacroEngineFactoryTests.cs
View File

@@ -1,136 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Moq;
using NUnit.Framework;
using umbraco.cms.businesslogic.macro;
using Umbraco.Core;
using Umbraco.Core.Cache;
using Umbraco.Core.Logging;
using Umbraco.Core.Profiling;
using Umbraco.Core.Models;
namespace Umbraco.Tests.Macros
{
[TestFixture]
public class MacroEngineFactoryTests
{
[SetUp]
public void Initialize()
{
var logger = new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>());
//this ensures its reset
PluginManager.Current = new PluginManager(new ActivatorServiceProvider(), new NullCacheProvider(),
logger,
false)
{
AssembliesToScan = new[]
{
this.GetType().Assembly
}
};
//for testing, we'll specify which assemblies are scanned for the PluginTypeResolver
}
[TearDown]
public void TearDown()
{
PluginManager.Current = null;
}
[Test]
public void Get_All()
{
var engines = MacroEngineFactory.GetAll();
Assert.AreEqual(2, engines.Count);
}
[Test]
public void Get_Engine()
{
var engine1 = MacroEngineFactory.GetEngine("MacroEngine1");
Assert.IsNotNull(engine1);
}
[Test]
public void Get_By_Filename()
{
var engine1 = MacroEngineFactory.GetByFilename("test.me1");
var engine2 = MacroEngineFactory.GetByFilename("test.me2");
Assert.IsNotNull(engine1);
Assert.IsNotNull(engine2);
Assert.Throws<MacroEngineException>(() => MacroEngineFactory.GetByFilename("test.blah"));
}
[Test]
public void Get_By_Extension()
{
var engine1 = MacroEngineFactory.GetByExtension("me1");
var engine2 = MacroEngineFactory.GetByExtension("me2");
Assert.IsNotNull(engine1);
Assert.IsNotNull(engine2);
Assert.Throws<MacroEngineException>(() => MacroEngineFactory.GetByExtension("blah"));
}
#region Classes for tests
public class MacroEngine1 : IMacroEngine
{
public string Name
{
get { return "MacroEngine1"; }
}
public IEnumerable<string> SupportedExtensions
{
get { return new[] {"me1"}; }
}
public IEnumerable<string> SupportedUIExtensions
{
get { throw new NotImplementedException(); }
}
public bool Validate(string code, string tempFileName, IPublishedContent currentPage, out string errorMessage)
{
throw new NotImplementedException();
}
public string Execute(MacroModel macro, IPublishedContent currentPage)
{
throw new NotImplementedException();
}
}
public class MacroEngine2 : IMacroEngine
{
public string Name
{
get { return "MacroEngine2"; }
}
public IEnumerable<string> SupportedExtensions
{
get { return new[] { "me2" }; }
}
public IEnumerable<string> SupportedUIExtensions
{
get { throw new NotImplementedException(); }
}
public bool Validate(string code, string tempFileName, IPublishedContent currentPage, out string errorMessage)
{
throw new NotImplementedException();
}
public string Execute(MacroModel macro, IPublishedContent currentPage)
{
throw new NotImplementedException();
}
}
#endregion
}
}

15
src/Umbraco.Tests/Models/Mapping/AutoMapperTests.cs
View File

@@ -1,10 +1,12 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using AutoMapper;
using Moq;
using NUnit.Framework;
using Umbraco.Core.Logging;
using Umbraco.Core.Manifest;
using Umbraco.Core.PropertyEditors;
using Umbraco.Tests.TestHelpers;
@@ -20,14 +22,15 @@ namespace Umbraco.Tests.Models.Mapping
protected override void FreezeResolution()
{
Func<IEnumerable<Type>> typeListProducerList = Enumerable.Empty<Type>;
var propertyEditorResolver = new Mock<PropertyEditorResolver>(
//ctor args
Mock.Of<IServiceProvider>(),
Mock.Of<ILogger>(),
var propertyEditorResolver = new PropertyEditorResolver(
Container,
Logger,
typeListProducerList,
Umbraco.Core.CacheHelper.CreateDisabledCacheHelper().RuntimeCache);
new ManifestBuilder(
Core.CacheHelper.CreateDisabledCacheHelper().RuntimeCache,
new ManifestParser(Logger, new DirectoryInfo(TestHelper.CurrentAssemblyDirectory), Core.CacheHelper.CreateDisabledCacheHelper().RuntimeCache)));
PropertyEditorResolver.Current = propertyEditorResolver.Object;
PropertyEditorResolver.Current = propertyEditorResolver;
base.FreezeResolution();
}

14
src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
View File

@@ -30,6 +30,8 @@ using umbraco.BusinessLogic;
using Umbraco.Core.DependencyInjection;
using Umbraco.Core.Persistence.Mappers;
using Umbraco.Core.Events;
using Umbraco.Core.Models.Identity;
using Umbraco.Web.DependencyInjection;
using ObjectExtensions = Umbraco.Core.ObjectExtensions;
namespace Umbraco.Tests.TestHelpers
@@ -97,6 +99,10 @@ namespace Umbraco.Tests.TestHelpers
{
var settings = SettingsForTests.GetDefault();
//register mappers
Container.RegisterFrom<CoreModelMappersCompositionRoot>();
Container.RegisterFrom<WebModelMappersCompositionRoot>();
Container.Register<IServiceContainer>(factory => Container);
Container.Register<PluginManager>(factory => PluginManager.Current);
@@ -105,7 +111,7 @@ namespace Umbraco.Tests.TestHelpers
//register basic stuff that might need to be there for some container resolvers to work, we can
// add more to this in base classes in resolution freezing
Container.Register<ILogger>(factory => Logger);
Container.RegisterSingleton<ILogger>(factory => Logger);
Container.Register<CacheHelper>(factory => CacheHelper);
Container.Register<ProfilingLogger>(factory => ProfilingLogger);
Container.RegisterSingleton<IUmbracoSettingsSection>(factory => SettingsForTests.GetDefault());
@@ -157,11 +163,7 @@ namespace Umbraco.Tests.TestHelpers
{
Mapper.Initialize(configuration =>
{
var mappers = PluginManager.Current.FindAndCreateInstances<IMapperConfiguration>(
specificAssemblies: new[]
{
typeof(ContentModelMapper).Assembly
});
var mappers = Container.GetAllInstances<ModelMapperConfiguration>();
foreach (var mapper in mappers)
{
mapper.ConfigureMappings(configuration, ApplicationContext);

13
src/Umbraco.Tests/Umbraco.Tests.csproj
View File

@@ -51,8 +51,8 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="AutoMapper, Version=4.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
<HintPath>..\packages\AutoMapper.4.1.1\lib\net45\AutoMapper.dll</HintPath>
<Reference Include="AutoMapper, Version=4.2.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
<HintPath>..\packages\AutoMapper.4.2.1\lib\net45\AutoMapper.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Examine, Version=0.1.68.0, Culture=neutral, processorArchitecture=MSIL">
@@ -63,8 +63,8 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="LightInject, Version=4.0.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LightInject.4.0.3\lib\net46\LightInject.dll</HintPath>
<Reference Include="LightInject, Version=4.0.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\LightInject.4.0.8\lib\net46\LightInject.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="log4net, Version=1.2.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
@@ -90,8 +90,8 @@
<Reference Include="Moq">
<HintPath>..\packages\Moq.4.1.1309.0919\lib\net40\Moq.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nunit.framework, Version=2.6.2.12296, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
@@ -509,7 +509,6 @@
<Compile Include="UmbracoExamine\TestContentService.cs" />
<Compile Include="UriExtensionsTests.cs" />
<Compile Include="UriUtilityTests.cs" />
<Compile Include="Macros\MacroEngineFactoryTests.cs" />
<Compile Include="Resolvers\PackageActionsResolverTests.cs" />
<Compile Include="Plugins\PluginManagerExtensions.cs" />
<Compile Include="Plugins\PluginManagerTests.cs" />

20
src/Umbraco.Tests/Web/Mvc/RenderModelBinderTests.cs
View File

@@ -20,18 +20,22 @@ namespace Umbraco.Tests.Web.Mvc
{
var binder = new RenderModelBinder();
var found = binder.GetBinder(typeof (IPublishedContent));
Assert.IsNotNull(found);
found = binder.GetBinder(typeof(IRenderModel));
Assert.IsNotNull(found);
Assert.IsNotNull(found);
found = binder.GetBinder(typeof(RenderModel));
Assert.IsNotNull(found);
found = binder.GetBinder(typeof(DynamicPublishedContent));
Assert.IsNotNull(found);
found = binder.GetBinder(typeof(MyContent));
Assert.IsNotNull(found);
found = binder.GetBinder(typeof(RenderModel<MyContent>));
Assert.IsNotNull(found);
found = binder.GetBinder(typeof(MyOtherContent));
Assert.IsNull(found);
found = binder.GetBinder(typeof(MyCustomRenderModel));
Assert.IsNull(found);
found = binder.GetBinder(typeof(IRenderModel));
Assert.IsNull(found);
}
[Test]
@@ -142,6 +146,16 @@ namespace Umbraco.Tests.Web.Mvc
Assert.AreEqual(content, result);
}
public class MyCustomRenderModel : RenderModel
{
public MyCustomRenderModel(IPublishedContent content, CultureInfo culture) : base(content, culture)
{
}
public MyCustomRenderModel(IPublishedContent content) : base(content)
{
}
}
public class MyOtherContent
{

1
src/Umbraco.Tests/media/1001/sample.txt
View File

@@ -1 +0,0 @@
TestContent

6
src/Umbraco.Tests/packages.config
View File

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AspNetWebApi.SelfHost" version="4.0.20710.0" targetFramework="net45" />
<package id="AutoMapper" version="4.1.1" targetFramework="net461" />
<package id="AutoMapper" version="4.2.1" targetFramework="net461" />
<package id="Examine" version="0.1.68.0" targetFramework="net45" />
<package id="LightInject" version="4.0.3" targetFramework="net461" />
<package id="LightInject" version="4.0.8" targetFramework="net461" />
<package id="log4net" version="2.0.5" targetFramework="net461" />
<package id="Lucene.Net" version="2.9.4.1" targetFramework="net45" />
<package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" />
@@ -18,7 +18,7 @@
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
<package id="MiniProfiler" version="3.2.0.157" targetFramework="net461" />
<package id="Moq" version="4.1.1309.0919" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net461" />
<package id="NUnit" version="2.6.2" targetFramework="net45" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="Selenium.WebDriver" version="2.32.0" targetFramework="net45" />

19
src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
View File

@@ -59,6 +59,25 @@ function listViewController($rootScope, $scope, $routeParams, $injector, $cookie
items: []
};
$scope.currentNodePermissions = {}
//Just ensure we do have an editorState
if (editorState.current) {
//Fetch current node allowed actions for the current user
//This is the current node & not each individual child node in the list
var currentUserPermissions = editorState.current.allowedActions;
//Create a nicer model rather than the funky & hard to remember permissions strings
$scope.currentNodePermissions = {
"canCopy": _.contains(currentUserPermissions, 'O'), //Magic Char = O
"canCreate": _.contains(currentUserPermissions, 'C'), //Magic Char = C
"canDelete": _.contains(currentUserPermissions, 'D'), //Magic Char = D
"canMove": _.contains(currentUserPermissions, 'M'), //Magic Char = M
"canPublish": _.contains(currentUserPermissions, 'U'), //Magic Char = U
"canUnpublish": _.contains(currentUserPermissions, 'U'), //Magic Char = Z (however UI says it can't be set, so if we can publish 'U' we can unpublish)
};
}
//when this is null, we don't check permissions
$scope.buttonPermissions = null;

70
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -108,8 +108,8 @@
<Project>{07fbc26b-2927-4a22-8d96-d644c667fecc}</Project>
<Name>UmbracoExamine</Name>
</ProjectReference>
<Reference Include="AutoMapper, Version=4.1.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
<HintPath>..\packages\AutoMapper.4.1.1\lib\net45\AutoMapper.dll</HintPath>
<Reference Include="AutoMapper, Version=4.2.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
<HintPath>..\packages\AutoMapper.4.2.1\lib\net45\AutoMapper.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="ClientDependency.Core, Version=1.8.4.0, Culture=neutral, processorArchitecture=MSIL">
@@ -193,8 +193,8 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MySql.Data.6.9.8\lib\net45\MySql.Data.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.8.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Owin">
@@ -318,8 +318,8 @@
<Name>Umbraco.Web</Name>
</ProjectReference>
<Reference Include="System.Xml.Linq" />
<Reference Include="Umbraco.ModelsBuilder, Version=3.0.1.92, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Umbraco.ModelsBuilder.3.0.1\lib\Umbraco.ModelsBuilder.dll</HintPath>
<Reference Include="Umbraco.ModelsBuilder, Version=3.0.2.93, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Umbraco.ModelsBuilder.3.0.2\lib\Umbraco.ModelsBuilder.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="UrlRewritingNet.UrlRewriter, Version=2.0.7.0, Culture=neutral, processorArchitecture=MSIL">
@@ -436,13 +436,6 @@
<Compile Include="Umbraco\Dialogs\ChangeDocType.aspx.designer.cs">
<DependentUpon>ChangeDocType.aspx</DependentUpon>
</Compile>
<Compile Include="Umbraco\Dialogs\MoveOrCopy.aspx.cs">
<DependentUpon>moveOrCopy.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="Umbraco\Dialogs\MoveOrCopy.aspx.designer.cs">
<DependentUpon>moveOrCopy.aspx</DependentUpon>
</Compile>
<Compile Include="Umbraco\dialogs\Sort.aspx.cs">
<DependentUpon>sort.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -673,14 +666,12 @@
<Content Include="Umbraco\Images\Umbraco\settingView.gif" />
<Content Include="Umbraco\Settings\Views\EditView.aspx" />
<Content Include="Umbraco_Client\Application\Extensions.js" />
<Content Include="Umbraco_Client\Application\JQuery\jquery.unobtrusive-ajax.min.js" />
<Content Include="Umbraco_Client\Application\JQuery\jquery.validate.min.js" />
<Content Include="Umbraco_Client\Application\JQuery\jquery.validate.unobtrusive.min.js" />
<Content Include="Umbraco_Client\Dialogs\SortDialog.css" />
<Content Include="Umbraco_client\Dialogs\SortDialog.js" />
<Content Include="Umbraco_Client\Dialogs\AssignDomain2.js" />
<Content Include="Umbraco_Client\Dialogs\AssignDomain2.css" />
<Content Include="Umbraco_Client\Dialogs\CreateDialog.css" />
<Content Include="Umbraco_Client\Dialogs\PublishDialog.css" />
<Content Include="Umbraco_Client\Dialogs\PublishDialog.js" />
<Content Include="Umbraco_Client\Dialogs\UmbracoField.js" />
@@ -692,6 +683,7 @@
<Content Include="Umbraco_Client\Editors\EditStyleSheet.js" />
<Content Include="Umbraco_Client\Editors\EditTemplate.js" />
<Content Include="Umbraco_Client\Editors\EditView.js" />
<Content Include="Umbraco_Client\PunyCode\punycode.min.js" />
<Content Include="Umbraco_Client\Splitbutton\InsertMacroSplitButton.js" />
<Content Include="Umbraco_Client\Tablesorting\img\asc.gif" />
<Content Include="Umbraco_Client\Tablesorting\img\desc.gif" />
@@ -723,8 +715,6 @@
<Content Include="Umbraco_Client\Ui\knockout.js" />
<Content Include="Umbraco_Client\Ui\knockout.mapping.js" />
<Content Include="Umbraco\endPreview.aspx" />
<Content Include="Umbraco_Client\Preview\previewModeBadge.png" />
<Content Include="Umbraco_Client\Preview\umbracoPreview.css" />
<Content Include="Umbraco\Xslt\Templates\Schema2\Breadcrumb.xslt" />
<Content Include="Umbraco\Xslt\Templates\Schema2\Clean.xslt" />
<Content Include="Umbraco\Xslt\Templates\Schema2\ListSubPagesAsThumbnails.xslt" />
@@ -766,7 +756,6 @@
<Content Include="Umbraco\Css\permissionsEditor.css" />
<Content Include="Umbraco\Dialogs\mediaPicker.aspx" />
<Content Include="Umbraco\Images\Editor\spellchecker.gif" />
<Content Include="Umbraco\Webservices\MacroContainerService.asmx" />
<Content Include="Umbraco_Client\Application\JQuery\jquery.cookie.js" />
<Content Include="Umbraco_Client\Tablesorting\Img\bg.gif" />
<Content Include="Umbraco\Developer\Packages\proxy.htm" />
@@ -833,19 +822,15 @@
<Content Include="Umbraco\Developer\Packages\LoadNitros.ascx" />
<Content Include="Umbraco\Developer\Packages\SubmitPackage.aspx" />
<Content Include="Umbraco\Dialogs\about.aspx" />
<Content Include="Umbraco\Dialogs\AssignDomain.aspx" />
<Content Include="Umbraco\Dialogs\create.aspx" />
<Content Include="Umbraco\Dialogs\cruds.aspx" />
<Content Include="Umbraco\Dialogs\emptyTrashcan.aspx" />
<Content Include="Umbraco\Dialogs\exportDocumenttype.aspx" />
<Content Include="Umbraco\Dialogs\importDocumenttype.aspx" />
<Content Include="Umbraco\Dialogs\insertMacro.aspx" />
<Content Include="Umbraco\Dialogs\moveOrCopy.aspx" />
<Content Include="Umbraco\Dialogs\notifications.aspx" />
<Content Include="Umbraco\Developer\Packages\installer.aspx" />
<Content Include="Umbraco\Dialogs\protectPage.aspx" />
<Content Include="Umbraco\Dialogs\publish.aspx" />
<Content Include="Umbraco\Dialogs\RegexWs.aspx" />
<Content Include="Umbraco\Dialogs\rollBack.aspx" />
<Content Include="Umbraco\Dialogs\sendToTranslation.aspx" />
<Content Include="Umbraco\Dialogs\treePicker.aspx" />
@@ -990,7 +975,6 @@
<Content Include="Umbraco\Xslt\searchResult.xslt" />
<Content Include="Umbraco\Xslt\Templates\RelatedLinks.xslt" />
<Content Include="Umbraco\Xslt\Templates\RSSFeed.xslt" />
<Content Include="Umbraco_Client\Images\progressbar.gif" />
<Content Include="Umbraco\Images\sendToTranslate.png" />
<Content Include="Umbraco\Images\Tray\traySprites.png" />
<Content Include="Umbraco\Images\Umbraco\package.png" />
@@ -1219,7 +1203,6 @@
<Content Include="Umbraco\Members\EditMemberGroup.aspx">
<SubType>Form</SubType>
</Content>
<Content Include="Umbraco\publishStatus.aspx" />
<Content Include="Umbraco\Settings\EditDictionaryItem.aspx" />
<Content Include="Umbraco\Settings\editLanguage.aspx" />
<Content Include="Umbraco\Settings\editTemplate.aspx" />
@@ -1235,21 +1218,11 @@
<Content Include="Umbraco\Webservices\CacheRefresher.asmx">
<SubType>Form</SubType>
</Content>
<Content Include="Umbraco\Webservices\CMSNode.asmx" />
<Content Include="Umbraco\Webservices\codeEditorSave.asmx" />
<Content Include="Umbraco\Webservices\Developer.asmx" />
<Content Include="Umbraco\Webservices\legacyAjaxCalls.asmx" />
<Content Include="Umbraco\Webservices\nodeSorter.asmx" />
<Content Include="Umbraco\Webservices\progressStatus.asmx">
<SubType>Form</SubType>
</Content>
<Content Include="Umbraco\Webservices\publication.asmx" />
<Content Include="Umbraco\Webservices\Settings.asmx">
<SubType>Form</SubType>
</Content>
<Content Include="Umbraco\Webservices\templates.asmx" />
<Content Include="Umbraco\Webservices\trashcan.asmx" />
<Content Include="Umbraco\Webservices\wsdl.xslt" />
<Content Include="Umbraco\Xslt\macroGetCurrent.xsl" />
<Content Include="Umbraco\Xslt\macroGetSubs.xsl" />
<Content Include="Umbraco\Xslt\sqlNodeHierachy.xslt" />
@@ -1274,21 +1247,6 @@
<Content Include="Umbraco_Client\Menuicon\style.css" />
<Content Include="Umbraco_Client\Modal\modal.js" />
<Content Include="Umbraco_Client\Modal\style.css" />
<Content Include="Umbraco_Client\Panel\Images\panel_bg.gif" />
<Content Include="Umbraco_Client\Panel\Images\panel_boxfooter_bg.gif" />
<Content Include="Umbraco_Client\Panel\Images\panel_boxfooter_statusBar_bg.gif" />
<Content Include="Umbraco_Client\Panel\Images\panel_boxfooter_statusBar_h2_bg.gif" />
<Content Include="Umbraco_Client\Panel\Images\panel_boxhead_bg.gif" />
<Content Include="Umbraco_Client\Panel\Images\panel_boxhead_h2_bg.gif" />
<Content Include="Umbraco_Client\Panel\style.css" />
<Content Include="Umbraco_Client\ProgressBar\Images\container_left.gif" />
<Content Include="Umbraco_Client\ProgressBar\Images\container_right.gif" />
<Content Include="Umbraco_Client\ProgressBar\Images\indicator.gif" />
<Content Include="Umbraco_Client\ProgressBar\javascript.js" />
<Content Include="Umbraco_Client\ProgressBar\style.css" />
<Content Include="Umbraco_Client\Propertypane\Images\propertyBackground.gif" />
<Content Include="Umbraco_Client\Propertypane\Images\proppane_bg.png" />
<Content Include="Umbraco_Client\Propertypane\style.css" />
<Content Include="Umbraco_Client\Scrollingmenu\Images\arrawBack.gif" />
<Content Include="Umbraco_Client\Scrollingmenu\Images\arrowForward.gif" />
<Content Include="Umbraco_Client\Scrollingmenu\Images\background.gif" />
@@ -1297,18 +1255,6 @@
<Content Include="Umbraco_Client\Scrollingmenu\javascript.js" />
<Content Include="Umbraco_Client\Scrollingmenu\style.css" />
<Content Include="Umbraco_Client\Tablesorting\tableDragAndDrop.js" />
<Content Include="Umbraco_Client\Tablesorting\tableFilterUtill.js" />
<Content Include="Umbraco_Client\Tablesorting\tableFilter.js" />
<Content Include="Umbraco_Client\Tabview\Images\background.gif" />
<Content Include="Umbraco_Client\Tabview\Images\bg.gif" />
<Content Include="Umbraco_Client\Tabview\Images\footer_bg.gif" />
<Content Include="Umbraco_Client\Tabview\Images\footer_statusBar_bg.gif" />
<Content Include="Umbraco_Client\Tabview\Images\footer_statusBar_h2_bg.gif" />
<Content Include="Umbraco_Client\Tabview\Images\left_both.gif" />
<Content Include="Umbraco_Client\Tabview\Images\right_both.gif" />
<Content Include="Umbraco_Client\Tabview\javascript.js" />
<Content Include="Umbraco_Client\Tabview\oldstyle.css" />
<Content Include="Umbraco_Client\Tabview\style.css" />
<Content Include="Umbraco_Client\Ui\default.css" />
<Content Include="Umbraco_Client\Ui\default.js" />
<Content Include="Umbraco_Client\Ui\jquery.js" />
@@ -1366,7 +1312,7 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
<WebProjectProperties>
<UseIIS>True</UseIIS>
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>7410</DevelopmentServerPort>
<DevelopmentServerPort>8000</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
<IISUrl>http://localhost:8000</IISUrl>
<NTLMAuthentication>False</NTLMAuthentication>

1
src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml
View File

@@ -963,6 +963,7 @@
<key alias="stylesheets">Stylopisy</key>
<key alias="templates">Šablony</key>
<key alias="xslt">XSLT soubory</key>
<key alias="userTypes">Typy Uživatelů</key>
</area>
<area alias="update">
<key alias="updateAvailable">Nová aktualizace je připrvena</key>

1
src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
View File

@@ -928,6 +928,7 @@ Vennlig hilsen Umbraco roboten
<key alias="templates">Maler</key>
<key alias="xslt">XSLT Filer</key>
<key alias="analytics">Analytics</key>
<key alias="userTypes">Brukertyper typer</key>
</area>
<area alias="update">
<key alias="updateAvailable">Ny oppdatering er klar</key>

11
src/Umbraco.Web.UI/config/trees.Release.config
View File

@@ -11,16 +11,16 @@
<!--Settings-->
<add initialize="true" sortOrder="0" alias="documentTypes" application="settings" title="Document Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.ContentTypeTreeController, umbraco" />
<add application="settings" alias="templates" title="Templates" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.TemplatesTreeController, umbraco" initialize="true" sortOrder="1" />
<add application="settings" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.PartialViewsTree, umbraco" sortOrder="2" />
<add application="settings" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.PartialViewsTree, umbraco" sortOrder="2" />
<add application="settings" alias="stylesheets" title="Stylesheets" type="umbraco.loadStylesheets, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" />
<add application="settings" alias="stylesheetProperty" title="Stylesheet Property" type="umbraco.loadStylesheetProperty, umbraco" iconClosed="" iconOpen="" initialize="false" sortOrder="0" />
<add application="settings" alias="stylesheetProperty" title="Stylesheet Property" type="umbraco.loadStylesheetProperty, umbraco" iconClosed="" iconOpen="" initialize="false" sortOrder="3" />
<add application="settings" alias="scripts" title="Scripts" type="umbraco.loadScripts, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" />
<add application="settings" alias="languages" title="Languages" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.LanguageTreeController, umbraco" sortOrder="5" />
<add application="settings" alias="languages" title="Languages" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.LanguageTreeController, umbraco" sortOrder="5" />
<add application="settings" alias="dictionary" title="Dictionary" type="Umbraco.Web.Trees.DictionaryTreeController, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="6" />
<add initialize="true" sortOrder="7" alias="mediaTypes" application="settings" title="Media Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MediaTypeTreeController, umbraco" />
<add initialize="true" sortOrder="7" alias="dataTypes" application="settings" title="Data Types" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.DataTypeTreeController, umbraco" />
<add initialize="true" sortOrder="8" alias="mediaTypes" application="settings" title="Media Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MediaTypeTreeController, umbraco" />
<!--Developer-->
<add initialize="true" sortOrder="0" alias="dataTypes" application="developer" title="Data Types" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.DataTypeTreeController, umbraco" />
<add application="developer" alias="macros" title="Macros" type="umbraco.loadMacros, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" />
<add application="developer" alias="packager" title="Packages" type="umbraco.loadPackager, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" />
<add application="developer" alias="packagerPackages" title="Packager Packages" type="umbraco.loadPackages, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" initialize="false" sortOrder="3" />
@@ -39,6 +39,7 @@
<add application="member" sortOrder="2" alias="memberGroups" title="Member Groups" type="umbraco.loadMemberGroups, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" />
<!--Translation-->
<add application="translation" alias="dictionary" title="Dictionary" type="Umbraco.Web.Trees.DictionaryTreeController, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="0" />
<add silent="false" initialize="true" sortOrder="1" alias="openTasks" application="translation" title="Tasks assigned to you" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.loadOpenTasks, umbraco" />
<add silent="false" initialize="true" sortOrder="2" alias="yourTasks" application="translation" title="Tasks created by you" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.loadYourTasks, umbraco" />

12
src/Umbraco.Web.UI/config/trees.config
View File

@@ -6,18 +6,17 @@
<!--Media-->
<add initialize="true" sortOrder="0" alias="media" application="media" title="Media" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.MediaTreeController, umbraco" />
<add initialize="false" sortOrder="0" alias="mediaRecycleBin" application="media" title="Recycle Bin" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.cms.presentation.Trees.MediaRecycleBin, umbraco" />
<!--Settings-->
<!--Settings-->
<add initialize="true" sortOrder="0" alias="documentTypes" application="settings" title="Document Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.ContentTypeTreeController, umbraco" />
<add application="settings" alias="templates" title="Templates" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.TemplatesTreeController, umbraco" initialize="true" sortOrder="1" />
<add application="settings" alias="partialViews" title="Partial Views" silent="false" initialize="true" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.PartialViewsTree, umbraco" sortOrder="2" />
<add application="settings" alias="stylesheets" title="Stylesheets" type="umbraco.loadStylesheets, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" />
<add application="settings" alias="stylesheetProperty" title="Stylesheet Property" type="umbraco.loadStylesheetProperty, umbraco" iconClosed="" iconOpen="" initialize="false" sortOrder="0" />
<add application="settings" alias="stylesheetProperty" title="Stylesheet Property" type="umbraco.loadStylesheetProperty, umbraco" iconClosed="" iconOpen="" initialize="false" sortOrder="3" />
<add application="settings" alias="scripts" title="Scripts" type="umbraco.loadScripts, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="4" />
<add application="settings" alias="languages" title="Languages" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.LanguageTreeController, umbraco" sortOrder="5" />
<add application="settings" alias="dictionary" title="Dictionary" type="Umbraco.Web.Trees.DictionaryTreeController, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="6" />
<add initialize="true" sortOrder="7" alias="mediaTypes" application="settings" title="Media Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MediaTypeTreeController, umbraco" />
<add initialize="true" sortOrder="7" alias="dataTypes" application="settings" title="Data Types" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.DataTypeTreeController, umbraco" />
<add initialize="true" sortOrder="8" alias="mediaTypes" application="settings" title="Media Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MediaTypeTreeController, umbraco" />
<!--Developer-->
<add initialize="true" sortOrder="0" alias="dataTypes" application="developer" title="Data Types" iconClosed="icon-folder" iconOpen="icon-folder" type="Umbraco.Web.Trees.DataTypeTreeController, umbraco" />
<add application="developer" alias="macros" title="Macros" type="umbraco.loadMacros, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" />
<add application="developer" alias="packager" title="Packages" type="umbraco.loadPackager, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="3" />
<add application="developer" alias="packagerPackages" title="Packager Packages" type="umbraco.loadPackages, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" initialize="false" sortOrder="3" />
@@ -26,13 +25,14 @@
<add application="developer" alias="partialViewMacros" type="Umbraco.Web.Trees.PartialViewMacrosTree, umbraco" silent="false" initialize="true" sortOrder="6" title="Partial View Macro Files" iconClosed="icon-folder" iconOpen="icon-folder" />
<!--Users-->
<add application="users" alias="users" title="Users" type="umbraco.loadUsers, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="0" />
<add application="users" alias="userTypes" title="User Types" type="umbraco.cms.presentation.Trees.UserTypes, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="1" />
<add application="users" alias="userTypes" title="User Types" type="Umbraco.Web.Trees.UserTypesTreeController, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="1" />
<add application="users" alias="userPermissions" title="User Permissions" type="umbraco.cms.presentation.Trees.UserPermissions, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="2" />
<!--Members-->
<add initialize="true" sortOrder="0" alias="member" application="member" title="Members" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberTreeController, umbraco" />
<add initialize="true" sortOrder="1" alias="memberTypes" application="member" title="Member Types" iconClosed="icon-folder" iconOpen="icon-folder-open" type="Umbraco.Web.Trees.MemberTypeTreeController, umbraco" />
<add application="member" sortOrder="2" alias="memberGroups" title="Member Groups" type="umbraco.loadMemberGroups, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" />
<!--Translation-->
<add application="translation" alias="dictionary" title="Dictionary" type="Umbraco.Web.Trees.DictionaryTreeController, umbraco" iconClosed="icon-folder" iconOpen="icon-folder" sortOrder="0" />
<add silent="false" initialize="true" sortOrder="1" alias="openTasks" application="translation" title="Tasks assigned to you" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.loadOpenTasks, umbraco" />
<add silent="false" initialize="true" sortOrder="2" alias="yourTasks" application="translation" title="Tasks created by you" iconClosed="icon-folder" iconOpen="icon-folder" type="umbraco.loadYourTasks, umbraco" />
<!-- Custom -->

6
src/Umbraco.Web.UI/packages.config
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="AutoMapper" version="4.1.1" targetFramework="net461" />
<package id="AutoMapper" version="4.2.1" targetFramework="net461" />
<package id="ClientDependency" version="1.8.4" targetFramework="net45" />
<package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net45" />
<package id="Examine" version="0.1.68.0" targetFramework="net45" />
@@ -28,12 +28,12 @@
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
<package id="MiniProfiler" version="3.2.0.157" targetFramework="net461" />
<package id="MySql.Data" version="6.9.8" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
<package id="Newtonsoft.Json" version="8.0.3" targetFramework="net461" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
<package id="SqlServerCE" version="4.0.0.1" targetFramework="net45" />
<package id="System.Collections.Immutable" version="1.1.36" targetFramework="net45" />
<package id="System.Reflection.Metadata" version="1.0.21" targetFramework="net45" />
<package id="Umbraco.ModelsBuilder" version="3.0.1" targetFramework="net45" />
<package id="Umbraco.ModelsBuilder" version="3.0.2" targetFramework="net45" />
<package id="UrlRewritingNet.UrlRewriter" version="2.0.7" targetFramework="net45" />
</packages>

2
src/Umbraco.Web.UI/umbraco/config/lang/da.xml
View File

@@ -986,7 +986,6 @@ Mange hilsner fra Umbraco robotten
<key alias="memberTypes">Medlemstype</key>
<key alias="documentTypes">Dokumenttyper</key>
<key alias="relationTypes">Dokumenttyper</key>
<key alias="packager">Pakker</key>
<key alias="packages">Pakker</key>
<key alias="python">Python</key>
@@ -999,6 +998,7 @@ Mange hilsner fra Umbraco robotten
<key alias="templates">Skabeloner</key>
<key alias="xslt">XSLT-filer</key>
<key alias="analytics">Analytics</key>
<key alias="userTypes">Bruger Typer</key>
</area>
<area alias="update">
<key alias="updateAvailable">Ny opdatering er klar</key>

1
src/Umbraco.Web.UI/umbraco/config/lang/de.xml
View File

@@ -946,6 +946,7 @@ Ihr freundlicher Umbraco-Robot
<key alias="templates">Vorlagen</key>
<key alias="xslt">XSLT-Dateien</key>
<key alias="analytics">Auswertungen</key>
<key alias="userTypes">Benutzertypen</key>
</area>
<area alias="update">
<key alias="updateAvailable">Neues Update verfügbar</key>

1
src/Umbraco.Web.UI/umbraco/config/lang/en.xml
View File

@@ -1188,6 +1188,7 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="templates">Templates</key>
<key alias="xslt">XSLT Files</key>
<key alias="analytics">Analytics</key>
<key alias="userTypes">User Types</key>
</area>
<area alias="update">
<key alias="updateAvailable">New update ready</key>

1
src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
View File

@@ -1192,6 +1192,7 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="templates">Templates</key>
<key alias="xslt">XSLT Files</key>
<key alias="analytics">Analytics</key>
<key alias="userTypes">User Types</key>
</area>
<area alias="update">
<key alias="updateAvailable">New update ready</key>

1
src/Umbraco.Web.UI/umbraco/config/lang/es.xml
View File

@@ -850,6 +850,7 @@
<key alias="stylesheets">Hojas de estilo</key>
<key alias="templates">Plantillas</key>
<key alias="xslt">Archivos XSLT</key>
<key alias="userTypes">Tipos de Usuarios</key>
</area>
<area alias="update">
<key alias="updateAvailable">Existe una nueva actualización</key>

59
src/Umbraco.Web.UI/umbraco/config/lang/fr.xml
View File

@@ -839,43 +839,43 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
<key alias="template">Modèle</key>
</area>
<area alias="grid">
<key alias="insertControl">Choose type of content</key>
<key alias="chooseLayout">Choose a layout</key>
<key alias="addRows">Add a row</key>
<key alias="addElement">Add content</key>
<key alias="dropElement">Drop content</key>
<key alias="settingsApplied">Settings applied</key>
<key alias="insertControl">Choisissez le type de contenu</key>
<key alias="chooseLayout">Choisissez une mise en page</key>
<key alias="addRows">Ajouter une ligne</key>
<key alias="addElement">Ajouter du contenu</key>
<key alias="dropElement">Contenu goutte</key>
<key alias="settingsApplied">Paramètres appliqués</key>
<key alias="contentNotAllowed">This content is not allowed here</key>
<key alias="contentAllowed">This content is allowed here</key>
<key alias="contentNotAllowed">Ce contenu est pas autorisée ici</key>
<key alias="contentAllowed">Ce contenu est permis ici</key>
<key alias="clickToEmbed">Click to embed</key>
<key alias="clickToInsertImage">Click to insert image</key>
<key alias="placeholderImageCaption">Image caption...</key>
<key alias="placeholderWriteHere">Write here...</key>
<key alias="clickToEmbed">Cliquez pour intégrer</key>
<key alias="clickToInsertImage">Cliquez pour insérer l'image</key>
<key alias="placeholderImageCaption">Légende de l'image...</key>
<key alias="placeholderWriteHere">Ecrire ici...</key>
<key alias="gridLayouts">Grid Layouts</key>
<key alias="gridLayoutsDetail">Layouts are the overall work area for the grid editor, usually you only need one or two different layouts</key>
<key alias="addGridLayout">Add Grid Layout</key>
<key alias="addGridLayoutDetail">Adjust the layout by setting column widths and adding additional sections</key>
<key alias="rowConfigurations">Row configurations</key>
<key alias="rowConfigurationsDetail">Rows are predefined cells arranged horizontally</key>
<key alias="addRowConfiguration">Add row configuration</key>
<key alias="addRowConfigurationDetail">Adjust the row by setting cell widths and adding additional cells</key>
<key alias="gridLayouts">Layouts Grid</key>
<key alias="gridLayoutsDetail">Layouts sont la superficie totale de travail pour l'éditeur de grille, en général, vous avez seulement besoin d'une ou deux configurations différentes</key>
<key alias="addGridLayout">Ajouter Grid Layout</key>
<key alias="addGridLayoutDetail">Ajustez la mise en page en définissant la largeur des colonnes et ajouter des sections supplémentaires</key>
<key alias="rowConfigurations">Configurations des lignes</key>
<key alias="rowConfigurationsDetail">Les lignes sont des cellules prédéfinies disposées horizontalement</key>
<key alias="addRowConfiguration">Ajouter une configuration de la ligne</key>
<key alias="addRowConfigurationDetail">Ajustez la ligne en réglant la largeur des cellules et en ajoutant des cellules supplémentaires</key>
<key alias="columns">Columns</key>
<key alias="columnsDetails">Total combined number of columns in the grid layout</key>
<key alias="columns">Colonnes</key>
<key alias="columnsDetails">Nombre total combiné de colonnes dans la configuration de la grille</key>
<key alias="settings">Settings</key>
<key alias="settingsDetails">Configure what settings editors can change</key>
<key alias="settings">Paramètres</key>
<key alias="settingsDetails">Configurer quels paramètres éditeurs peuvent changer</key>
<key alias="styles">Styles</key>
<key alias="stylesDetails">Configure what styling editors can change</key>
<key alias="styles">Modes</key>
<key alias="stylesDetails">Configurer ce style éditeurs peuvent changer</key>
<key alias="settingDialogDetails">Settings will only save if the entered json configuration is valid</key>
<key alias="settingDialogDetails">Les réglages seulement économiser si la configuration du json saisi est valide</key>
<key alias="allowAllEditors">Allow all editors</key>
<key alias="allowAllRowConfigurations">Allow all row configurations</key>
<key alias="allowAllEditors">Autoriser tous les éditeurs</key>
<key alias="allowAllRowConfigurations">Autoriser toutes les configurations de lignes</key>
</area>
<area alias="templateEditor">
<key alias="alternativeField">Champ alternatif</key>
@@ -984,6 +984,7 @@ Pour gérer votre site, ouvrez simplement le backoffice Umbraco et commencez à
<key alias="stylesheets">Feuilles de style</key>
<key alias="templates">Modèles</key>
<key alias="xslt">Fichiers XSLT</key>
<key alias="userTypes">Types d'utilisateurs</key>
</area>
<area alias="update">
<key alias="updateAvailable">Nouvelle mise à jour prête</key>

1
src/Umbraco.Web.UI/umbraco/config/lang/he.xml
View File

@@ -869,6 +869,7 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="stylesheets">גיליונות סגנון</key>
<key alias="templates">תבניות</key>
<key alias="xslt">קבצי XSLT</key>
<key alias="userTypes">משתמש מקליד</key>
</area>
<area alias="update">
<key alias="updateAvailable">עידכון חדש זמין</key>

1
src/Umbraco.Web.UI/umbraco/config/lang/it.xml
View File

@@ -842,6 +842,7 @@ Per gestire il tuo sito web, è sufficiente aprire il back office di Umbraco e i
<key alias="stylesheets">Fogli di stile</key>
<key alias="templates">Templates</key>
<key alias="xslt">Files XSLT</key>
<key alias="userTypes">Tipi di Utente</key>
</area>
<area alias="update">
<key alias="updateAvailable"><![CDATA[Nuovo aggiornamento pronto]]></key>

1
src/Umbraco.Web.UI/umbraco/config/lang/ja.xml
View File

@@ -1172,6 +1172,7 @@ Runwayをインストールして作られた新しいウェブサイトがど
<key alias="templates">テンプレート</key>
<key alias="xslt">XSLT ファイル</key>
<key alias="analytics">アナリティクス</key>
<key alias="userTypes">ユーザータイプ</key>
</area>
<area alias="update">
<key alias="updateAvailable">新しい更新があります</key>

1
src/Umbraco.Web.UI/umbraco/config/lang/ko.xml
View File

@@ -846,6 +846,7 @@
<key alias="stylesheets">스타일시트</key>
<key alias="templates">템플릿</key>
<key alias="xslt">XSLT 파일</key>
<key alias="userTypes">사용자 유형</key>
</area>
<area alias="update">
<key alias="updateAvailable">새 업데이트가 준비되었습니다.</key>

1
src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
View File

@@ -951,6 +951,7 @@ Om een vertalingstaak te sluiten, ga aub naar het detailoverzicht en klik op de
<key alias="stylesheets">Stylesheets</key>
<key alias="templates">Sjablonen</key>
<key alias="xslt">XSLT Bestanden</key>
<key alias="userTypes">Gebruiker Types</key>
</area>
<area alias="update">
<key alias="updateAvailable">Nieuwe update beschikbaar</key>

1
src/Umbraco.Web.UI/umbraco/config/lang/pl.xml
View File

@@ -742,6 +742,7 @@ Miłego dnia!]]></key>
<key alias="stylesheets">Arkusze stylów</key>
<key alias="templates">Szablony</key>
<key alias="xslt">Pliki XSLT</key>
<key alias="userTypes">Typy Użytkowników</key>
</area>
<area alias="update">
<key alias="updateAvailable">Aktualizacja jest gotowa</key>

1
src/Umbraco.Web.UI/umbraco/config/lang/pt.xml
View File

@@ -830,6 +830,7 @@ Para fechar a tarefa de tradução vá até os detalhes e clique no botão "Fech
<key alias="stylesheets">Stylesheets</key>
<key alias="templates">Modelos</key>
<key alias="xslt">Arquivos XSLT</key>
<key alias="userTypes">Tipos de Usuários</key>
</area>
<area alias="update">
<key alias="updateAvailable">Nova atualização pronta</key>

1
src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
View File

@@ -1161,6 +1161,7 @@
<key alias="stylesheets">Стили CSS</key>
<key alias="templates">Шаблоны</key>
<key alias="xslt">Файлы XSLT</key>
<key alias="userTypes">Типы пользователей</key>
</area>
<area alias="update">
<key alias="updateAvailable">Доступны обновления</key>

1
src/Umbraco.Web.UI/umbraco/config/lang/sv.xml
View File

@@ -851,6 +851,7 @@
<key alias="stylesheets">Stilmallar</key>
<key alias="templates">Sidmallar</key>
<key alias="xslt">XSLT-filer</key>
<key alias="userTypes">Användartyper</key>
</area>
<area alias="update">
<key alias="updateAvailable">Ny uppdatering tillgänglig</key>

1
src/Umbraco.Web.UI/umbraco/config/lang/zh.xml
View File

@@ -920,6 +920,7 @@
<key alias="stylesheets">样式表</key>
<key alias="templates">模板</key>
<key alias="xslt">XSLT文件</key>
<key alias="userTypes">用户类型</key>
</area>
<area alias="update">
<key alias="updateAvailable">有可用更新</key>

1
src/Umbraco.Web.UI/umbraco/controls/Tree/TreeControl.ascx
View File

@@ -2,7 +2,6 @@
<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
<%@ Register TagPrefix="umbClient" Namespace="Umbraco.Web.UI.Bundles" Assembly="umbraco" %>
<umb:CssInclude ID="CssInclude3" runat="server" FilePath="Tree/menuIcons.css" PathNameAlias="UmbracoClient" Priority="11" />
<umb:CssInclude ID="CssInclude1" runat="server" FilePath="Tree/Themes/umbraco/style.css" PathNameAlias="UmbracoClient" Priority="12" />
<umbClient:JsApplicationLib ID="JsUmbracoApplicationLib1" runat="server"/>

47
src/Umbraco.Web.UI/umbraco/dialogs/AssignDomain.aspx
View File

@@ -1,47 +0,0 @@
<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="True" Inherits="umbraco.dialogs.AssignDomain" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<asp:Content ContentPlaceHolderID="head" runat="server">
<script type="text/javascript">
function doSubmit() { document.Form1["ok"].click(); }
var functionsFrame = this;
var tabFrame = this;
var isDialog = true;
var submitOnEnter = true;
</script>
</asp:Content>
<asp:Content ContentPlaceHolderID="body" runat="server">
<cc1:Feedback ID="FeedBackMessage" runat="server" />
<cc1:Pane runat="server" ID="pane_addnew">
<cc1:PropertyPanel runat="server" ID="prop_domain" Text="Domain">
<asp:TextBox ID="DomainName" runat="server" Width="252px"></asp:TextBox>
<asp:RequiredFieldValidator ControlToValidate="DomainName" ErrorMessage="*" ID="DomainValidator" runat="server" Display="Dynamic" />
<asp:RegularExpressionValidator ControlToValidate="DomainName" ErrorMessage="*" ID="DomainValidator2" runat="server" Display="Dynamic" />
<br /><small><%= Services.TextService.Localize("assignDomain/domainHelp") %></small>
</cc1:PropertyPanel>
<cc1:PropertyPanel ID="prop_lang" runat="server" Text="language">
<asp:DropDownList ID="Languages" runat="server" />
<asp:RequiredFieldValidator ControlToValidate="Languages" ErrorMessage="*" ID="LanguageValidator" runat="server" Display="Dynamic" />
</cc1:PropertyPanel>
<cc1:PropertyPanel runat="server" Text=" ">
<asp:Button ID="ok" runat="server" OnClick="SaveDomain"></asp:Button>
</cc1:PropertyPanel>
</cc1:Pane>
<cc1:Pane ID="pane_edit" runat="server">
<cc1:PropertyPanel runat="server">
<asp:Literal ID="allDomains" runat="server" />
</cc1:PropertyPanel>
</cc1:Pane>
<p>
<a href="#" onclick="UmbClientMgr.closeModalWindow()"><%= Services.TextService.Localize("defaultdialogs/closeThisWindow")%></a>
</p>
</asp:Content>

11
src/Umbraco.Web.UI/umbraco/dialogs/MoveOrCopy.aspx.cs
View File

@@ -1,11 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
namespace Umbraco.Web.UI.Umbraco.Dialogs
{
public partial class MoveOrCopy : global::umbraco.dialogs.moveOrCopy
{
}
}

15
src/Umbraco.Web.UI/umbraco/dialogs/MoveOrCopy.aspx.designer.cs generated
View File

@@ -1,15 +0,0 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace Umbraco.Web.UI.Umbraco.Dialogs {
public partial class MoveOrCopy {
}
}

57
src/Umbraco.Web.UI/umbraco/dialogs/RegexWs.aspx
View File

@@ -1,57 +0,0 @@
<%@ Page Language="C#" AutoEventWireup="true" MasterPageFile="../masterpages/umbracoDialog.Master" CodeBehind="RegexWs.aspx.cs" Inherits="umbraco.presentation.dialogs.RegexWs" %>
<%@ Import Namespace="Umbraco.Web" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
<asp:Content ContentPlaceHolderID="body" runat="server">
<umb:JsInclude ID="JsInclude1" runat="server" FilePath="js/umbracoCheckKeys.js" PathNameAlias="UmbracoRoot"/>
<cc1:Pane id="pane1" runat="server">
<cc1:PropertyPanel ID="pp_search" Text="Search" runat="server">
<asp:TextBox ID="searchField" style="width: 250px;" runat="server" /> <asp:Button ID="bt_search" runat="server" Text="search" OnClick="findRegex" />
<p>
<small><%= Services.TextService.Localize("defaultdialogs/regexSearchHelp")%> </small>
</p>
</cc1:PropertyPanel>
<cc1:PropertyPanel runat="server">
<asp:Panel ID="regexPanel" Visible="false" runat="server">
<div class="diff">
<asp:Repeater id="results" runat="server" OnItemDataBound="onRegexBind">
<ItemTemplate>
<div class="match">
<h3><asp:Literal ID="header" runat="server" /></h3>
<p>
<asp:Literal ID="desc" runat="server" />
</p>
<p>
<pre><asp:Literal ID="regex" runat="server" /></pre>
</p>
</div>
</ItemTemplate>
</asp:Repeater>
</div>
</asp:Panel>
</cc1:PropertyPanel>
</cc1:Pane>
</asp:Content>
<asp:Content ContentPlaceHolderID="head" runat="server">
<script type="text/javascript">
function chooseRegex(regex) {
var target = top.right.document.getElementById('<%= Request.CleanForXss("target") %>');
target.value = regex;
UmbClientMgr.closeModalWindow();
}
</script>
<style type="text/css">
.diff{height: 357px; width: 98%; overflow: auto; font-family: verdana; font-size: 11px;}
.diff pre{display: block; width: 80%; background: #EFEFF5; margin: 10px; margin-left: 0px; padding: 10px; overflow: hidden;}
.match{border-bottom: 1px solid #ccc; padding: 5px; margin-left: 10px; margin-bottom: 10px;}
.match h3{font-size: 14px; padding-left: 0px; margin-left: 0px;}
</style>
</asp:Content>

83
src/Umbraco.Web.UI/umbraco/dialogs/emptyTrashcan.aspx
View File

@@ -1,83 +0,0 @@
<%@ Page Language="C#" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="true" Inherits="umbraco.presentation.dialogs.emptyTrashcan" %>
<%@ Import Namespace="System.Globalization" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<asp:Content ContentPlaceHolderID="head" runat="server">
<script type="text/javascript">
var recycleBinType = '<%=BinType.ToString()%>';
var emptyTotal = '<%= umbraco.cms.businesslogic.RecycleBin.Count(BinType).ToString(CultureInfo.InvariantCulture)%>';
function emptyRecycleBin() {
jQuery('#formDiv').hide();
jQuery('#buttons').hide();
jQuery('#animation').show();
jQuery('#anim').attr("src","<%=umbraco.GlobalSettings.ClientPath%>/images/progressBar.gif");
// call the empty trashcan webservice
umbraco.presentation.webservices.trashcan.EmptyTrashcan(recycleBinType);
// wait one second to start the status update
setTimeout('updateStatus();', 1000);
}
function updateStatus() {
umbraco.presentation.webservices.trashcan.GetTrashStatus(updateStatusLabel, failure);
}
function failure(retVal) {
alert('error: ' + retVal);
}
function updateStatusLabel(retVal) {
jQuery('#statusLabel').html("<strong>" + retVal + " <%=Services.TextService.Localize("remaining")%></strong>");
if (retVal != '' && retVal != '0') {
setTimeout('updateStatus();', 500);
} else {
jQuery('#div_form').hide();
jQuery('#notification').show();
jQuery('#notification').html("<p><%=Services.TextService.Localize("defaultdialogs/recycleBinIsEmpty")%> </p> <p><a href='#' onclick='UmbClientMgr.closeModalWindow()'><%= Services.TextService.Localize("defaultdialogs/closeThisWindow")%></a></p>");
UmbClientMgr.mainTree().reloadActionNode();
}
}
</script>
</asp:Content>
<asp:Content runat="server" ContentPlaceHolderID="body">
<div class="success" id="notification" style="display: none;"></div>
<div id="div_form">
<cc1:Pane id="pane_form" runat="server">
<cc1:PropertyPanel runat="server">
<div id="animation" align="center" style="display: none;">
<p><%= Services.TextService.Localize("defaultdialogs/recycleBinDeleting")%></p>
<cc1:ProgressBar ID="progbar" runat="server" Title="Please wait..." />
<br />
<span class="guiDialogTiny" id="statusLabel"><%=Services.TextService.Localize("deleting")%></span>
</div>
<div id="formDiv">
<p><%= Services.TextService.Localize("defaultdialogs/recycleBinWarning")%></p>
<input type="checkbox" id="confirmDelete" onclick="$get('ok').disabled = !this.checked;" /> <label for="confirmDelete"><%=Services.TextService.Localize("defaultdialogs/confirmEmptyTrashcan", new[] { umbraco.cms.businesslogic.RecycleBin.Count(BinType).ToString(CultureInfo.InvariantCulture)})%></label>
</div>
</cc1:PropertyPanel>
</cc1:Pane>
<br />
<div id="buttons">
<input type="button" ID="ok" value="<%=Services.TextService.Localize("actions/emptyTrashcan") %>" class="guiInputButton" onclick="if ($get('confirmDelete').checked) {emptyRecycleBin();}" disabled="true" />
<em><%= Services.TextService.Localize("or") %></em>
<a href="#" onclick="UmbClientMgr.closeModalWindow();">
<%=Services.TextService.Localize("cancel")%>
</a>
</div>
</div>
</asp:Content>

92
src/Umbraco.Web.UI/umbraco/dialogs/moveOrCopy.aspx
View File

@@ -1,92 +0,0 @@
<%@ Page Language="c#" CodeBehind="moveOrCopy.aspx.cs" MasterPageFile="../masterpages/umbracoDialog.Master" AutoEventWireup="True" Inherits="Umbraco.Web.UI.Umbraco.Dialogs.MoveOrCopy" %>
<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
<%@ Import Namespace="Umbraco.Web" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register Src="../controls/Tree/TreeControl.ascx" TagName="TreeControl" TagPrefix="umbraco" %>
<asp:Content ContentPlaceHolderID="head" runat="server">
<script type="text/javascript">
function dialogHandler(id) {
document.getElementById("copyTo").value = id;
document.getElementById("<%= ok.ClientID %>").disabled = false;
// Get node name by xmlrequest
if (id > 0)
umbraco.presentation.webservices.CMSNode.GetNodeName('<%=umbracoUserContextID%>', id, updateName);
else{
//document.getElementById("pageNameContent").innerHTML = "'<strong><%=Services.TextService.Localize(Request.CleanForXss("app"))%></strong>' <%= Services.TextService.Localize("moveOrCopy/nodeSelected") %>";
jQuery("#pageNameContent").html("<strong><%=Services.TextService.Localize(Request.CleanForXss("app"))%></strong> <%= Services.TextService.Localize("moveOrCopy/nodeSelected") %>");
jQuery("#pageNameHolder").attr("class","success");
}
}
var actionIsValid = true;
function updateName(result) {
if(actionIsValid)
{
jQuery("#pageNameContent").html("'<strong>" + result + "</strong>' <%= Services.TextService.Localize("moveOrCopy/nodeSelected") %>");
jQuery("#pageNameHolder").attr("class","success");
}
}
function notValid()
{
jQuery("#pageNameHolder").attr("class", "error");
jQuery("#pageNameContent").html("<%= Services.TextService.Localize("moveOrCopy/notValid") %>");
actionIsValid = false;
}
</script>
<style type="text/css">
.propertyItemheader
{
width: 180px !important;
}
</style>
</asp:Content>
<asp:Content ContentPlaceHolderID="body" runat="server">
<umb:JsInclude ID="JsInclude1" runat="server" FilePath="js/umbracoCheckKeys.js" PathNameAlias="UmbracoRoot"/>
<input type="hidden" id="copyTo" name="copyTo" />
<cc1:Feedback ID="feedback" runat="server" />
<cc1:Pane ID="pane_form" runat="server" Visible="false">
<cc1:PropertyPanel runat="server" Style="overflow: auto; height: 220px;position: relative;">
<umbraco:TreeControl runat="server" ID="JTree" App='<%#Request.CleanForXss("app") %>'
IsDialog="true" DialogMode="id" ShowContextMenu="false" FunctionToCall="dialogHandler"
Height="200"></umbraco:TreeControl>
</cc1:PropertyPanel>
<cc1:PropertyPanel runat="server" ID="pp_relate" Text="relateToOriginal">
<asp:CheckBox runat="server" ID="RelateDocuments" Checked="false" />
</cc1:PropertyPanel>
</cc1:Pane>
<asp:PlaceHolder ID="pane_form_notice" runat="server" Visible="false">
<div class="notice" id="pageNameHolder" style="margin-top: 10px;">
<p id="pageNameContent">
<%= Services.TextService.Localize("moveOrCopy/noNodeSelected") %></p>
</div>
</asp:PlaceHolder>
<cc1:Pane ID="pane_settings" runat="server" Visible="false">
<cc1:PropertyPanel ID="PropertyPanel1" runat="server" Text="Master Document Type">
<asp:ListBox ID="masterType" runat="server" CssClass="bigInput" Rows="1" SelectionMode="Single"></asp:ListBox>
</cc1:PropertyPanel>
<cc1:PropertyPanel runat="server" Text="Name">
<asp:TextBox ID="rename" runat="server" Style="width: 350px;" CssClass="bigInput"></asp:TextBox><asp:RequiredFieldValidator ID="RequiredFieldValidator1" ErrorMessage="*" ControlToValidate="rename" runat="server">*</asp:RequiredFieldValidator>
</cc1:PropertyPanel>
</cc1:Pane>
<asp:Panel ID="panel_buttons" runat="server">
<p>
<asp:Button ID="ok" runat="server" CssClass="guiInputButton" OnClick="HandleMoveOrCopy" UseSubmitBehavior="false" OnClientClick="this.disabled = 'disabled';"></asp:Button>
&nbsp; <em>
<%=Services.TextService.Localize("general/or")%></em> &nbsp; <a href="#" style="color: blue" onclick="UmbClientMgr.closeModalWindow()">
<%=Services.TextService.Localize("general/cancel")%></a>
</p>
</asp:Panel>
</asp:Content>

8
src/Umbraco.Web.UI/umbraco/dialogs/protectPage.aspx
View File

@@ -5,11 +5,11 @@
<asp:Content ContentPlaceHolderID="head" runat="server">
<script type="text/javascript">
function updateLoginId() {
var treePicker = window.showModalDialog('<%=umbraco.cms.presentation.Trees.TreeService.GetPickerUrl(true,"content","content")%>', 'treePicker', 'dialogWidth=350px;dialogHeight=300px;scrollbars=no;center=yes;border=thin;help=no;status=no')
var treePicker = window.showModalDialog('<%=umbraco.cms.presentation.Trees.TreeService.GetPickerUrl("content","content")%>', 'treePicker', 'dialogWidth=350px;dialogHeight=300px;scrollbars=no;center=yes;border=thin;help=no;status=no')
if (treePicker != undefined) {
document.getElementById("loginId").value = treePicker;
if (treePicker > 0) {
umbraco.presentation.webservices.CMSNode.GetNodeName('<%=umbraco.BasePages.BasePage.umbracoUserContextID%>', treePicker, updateLoginTitle);
umbraco.presentation.webservices.CMSNode.GetNodeName('<%=Security.CurrentUser.Id%>', treePicker, updateLoginTitle);
} else
document.getElementById("loginTitle").innerHTML = "<strong><%=Services.TextService.Localize("content")%></strong>";
}
@@ -20,11 +20,11 @@
}
function updateErrorId() {
var treePicker = window.showModalDialog('<%=umbraco.cms.presentation.Trees.TreeService.GetPickerUrl(true,"content","content")%>', 'treePicker', 'dialogWidth=350px;dialogHeight=300px;scrollbars=no;center=yes;border=thin;help=no;status=no')
var treePicker = window.showModalDialog('<%=umbraco.cms.presentation.Trees.TreeService.GetPickerUrl("content","content")%>', 'treePicker', 'dialogWidth=350px;dialogHeight=300px;scrollbars=no;center=yes;border=thin;help=no;status=no')
if (treePicker != undefined) {
document.getElementById("errorId").value = treePicker;
if (treePicker > 0) {
umbraco.presentation.webservices.CMSNode.GetNodeName('<%=umbraco.BasePages.BasePage.umbracoUserContextID%>', treePicker, updateErrorTitle);
umbraco.presentation.webservices.CMSNode.GetNodeName('<%=Security.CurrentUser.Id%>', treePicker, updateErrorTitle);
} else
document.getElementById("errorTitle").innerHTML = "<strong><%=Services.TextService.Localize("content")%></strong>";
}

2
src/Umbraco.Web.UI/umbraco/dialogs/rollBack.aspx
View File

@@ -1,4 +1,4 @@
<%@ Page Language="c#" Codebehind="rollBack.aspx.cs" MasterPageFile="../masterpages/umbracoDialog.Master"AutoEventWireup="True" Inherits="umbraco.presentation.dialogs.rollBack" %>
<%@ Page Language="c#" MasterPageFile="../masterpages/umbracoDialog.Master"AutoEventWireup="True" Inherits="umbraco.presentation.dialogs.rollBack" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>

2
src/Umbraco.Web.UI/umbraco/dialogs/viewAuditTrail.aspx
View File

@@ -9,7 +9,7 @@
.gridItem{border-color: #D9D7D7;}
</style>
<umb:CssInclude ID="CssInclude3" runat="server" FilePath="Tree/menuIcons.css" PathNameAlias="UmbracoClient" Priority="11" />
</asp:Content>
<asp:Content ContentPlaceHolderID="body" runat="server">

18
src/Umbraco.Web.UI/umbraco/publishStatus.aspx
View File

@@ -1,18 +0,0 @@
<%@ Page language="c#" Codebehind="publishStatus.aspx.cs" AutoEventWireup="True" Inherits="umbraco.cms.presentation.publishStatus" %>
<%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
<HTML>
<HEAD>
<title>publishStatus</title>
<meta name="GENERATOR" Content="Microsoft Visual Studio .NET 7.1">
<meta name="CODE_LANGUAGE" Content="C#">
<meta name="vs_defaultClientScript" content="JavaScript">
<meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5">
</HEAD>
<body MS_POSITIONING="GridLayout">
<form id="Form1" method="post" runat="server">
<cc1:UmbracoPanel id="Panel1" style="Z-INDEX: 101; LEFT: 16px; POSITION: absolute; TOP: 19px" runat="server"
Width="379px" Height="202px"></cc1:UmbracoPanel>
</form>
</body>
</HTML>

1
src/Umbraco.Web.UI/umbraco/webservices/CMSNode.asmx
View File

@@ -1 +0,0 @@
<%@ WebService Language="C#" CodeBehind="CMSNode.asmx.cs" Class="umbraco.presentation.webservices.CMSNode" %>

1
src/Umbraco.Web.UI/umbraco/webservices/MacroContainerService.asmx
View File

@@ -1 +0,0 @@
<%@ WebService Language="C#" CodeBehind="MacroContainerService.asmx.cs" Class="umbraco.presentation.webservices.MacroContainerService" %>

1
src/Umbraco.Web.UI/umbraco/webservices/Settings.asmx
View File

@@ -1 +0,0 @@
<%@ WebService Language="c#" Codebehind="Settings.asmx.cs" Class="umbraco.webservices.Settings" %>

1
src/Umbraco.Web.UI/umbraco/webservices/progressStatus.asmx
View File

@@ -1 +0,0 @@
<%@ WebService Language="c#" Codebehind="progressStatus.asmx.cs" Class="presentation.umbraco.webservices.progressStatus" %>

1
src/Umbraco.Web.UI/umbraco/webservices/publication.asmx
View File

@@ -1 +0,0 @@
<%@ WebService Language="c#" Codebehind="publication.asmx.cs" Class="umbraco.webservices.publication" %>

1
src/Umbraco.Web.UI/umbraco/webservices/trashcan.asmx
View File

@@ -1 +0,0 @@
<%@ WebService Language="C#" CodeBehind="trashcan.asmx.cs" Class="umbraco.presentation.webservices.trashcan" %>

Some files were not shown because too many files have changed in this diff Show More