yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,135 Commits 4 Branches 7 Tags
bee2c2dd16e801c60799e66438dfd47f728a39cf
Commit Graph

947 Commits

Author SHA1 Message Date
Warren
bee2c2dd16 Merge remote-tracking branch 'origin/temp8' into temp8-serilog 
# Conflicts:
#	src/Umbraco.Web.UI/web.Template.Debug.config
 2018-07-30 16:42:15 +01:00
Stephan
ff607aef7a Remove obsolete stuff 2018-07-30 14:04:02 +02:00
Warren
5659624879 Adds Serilogs.Sink.File Nuget package 2018-07-27 15:53:24 +01:00
Warren
0826928ffa Adds in Serilog.Enrichers.Process & Serilog.Enrichers.Thread Nuget Packages 
Removes AppDomainTokenConvertor - as we can add to SeriLog via a custom Enrich Property
 2018-07-27 15:30:25 +01:00
Warren
9909add9be Adds in Serilog core logging Nuget package to csproj & NuSpec to make build output happy 2018-07-27 14:38:34 +01:00
Warren
6527abffd8 Remove Log4Net from the Core Nuget package Install PowerShell script 2018-07-27 13:53:33 +01:00
Warren
20540d9a15 Removes Log4Net NuGet packages & from our NuSpec's for Build scripts 2018-07-27 13:48:29 +01:00
Lotte Pitcher
e920d3f4b2 In build.ps1, use .Path if .Source returns nothing 2018-07-27 11:39:27 +01:00
Stephan
132b729dd9 Fix nuspec for AutoMapper 2018-07-17 15:51:39 +02:00
Stephan
2051caaa01 Post-merge fixes 2018-07-12 18:05:48 +02:00
Shannon
ebe224fb6e Merge branch 'temp8' of https://github.com/umbraco/Umbraco-CMS into temp8 2018-07-11 16:43:21 +10:00
Shannon
7aa413d558 Merge remote-tracking branch 'origin/dev-v7' into temp8 (after fixing) 
# Conflicts:
#	build/Modules/Umbraco.Build/Build-UmbracoDocs.ps1
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/Constants-Applications.cs
#	src/Umbraco.Core/Models/Rdbms/ConsentDto.cs
#	src/Umbraco.Core/Persistence/DatabaseSchemaHelper.cs
#	src/Umbraco.Core/Persistence/Repositories/AuditRepository.cs
#	src/Umbraco.Core/PropertyEditors/ValueConverters/GridValueConverter.cs
#	src/Umbraco.Core/Services/ConsentService.cs
#	src/Umbraco.Core/Services/IRelationService.cs
#	src/Umbraco.Core/Services/RelationService.cs
#	src/Umbraco.Tests/Plugins/PluginManagerTests.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Tests/Services/ConsentServiceTests.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtree.directive.js
#	src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
#	src/Umbraco.Web.UI.Client/src/common/resources/entity.resource.js
#	src/Umbraco.Web.UI.Client/src/common/services/tree.service.js
#	src/Umbraco.Web.UI.Client/src/less/application/grid.less
#	src/Umbraco.Web.UI.Client/src/less/forms.less
#	src/Umbraco.Web.UI.Client/src/less/main.less
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/iconpicker/iconpicker.html
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/treepicker/treepicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/components/content/umb-content-node-info.html
#	src/Umbraco.Web.UI.Client/src/views/components/html/umb-control-group.html
#	src/Umbraco.Web.UI.Client/src/views/components/users/change-password.html
#	src/Umbraco.Web.UI.Client/src/views/content/content.copy.controller.js
#	src/Umbraco.Web.UI.Client/src/views/content/content.move.controller.js
#	src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/views/permissions/permissions.html
#	src/Umbraco.Web.UI.Client/src/views/media/media.move.controller.js
#	src/Umbraco.Web.UI.Client/src/views/mediatypes/edit.controller.js
#	src/Umbraco.Web.UI.Client/src/views/mediatypes/views/permissions/permissions.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/boolean/boolean.controller.js
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/users/views/user/details.html
#	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
#	src/Umbraco.Web.UI/config/EmbeddedMedia.Release.config
#	src/Umbraco.Web.UI/config/EmbeddedMedia.config
#	src/Umbraco.Web.UI/config/trees.Release.config
#	src/Umbraco.Web.UI/config/trees.config
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web.UI/umbraco/Views/Default.cshtml
#	src/Umbraco.Web.UI/umbraco/config/create/UI.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/it.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
#	src/Umbraco.Web/Editors/BackOfficeController.cs
#	src/Umbraco.Web/Editors/BackOfficeServerVariables.cs
#	src/Umbraco.Web/Editors/ContentTypeController.cs
#	src/Umbraco.Web/Editors/MacroController.cs
#	src/Umbraco.Web/Editors/MemberController.cs
#	src/Umbraco.Web/Models/RegisterModel.cs
#	src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ValueConverters/MacroContainerValueConverter.cs
#	src/Umbraco.Web/PublishedContentExtensions.cs
#	src/Umbraco.Web/Trees/ContentTreeController.cs
#	src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
#	src/Umbraco.Web/Trees/TreeControllerBase.cs
#	src/Umbraco.Web/UmbracoHelper.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/settings/EditDictionaryItem.aspx.designer.cs
 2018-07-11 15:58:48 +10:00
