Commit Graph

34297 Commits

Author SHA1 Message Date
Bjarke Berg
5aae0c2b52 Removed folder from csproj 2020-08-03 11:15:02 +02:00
Bjarke Berg
c697ec065d Added missing file
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-07-10 21:00:58 +02:00
Bjarke Berg
41ef34547f Reintroduce missing files
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-07-10 14:32:35 +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
e0ae0551f8 Moved back invalid templates to legacy UI project
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-07-10 13:10:56 +02:00
Bjarke Berg
af5b6cf79a Merge pull request #8364 from umbraco/netcore/feature/AB4822-nuget-packages-basis
NetCore: Create new NuGet packages basis
2020-07-10 13:05:07 +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
Bjarke Berg
d94ecfe65e Fixes for running using nuget package
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-07-10 13:00:54 +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
a2fa6e521d UmbracoCms.nuspec and file copying 2020-07-09 18:02:12 +02:00
Shannon Deminick
31a6126a5c Merge pull request #8323 from umbraco/netcore/feature/remaining-backoffice-controllers
Netcore: Migrated remaining backoffice controllers
2020-07-09 21:28:24 +10:00
Bjarke Berg
4f605c71e8 Merge remote-tracking branch 'origin/netcore/feature/fix-integration-tests' into netcore/feature/better-linux-support 2020-07-09 11:09:05 +02:00
Bjarke Berg
cc6cc1e314 Merge remote-tracking branch 'origin/netcore/feature/remaining-backoffice-controllers' into netcore/feature/fix-integration-tests 2020-07-09 11:08:26 +02:00
Bjarke Berg
32893d6adb Fix wrong xml doc comment 2020-07-09 11:06:38 +02:00
Bjarke Berg
1f3d2b13d3 Cleanup test by reusing MockedContentTypes 2020-07-09 11:02:28 +02:00
Bjarke Berg
2fa13e010c Added xml doc to AutoMoqDataAttribute 2020-07-09 11:00:29 +02:00
Bjarke Berg
819c1ba7ae Format fix 2020-07-09 10:51:56 +02:00
Shannon Deminick
6573099ef5 Merge pull request #8302 from umbraco/netcore/feature/contentcontroller_and_related
Netcore: Content/Media controller + ContentType+MediaType controller
2020-07-09 17:36:39 +10:00
Bjarke Berg
d0ead8454b Removed log file
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-07-08 11:21:07 +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
0c4959fc99 Merge branch 'netcore/feature/AB4822-nuget-packages-basis' into netcore/feature/AB4827-sqlce-nuget 2020-07-08 09:14:28 +02:00
Elitsa Marinovska
6282ac4a5b Merged changes from base branch 2020-07-08 09:07:54 +02:00
Elitsa Marinovska
8c38c22648 Added additional target framework and changed nuget package title 2020-07-08 08:40:55 +02:00
Bjarke Berg
0a088e4ef4 casing changed
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-07-08 06:48:41 +02:00
Bjarke Berg
8c46eab939 bugfix
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-07-08 06:45:10 +02:00
Bjarke Berg
f7c6d1c68c bugfix
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-07-08 06:37:14 +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
Elitsa Marinovska
c03bff4399 Nuget package specifications for SQL CE 2020-07-07 16:10:06 +02:00
Bjarke Berg
a755dcd53a Merge remote-tracking branch 'origin/netcore/feature/remaining-backoffice-controllers' into netcore/feature/fix-integration-tests 2020-07-07 15:04:20 +02:00
Bjarke Berg
6e5dfbf8da fixed issue with formatting, by changing order of attributes
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-07-07 15:03:31 +02:00
Bjarke Berg
711e2306e0 Cleanup
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-07-07 15:02:53 +02:00
Bjarke Berg
351fa02df2 Merge remote-tracking branch 'origin/netcore/feature/fix-integration-tests' into netcore/feature/better-linux-support 2020-07-07 14:10:21 +02:00
Bjarke Berg
254921e24c inserted explicit on failing tests.. Still need to investigate
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-07-07 14:10:00 +02:00
Bjarke Berg
cc4b275c79 Merge remote-tracking branch 'origin/netcore/feature/remaining-backoffice-controllers' into netcore/feature/fix-integration-tests 2020-07-07 14:06:39 +02:00
Bjarke Berg
b1fc81b642 Merge fix
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-07-07 14:06:21 +02:00
Bjarke Berg
2372e5307c Merge remote-tracking branch 'origin/netcore/feature/remaining-backoffice-controllers' into netcore/feature/fix-integration-tests 2020-07-07 14:02:48 +02:00
Bjarke Berg
34979566ea Merge remote-tracking branch 'origin/netcore/feature/contentcontroller_and_related' into netcore/feature/remaining-backoffice-controllers 2020-07-07 14:02:25 +02:00
Bjarke Berg
7a3f658ccc Dispose StreamReaders
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-07-07 14:00:47 +02:00
Bjarke Berg
0a759553a7 fixed issue with formatting, by changing order of attributes
Signed-off-by: Bjarke Berg <mail@bergmania.dk>
2020-07-07 13:56:14 +02:00
Bjarke Berg
4993e99f4d Merge remote-tracking branch 'origin/netcore/feature/fix-integration-tests' into netcore/feature/fix-integration-tests 2020-07-07 13:26:31 +02:00
Bjarke Berg
a67629e9c0 Merge remote-tracking branch 'origin/netcore/feature/remaining-backoffice-controllers' into netcore/feature/fix-integration-tests 2020-07-07 13:25:58 +02:00
Bjarke Berg
f3614d51fa Merge remote-tracking branch 'origin/netcore/feature/contentcontroller_and_related' into netcore/feature/remaining-backoffice-controllers
# Conflicts:
#	src/Umbraco.Web.BackOffice/Filters/UmbracoAuthorizeFilter.cs
2020-07-07 13:17:08 +02:00
Bjarke Berg
2e74a986f3 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/contentcontroller_and_related 2020-07-07 13:15:08 +02:00
Bjarke Berg
84b3bc94b4 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 2020-07-07 13:13:51 +02:00
Bjarke Berg
1cca4b50aa Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-07-07 13:08:57 +02:00