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

178 Commits

Author SHA1 Message Date
Bjarke Berg
cda531e34e Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	.gitignore
#	src/Umbraco.Web/Editors/ContentController.cs
 2020-05-18 10:37:28 +02:00
Bjarke Berg
45224a35d0 Initial acceptance test commit 2020-05-13 15:18:40 +02:00
Bjarke Berg
55426515c0 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5822-smidge-implementation 
# Conflicts:
#	src/Umbraco.Infrastructure/Media/ImageProcessorImageUrlGenerator.cs
#	src/Umbraco.Infrastructure/Models/ImageProcessorImageUrlGenerator.cs
#	src/Umbraco.Infrastructure/Models/ImageSharpImageUrlGenerator.cs
#	src/Umbraco.Web.BackOffice/AspNetCore/AspNetCoreComposer.cs
#	src/Umbraco.Web.Common/Extensions/UmbracoCoreServiceCollectionExtensions.cs
#	src/Umbraco.Web.UI.NetCore/Startup.cs
#	src/Umbraco.Web.UI.NetCore/appsettings.json
 2020-03-31 15:36:25 +02:00
Bjarke Berg
86fe83ca16 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/ab5820-webprofiler-aspnetcore 
# Conflicts:
#	src/Umbraco.Web.BackOffice/AspNetCore/UmbracoCoreServiceCollectionExtensions.cs
#	src/Umbraco.Web.Common/AspNetCore/AspNetCoreUmbracoApplicationLifetime.cs
#	src/Umbraco.Web.UI.NetCore/Startup.cs
 2020-03-26 07:10:23 +01:00
Shannon Deminick
8b531b7aea Merge pull request #7820 from umbraco/netcore/feature/unit-test-project 
NetCore: Introduces a seperate UnitTest project
 2020-03-26 15:24:19 +11:00
Bjarke Berg
397b25f9ae Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/ab5820-webprofiler-aspnetcore 
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/Startup.cs
 2020-03-24 19:38:44 +01:00
