de2660cfb2
Conflicts: .gitignore .hgtags src/Umbraco.Core/XmlExtensions.cs src/Umbraco.Tests/Umbraco.Tests.csproj src/Umbraco.Web.UI/Umbraco.Web.UI.csproj src/Umbraco.Web/Umbraco.Web.csproj src/Umbraco.Web/umbraco.presentation/umbraco/create/CreatedPackageTasks.cs src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScriptingTasks.cs src/Umbraco.Web/umbraco.presentation/umbraco/create/MediaTypeTasks.cs src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs src/Umbraco.Web/umbraco.presentation/umbraco/create/XsltTasks.cs src/Umbraco.Web/umbraco.presentation/umbraco/create/content.ascx.cs src/Umbraco.Web/umbraco.presentation/umbraco/create/contentTasks.cs src/Umbraco.Web/umbraco.presentation/umbraco/create/dialogHandler_temp.cs src/Umbraco.Web/umbraco.presentation/umbraco/create/dictionaryTasks.cs src/Umbraco.Web/umbraco.presentation/umbraco/create/media.ascx.cs src/Umbraco.Web/umbraco.presentation/umbraco/create/mediaTasks.cs src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs src/Umbraco.Web/umbraco.presentation/umbraco/create/nodetypeTasks.cs src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs src/Umbraco.Web/umbraco.presentation/umbraco/create/templateTasks.cs src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx.cs src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
91 lines
2.3 KiB
Plaintext
91 lines
2.3 KiB
Plaintext
*.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/[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/*.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/main.js
|
|
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/app.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/*
|