Marcin Zajkowski
0a168986cb Merge branch 'temp8' into hackathon-automapper-update 2018-07-03 02:04:30 +02:00
Stephan
7a615133ff Renormalize 2018-06-29 19:52:40 +02:00
Marcin Zajkowski
e350ab89ca Updated nuspec file 2018-06-29 15:04:43 +02:00
Sebastiaan Janssen
f2aa1ea95b Fixes Our reference to old .org domain 2018-06-25 14:50:56 +02:00
Sebastiaan Janssen
bcca0528c0 U4-11462 Error when using Simple Injector - 'The Tree controller is missing the Umbraco.Web.Trees.TreeAttribute attribute' 2018-06-21 08:19:53 +02:00
Sebastiaan Janssen
aca0249c0f NuGet install now creates the correct tree controller 2018-06-13 20:29:55 +02:00
Stephan
062a47f2aa Use ModelsBuilder from NuGet, -alpha.44 2018-06-04 11:37:19 +02:00
Stephan
f92a03b996 Use ModelsBuilder from NuGet, -alpha.43 2018-06-04 11:32:53 +02:00
Stephan
82b5e0be02 Fix nuspec files 2018-05-31 14:02:39 +02:00
Stephan
a3a14c8339 Fix NuGet packages - oh well 2018-05-21 22:38:27 +02:00
Stephan
e4bd0e975e Fix NuGet package 2018-05-21 19:08:52 +02:00
Stephan
f535f6d324 Cleanup ModelsBuilder merge 2018-05-21 11:49:08 +02:00
Stephan
7387379aea Upgrade to ModelsBuilder -alpha.18 2018-05-17 15:32:27 +02:00
Stephan
de9f4f8d0b Cleanup references and dependencies 2018-05-17 13:19:35 +02:00
Stephan
40f2558a70 Cleanup 2018-05-17 13:03:37 +02:00
Stephan
f44c5ad757 Cleanup nuget, bindings, build 2018-05-17 12:17:42 +02:00
Stephan
a6ea270d93 Cleanup build 2018-05-16 21:52:40 +02:00
Stephan
a39a9b7a89 Cleanup nuspec 2018-05-16 16:02:51 +02:00
Stephan
2b7966dc55 Depend on Umbraco.SqlServerCE, package in net47 2018-05-16 15:54:07 +02:00
Stephan
6bedc1020b Cleanup solution and build wip 2018-05-16 15:46:51 +02:00
Stephan
41144bb7f7 Fix references and build 2018-05-03 15:11:33 +02:00
Sebastiaan Janssen
a4cc67f732 Make NuGet package install work 2018-05-02 12:35:10 +02:00
Shannon
c8d2ea141b Removes more xslt, more very old code and configurations that aren't used anymore 2018-05-01 01:15:43 +10:00
Shannon
9a2797303b cleaning up files 2018-04-30 23:30:08 +10:00
Shannon
890b5f30a1 Merge remote-tracking branch 'origin/dev-v7' into temp8 
# Conflicts:
#	src/Umbraco.Core/Configuration/UmbracoSettings/IRepositoriesSection.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/IRepository.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/RepositoriesCollection.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/RepositoriesElement.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/RepositoryConfigExtensions.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/RepositoryElement.cs
#	src/Umbraco.Core/Configuration/UmbracoSettings/UmbracoSettingsSection.cs
#	src/Umbraco.Core/Services/PackagingService.cs
#	src/Umbraco.Tests/Configurations/UmbracoSettings/PackageRepositoriesElementDefaultTests.cs
#	src/Umbraco.Tests/Configurations/UmbracoSettings/PackageRepositoriesElementTests.cs
#	src/Umbraco.Tests/Plugins/PluginManagerTests.cs
#	src/Umbraco.Web.UI.Client/lib/umbraco/Extensions.js
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web.UI/umbraco/developer/Packages/installer.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackager.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/installer.aspx.cs
#	src/umbraco.cms/umbraco.cms.csproj
 2018-04-30 23:25:07 +10:00
Sebastiaan Janssen
bfca8c555e Removes Package repository config setting and related unnecessary code 2018-04-19 19:12:42 +02:00
Stephan
26af63549f Fix vsts - wip 2018-04-17 10:52:32 +02:00
Stephan
6b3c6eba8d Fix csproj, nuspec 2018-04-16 17:04:23 +02:00
Stephan
15c6e28354 Fix nuspec 2018-04-16 16:29:37 +02:00
Stephan
dc589f9b96 Fix csproj, nuspec 2018-04-16 16:08:26 +02:00
Stephan
ed3e693308 Umbraco.Compat7.die.die.die 2018-04-13 11:03:35 +02:00
Stephan
ca00cde043 VSO build wip 2018-04-12 22:58:46 +02:00
Warren
d8459bf4b4 Changes to build script & references etc with Stephan 2018-04-11 18:06:33 +02:00
Stephan
eb6a08af31 v7@11d4189c8d 2018-04-05 14:12:15 +02:00
Stephan
f7a14a03f2 Fix build, still some weird csc.exe versionning 2018-04-04 17:41:55 +02:00
Shannon
471009cfd1 nuspec for examine was incorrect 2018-04-04 16:00:14 +10:00
Stephan
75966dcfbd Merge branch origin/dev-v8 into dev-v8 2018-04-03 14:57:55 +02:00
Stephan
cdd064ba08 Upgrade Dependencies 2018-04-03 14:54:01 +02:00