Bjarke Berg
9339e1d999 AB#5820 - Introduced WebProfiler for asp.net core 2020-03-24 18:56:45 +01:00
Bjarke Berg
8c8a9764cd Post merge + Added new SmtpSettingsBuilder 2020-03-18 07:42:35 +01:00
Bjarke Berg
9bf2d650ec Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/unit-test-project 2020-03-18 07:03:03 +01:00
Shannon
7e679f34c4 fixes sln 2020-03-16 22:41:55 +11:00
Shannon
fea65897ba Merge branch 'netcore/dev' into netcore/feature/booting-netcore 2020-03-13 12:50:08 +11:00
Shannon
4e4df96140 Creates new Umbraco.Tests.Common netstandard project to host the common testing functionality between netframework and netcore, this will be ongoing work (doesn't need to be done all at once) 2020-03-13 12:08:25 +11:00
Shannon
da58b7a743 Adds integration test project for netcore3 and poc for crosswiring di container with msdi 2020-03-12 23:28:24 +11:00
Bjarke Berg
290e5b58a0 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/executable-backoffice 
# Conflicts:
#	src/Umbraco.Web/Runtime/WebRuntime.cs
 2020-03-04 10:10:03 +01:00
Bjarke Berg
53953338d8 Merged Umbraco.Abstractions into Umbraco.Core 2020-03-03 13:42:07 +01:00
cyberdot
01362d0dd0 NetCore: Abstract ConfigurationManager references 2020-03-03 11:18:54 +00:00
Bjarke Berg
5517186cb7 Added Web.Website 2020-02-24 10:51:48 +01:00
Bjarke Berg
c975162e14 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/executable-backoffice 2020-02-24 09:57:27 +01:00
Bjarke Berg
683c0b8732 Merge branch 'netcore/dev' into netcore/feature/move-mappings-after-httpcontext 2020-02-24 08:24:19 +01:00
Bjarke Berg
90c2381c86 Renamed Umbraco.Abstractions to Umbraco.Core 2020-02-24 08:21:53 +01:00
Bjarke Berg
942bb0d585 Merge branch 'netcore/feature/move-mappings-after-httpcontext' into netcore/feature/executable-backoffice 
# Conflicts:
#	src/Umbraco.Abstractions/CompositionExtensions.cs
 2020-02-19 14:44:22 +01:00
Bjarke Berg
accef6d96a Merged Umbraco.Examine and Umbraco.Infrastructure and moved more files into Infrastructure 2020-02-18 13:34:31 +01:00
Bjarke Berg
5e79585149 Introduced Umbraco.Web.UI.Backoffice 2020-02-18 08:32:06 +01:00
Bjarke Berg
b850b3c8fe AB4950 - Created new Umbraco.Web.BackOffice project. Moved dashboards into this new project (#7615) 2020-02-10 09:06:29 +01:00
Bjarke Berg
d147b182ee Renamed the project to Umbraco.PublishedCache.NuCache - and move non NuCache related stuff to abstractions and infrastructure. 2020-02-06 14:40:46 +01:00
Bjarke Berg
0bc843b06d Merge remote-tracking branch 'origin/netcore/dev' into feature/netcore-publish-cache 2020-02-06 14:09:23 +01:00
Bjarke Berg
c0a59cbad7 Renamed SqlCe Project 2020-02-06 08:49:02 +01:00
Bjarke Berg
a3867d93dd Replaced the Umbraco.Examine.Lucene.csproj with the new format (PackageReferences) 2020-02-05 08:17:30 +01:00
Bjarke Berg
420d8d2ba8 Merge remote-tracking branch 'origin/netcore/dev' into feature/netcore-publish-cache 2020-02-04 07:14:41 +01:00
Andy Butland
171fce2ecb Moved PublishedCache from Umbraco.Web into .Net standard project. 
Returned to compiling state with a number of things to check and some temporarily commented out functionality.
 2020-01-30 20:08:03 +01:00
Shannon
4183514b52 Renames Examine2 to Examine as the netstandard part 2020-01-28 17:11:43 +11:00
Shannon
69f4ea5484 Renames Umbraco.Examine project to Umbraco.Examine.Lucene for the Lucene implementation part 2020-01-28 17:09:45 +11:00
Shannon
0343b302f3 Moving stuff to Examine2 (temp name) as a netstandard project, updates to latest Examine netstandard, moves constants to separate class. 2020-01-28 16:37:55 +11:00
Bjarke Berg
d7377bd9b4 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
#	src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsBuilderConfig.cs
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/web.Template.Debug.config
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/DataTypeController.cs
#	src/Umbraco.Web/Editors/MacrosController.cs
#	src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
 2020-01-21 10:51:04 +01:00
Shannon
8cc78631a0 Adds TestData project along with test endpoints for enabling/disabling segments 2020-01-21 13:33:39 +11:00
Bjarke Berg
a33d1b4fef Added UnitTest project 2020-01-09 13:04:27 +01:00
Bjarke Berg
c7f60d8312 AB3986 - Wrapped System.Web.Hosting.IRegisteredObject in the AspNetHostingEnvironment. Updated Maindom to use our own new interface and the wrapper and moved to infrastructure. Removed the Umbraco.Core project now that it was empty. 2020-01-08 09:01:58 +01:00
Bjarke Berg
cdfd3df98a AB4231 - Moved SqlCe classes to separate project 2020-01-07 14:52:59 +01:00
Bjarke Berg
126380dcee AB3594 - Removed references from core to configuration 2019-11-14 12:49:56 +01:00
Bjarke Berg
4f5a5a09b4 Move events 2019-11-07 13:02:26 +01:00
Bjarke Berg
d8cfd786aa Created empty infrastructure project 2019-11-05 16:52:49 +01:00
Bjarke Berg
1732fad780 Merge remote-tracking branch 'origin/v8/feature/mb-embed' into netcore/feature/mb_embed 2019-11-05 07:54:49 +01:00
Shannon
3b6abbb936 Renames project: Umbraco.ModelsBuilder.Embedded and namespaces since we need a different assembly, updates nuspec, changes file path of MB app_plugins 2019-10-29 00:25:03 +11:00
Bjarke Berg
e1c6f721b0 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/mb-embed 2019-10-21 13:33:59 +02:00
Bjarke Berg
2b8805b69d Merge branch 'v8/dev' into vx/feature/unicore 
# Conflicts:
#	src/Umbraco.Web.UI.Client/package-lock.json
 2019-10-09 11:09:10 +02:00
Stephan
cbf6801d5a Merge branch v8/dev into v8/feature/mb-embed 2019-09-12 09:33:10 +02:00
Shannon
c219c21edd ensures tests and benchmark projects are building in Debug mode 2019-09-10 17:23:49 +10:00
Peter Gregory
31d67161ab V8: Implementation of Create method for infinite editing edtior… (#6031) 2019-08-13 08:07:53 +02:00
Bjarke Berg
9a2d309dbe Merge remote-tracking branch 'origin/v8/dev' into vx/feature/unicore 
# Conflicts:
#	src/Umbraco.Abstractions/EnumerableExtensions.cs
#	src/Umbraco.Abstractions/Models/Entities/EntityBase.cs
#	src/Umbraco.Core/Models/Member.cs
 2019-07-03 15:05:34 +02:00
Shannon
7b0979f9fd Fixes install.ps1 and updates sln to remove old ps1 file 2019-07-02 19:15:04 +10:00