yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,022 Commits 4 Branches 7 Tags
3eb897a16facbabf533388d4006d53ace770a62e
Commit Graph

57 Commits

Author SHA1 Message Date
Nikolaj
00b30f74c7 Fix 2020-09-07 09:06:46 +02:00
Nikolaj
1eb7e9c1eb Add further progress 2020-09-02 14:44:01 +02:00
Bjarke Berg
3d55dcd3c4 Merge remote-tracking branch 'netcore/dev' into netcore/netcore 2020-08-26 08:05:15 +02:00
Bjarke Berg
66a0125d3f Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB7446-ModelsBuilderEmbedded-migration 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Web.nuspec
 2020-08-21 13:26:00 +02:00
Bjarke Berg
091a777b62 Conditional load of netframework dlls 2020-08-19 19:51:06 +02:00
Bjarke Berg
95c30d4cd0 Fix for packages 2020-08-12 15:59:30 +02:00
Bjarke Berg
996130b58d Post merge fix 2020-08-12 13:26:24 +02:00
Bjarke Berg
3ec13b3190 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/better-linux-support 
# Conflicts:
#	build/NuSpecs/UmbracoCms.SqlCe.nuspec
 2020-08-12 13:25:24 +02:00
Bjarke Berg
cdd2dc51b4 Copy files on publish 2020-08-12 10:03:40 +02:00
Bjarke Berg
f7e0b115aa copy language files on publish 2020-08-11 15:00:39 +02:00
Bjarke Berg
1123b8bea5 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/better-linux-support 
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
 2020-08-11 08:33:11 +02:00
Elitsa Marinovska
6797f5af5b Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB7446-ModelsBuilderEmbedded-migration 2020-07-13 13:44:04 +02:00
Elitsa Marinovska
c0d266fc92 Migrating project to .net core 2020-07-13 13:38:41 +02:00
Bjarke Berg
5f47e75231 Merge remote-tracking branch 'origin/netcore/feature/fix-integration-tests' into netcore/feature/better-linux-support 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-10 14:15:38 +02:00
Bjarke Berg
add44c4139 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/fix-integration-tests 2020-07-10 13:50:44 +02:00
Bjarke Berg
3daad871ce Merge pull request #8396 from umbraco/netcore/feature/AB4827-sqlce-nuget 
NuGet package specifications for SQL CE
 2020-07-10 13:49:42 +02:00
Bjarke Berg
1c38b25cfb fix for csproj file 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-10 13:04:24 +02:00
Bjarke Berg
b4bc1f79b5 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB4822-nuget-packages-basis 2020-07-10 13:03:35 +02:00
Elitsa Marinovska
498f01fa10 Removing duplicated folder reference 
which causes the proj to not load in Visual Studio
 2020-07-10 11:24:50 +02:00
Bjarke Berg
1625cb323d Moved lang-folder 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-10 06:44:56 +02:00
Bjarke Berg
66a549c89b Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/AB4822-nuget-packages-basis 2020-07-09 18:03:15 +02:00
Bjarke Berg
1dcacda036 Moved umbraco cshtml files into the umbraco folder 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-08 11:18:23 +02:00
Elitsa Marinovska
6282ac4a5b Merged changes from base branch 2020-07-08 09:07:54 +02:00
Bjarke Berg
6bb33c865f Small fixes to build.ps1 and added xml doc generation to projects 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-07 20:40:44 +02:00
Bjarke Berg
c49f50e6d4 Clean up 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-04 19:04:04 +02:00
Bjarke Berg
9fbb7c08c6 Small fixes for linux support, made from windows 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-07-04 18:47:06 +02:00
Bjarke Berg
1dc0dc497d added files that are renamed with casing only 2020-07-04 17:39:44 +02:00
Bjarke Berg
f85204eaa1 Fixed lot of small issues for linux 2020-07-04 15:07:07 +02:00
Bjarke Berg
7b546e6cee Attempts to fix issue 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-30 20:11:39 +02:00
Bjarke Berg
cbb0d5cb6b Added SQLCe refernece to the netcore project 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-29 14:38:15 +02:00
Bjarke Berg
1594a84d80 migated remaining backoffice controllers 
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
 2020-06-22 10:08:08 +02:00
Bjarke Berg
71a8cb6d35 https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6587 - Migrated DataTypeController + Fixed injection of services to UmbracoApplicationAuthorizeAttribute 2020-05-26 14:42:19 +02:00
Bjarke Berg
2c2d70c500 https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6587 - Moved controllers: HealthCheckController + All localization files + fixed issues with MapPath from wwwroot to content root 2020-05-25 14:50:51 +02:00
Bjarke Berg
ee3615e36d https://dev.azure.com/umbraco/D-Team%20Tracker/_workitems/edit/6587 - Moved controllers: TagsDataController, RteEmbedController, RichTextPreValueController, NestedContentController, WebProfilingController + Moved compose of MapDefinitionCollectionBuilder into core, and uncommented missing map definitions 2020-05-25 13:41:05 +02:00
Shannon
0973e49fcf removes test controller 2020-05-18 15:12:07 +10:00
Bjarke Berg
cd48adc7af AB6455 - Stub'ed WebSecurity, cleanup and fix issue with content root vs web root 2020-05-12 20:28:40 +02:00
Shannon
f427059d41 Fixes routing for installer to use an area, fixes URL generation 2020-05-12 17:10:02 +10:00
Bjarke Berg
6a078ee09e AB#6233 - reorderen routing 2020-05-07 15:24:46 +02:00
Bjarke Berg
269c75e26b AB¤6233 - Reverted changes to typefinder and implemented check for if SqlCE is available in the install process 2020-05-06 20:37:03 +02:00
Bjarke Berg
b70d7101e3 AB#6233 - Explicit restarts umbraco after install to ensure runtime state is run and umbraco is correct composed. 2020-05-01 13:40:26 +02:00
Bjarke Berg
64dfa009f5 #6233 - version in config removed 2020-04-28 12:31:15 +02:00
Bjarke Berg
bc4713a51c #6233- SqlCE stuff 2020-04-28 07:02:14 +02:00
Bjarke Berg
55d9af2b68 #6233- Install steps + MacroRenderer 2020-04-27 13:00:55 +02:00
Bjarke Berg
f79526e46a Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB6233-install-steps-in-dotnet-core 
# Conflicts:
#	src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
#	src/Umbraco.Web.Common/Runtime/AspNetCoreComposer.cs
 2020-04-24 08:23:55 +02:00
Bjarke Berg
79e9235338 AB#6233 - Install in .NET Core 2020-04-22 08:17:45 +02:00
Shannon
d0f1ea0e59 Gets logging working in netcore, removes remaining usages of AppDomain.CurrentDomain.BaseDirectory and reduces more IOHelper usages 2020-04-21 13:31:55 +10:00
Shannon
ee37d3aa7a Fixes up usage of AppDomain.CurrentDomain.BaseDirectory in log viewer which cannot work in netcore since this is inconsistent with net framework, adds notes, starts configuring serilog with UseUmbraco 2020-04-21 13:07:20 +10: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
12a957e9b6 AB#5820 - Copy client files into both netcore and framework executables 2020-03-31 12:59:10 +02:00
Bjarke Berg
ffc6ce6553 AB#8522 - Smidge implementation of the Runtime Minifier 2020-03-30 21:27:35 +02:00