fc054e6546
# Conflicts: # build/NuSpecs/UmbracoCms.Web.nuspec # src/SolutionInfo.cs # src/Umbraco.Infrastructure/Logging/Serilog/LoggerConfigExtensions.cs # src/Umbraco.Infrastructure/PropertyEditors/NestedContentPropertyEditor.cs # src/Umbraco.Tests.AcceptanceTest/cypress/integration/Tour/backofficeTour.ts # src/Umbraco.Tests.AcceptanceTest/package.json # src/Umbraco.Tests/TestHelpers/TestObjects.cs # src/Umbraco.Web.BackOffice/Controllers/ContentTypeController.cs # src/Umbraco.Web.BackOffice/Controllers/ImageUrlGeneratorController.cs # src/Umbraco.Web.BackOffice/Controllers/ImagesController.cs # src/Umbraco.Web.BackOffice/Controllers/MediaController.cs # src/Umbraco.Web.BackOffice/Controllers/MemberTypeController.cs # src/Umbraco.Web.BackOffice/Controllers/RelationTypeController.cs # src/Umbraco.Web.BackOffice/Controllers/TemplateController.cs # src/Umbraco.Web.UI.Client/src/common/services/formhelper.service.js # src/Umbraco.Web.UI.Client/src/installer/steps/database.html # src/Umbraco.Web.UI.Client/src/less/components/tree/umb-tree.less # src/Umbraco.Web.UI.Client/src/less/components/umb-property-actions.less # src/Umbraco.Web.UI.Client/src/less/forms.less # src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/querybuilder/querybuilder.html # src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/treepicker/treepicker.html # src/Umbraco.Web.UI.Client/src/views/components/application/umb-navigation.html # src/Umbraco.Web.UI.Client/src/views/components/property/umb-property-actions.html # src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.controller.js # src/Umbraco.Web.UI.Client/src/views/content/overlays/publishdescendants.html # src/Umbraco.Web.UI.Client/src/views/dictionary/edit.html # src/Umbraco.Web.UI.Client/src/views/dictionary/list.html # src/Umbraco.Web.UI.Client/src/views/logViewer/search.html # src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js # src/Umbraco.Web.UI.Client/src/views/mediaTypes/edit.controller.js # src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js # src/Umbraco.Web.UI.Client/src/views/memberTypes/edit.controller.js # src/Umbraco.Web.UI.Client/src/views/packages/views/repo.html # src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/layoutconfig.html # src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/rowconfig.html # src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts.prevalues.html # src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.listviewlayout.controller.js # src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js # src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js # src/Umbraco.Web.UI.NetCore/umbraco/UmbracoBackOffice/Default.cshtml # src/Umbraco.Web.UI.NetCore/umbraco/config/lang/da.xml # src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml # src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en_us.xml # src/Umbraco.Web.UI/Umbraco/config/lang/cs.xml # src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Media.cshtml # src/Umbraco.Web.UI/config/umbracoSettings.config # src/Umbraco.Web/Editors/BackOfficeServerVariables.cs # src/Umbraco.Web/Editors/DictionaryController.cs # src/Umbraco.Web/Editors/LogController.cs # src/Umbraco.Web/Editors/MediaTypeController.cs # src/Umbraco.Web/Editors/MemberGroupController.cs
191 lines
5.0 KiB
Plaintext
191 lines
5.0 KiB
Plaintext
#
|
|
# Umbraco Cms Git Ignore
|
|
#
|
|
|
|
# common files
|
|
*.obj
|
|
*.pdb
|
|
*.user
|
|
*.aps
|
|
*.pch
|
|
*.vspscc
|
|
*.orig
|
|
*.suo
|
|
*.vs10x
|
|
*.ndproj
|
|
*.ignorer.*
|
|
|
|
# common directories
|
|
.DS_Store
|
|
._.DS_Store
|
|
.vs/
|
|
/local/
|
|
|
|
# build directories
|
|
[Bb]in/
|
|
[Db]ebug*/
|
|
[Rr]elease*/
|
|
obj/
|
|
|
|
# tools
|
|
_ReSharper*/
|
|
_NCrunch_*/
|
|
*.ncrunchsolution
|
|
*.ncrunchsolution.user
|
|
*.ncrunchproject
|
|
*.crunchsolution.cache
|
|
tools/NDepend/
|
|
|
|
|
|
|
|
|
|
[Tt]est[Rr]esult*
|
|
[Bb]uild[Ll]og.*
|
|
*.[Pp]ublish.xml
|
|
[sS]ource
|
|
[sS]andbox
|
|
umbraco.config
|
|
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.Web.UI/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
|
|
|
|
src/Umbraco.Tests/config/applications.config
|
|
src/Umbraco.Tests/config/trees.config
|
|
src/Umbraco.Web.UI/web.config
|
|
src/Umbraco.Web.UI/[Cc]onfig/ClientDependency.config
|
|
src/Umbraco.Web.UI/[Cc]onfig/serilog.config
|
|
src/Umbraco.Web.UI/[Cc]onfig/serilog.user.config
|
|
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
|
|
|
|
node_modules
|
|
lib-bower
|
|
|
|
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/*.loader.js
|
|
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/init.js
|
|
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/canvasdesigner.*.js
|
|
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/navigation.controller.js
|
|
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/main.controller.js
|
|
src/Umbraco.Web.UI/[Uu]mbraco/[Jj]s/utilities.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/
|
|
|
|
src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
|
|
src/Umbraco.Web.UI.Client/vwd.webinfo
|
|
|
|
src/Umbraco.Web.UI/App_Plugins/*
|
|
src/*.psess
|
|
src/*.vspx
|
|
|
|
NDependOut/*
|
|
QueryResult.htm
|
|
|
|
src/Umbraco.Web.UI/[Cc]onfig/appSettings.config
|
|
src/Umbraco.Web.UI/[Cc]onfig/connectionStrings.config
|
|
src/Umbraco.Web.UI/[Uu]mbraco/plugins/*
|
|
build/ApiDocs/*
|
|
build/ApiDocs/Output/*
|
|
src/Umbraco.Web.UI.Client/bower_components/*
|
|
/src/Umbraco.Web.UI/[Uu]mbraco/preview
|
|
/src/Umbraco.Web.UI/[Uu]mbraco/preview.old
|
|
|
|
# ignore rule for clearing out Belle (avoid rebuilding all the time)
|
|
preserve.belle
|
|
|
|
#Ignore Rule for output of generated documentation files from Grunt docserve
|
|
src/Umbraco.Web.UI.Docs/api
|
|
src/Umbraco.Web.UI.Docs/package-lock.json
|
|
src/*.boltdata/
|
|
src/umbraco.sln.ide/*
|
|
src/.vs/
|
|
|
|
src/Umbraco.Web.UI/[Jj]s/*
|
|
src/Umbraco.Tests/[Mm]edia
|
|
tools/docfx/*
|
|
apidocs/_site/*
|
|
src/*/project.lock.json
|
|
src/.idea/*
|
|
|
|
apidocs/api/*
|
|
build/docs.zip
|
|
build/ui-docs.zip
|
|
build/csharp-docs.zip
|
|
src/packages/
|
|
src/PrecompiledWeb/*
|
|
|
|
# build
|
|
build.out/
|
|
build.tmp/
|
|
build/hooks/
|
|
build/temp/
|
|
|
|
|
|
# Acceptance tests
|
|
cypress.env.json
|
|
/src/Umbraco.Tests.AcceptanceTest/cypress/support/chainable.ts
|
|
/src/Umbraco.Tests.AcceptanceTest/package-lock.json
|
|
/src/Umbraco.Tests.AcceptanceTest/cypress/videos/
|
|
/src/Umbraco.Tests.AcceptanceTest/cypress/screenshots/
|
|
|
|
|
|
# eof
|
|
/src/Umbraco.Web.UI.Client/TESTS-*.xml
|
|
/src/ApiDocs/api/*
|
|
/src/Umbraco.Web.UI.Client/package-lock.json
|
|
/src/Umbraco.Web.UI.NetCore/wwwroot/Media/*
|
|
/src/Umbraco.Web.UI.NetCore/wwwroot/is-cache/*
|
|
/src/Umbraco.Tests.Integration/App_Data/*
|
|
/src/Umbraco.Tests.Integration/TEMP/*
|
|
/src/Umbraco.Web.UI.NetCore/wwwroot/Umbraco/assets/*
|
|
/src/Umbraco.Web.UI.NetCore/wwwroot/Umbraco/js/*
|
|
/src/Umbraco.Web.UI.NetCore/wwwroot/Umbraco/lib/*
|
|
/src/Umbraco.Web.UI.NetCore/wwwroot/Umbraco/views/*
|
|
/src/Umbraco.Web.UI.NetCore/wwwroot/App_Data/TEMP/*
|
|
/src/Umbraco.Web.UI.NetCore/App_Data/Logs/*
|
|
/src/Umbraco.Web.UI.NetCore/App_Data/TEMP/TypesCache/*
|
|
/src/Umbraco.Web.UI.NetCore/App_Data/TEMP/*
|
|
/src/Umbraco.Web.UI.NetCore/App_Data/Smidge/Cache/*
|