Commit Graph

33043 Commits

Author SHA1 Message Date
Bjarke Berg
4aac898e08 Worked on AspNetCoreHostingEnvironment.cs 2020-02-25 10:18:07 +01:00
Bjarke Berg
8f5ffb8da6 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/executable-backoffice 2020-02-25 09:03:52 +01:00
Bjarke Berg
9a8ecea8a6 Updated copyright year 2020-02-25 08:56:58 +01:00
Bjarke Berg
04caec842a Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/executable-backoffice
# Conflicts:
#	src/Umbraco.Examine/Umbraco.Examine.csproj
2020-02-25 08:38:15 +01:00
Bjarke Berg
06af62d87d Merge pull request #7691 from umbraco/netcore/feature/move-mappings-after-httpcontext
NetCore: Move more files
2020-02-25 08:26:39 +01:00
Bjarke Berg
6bb920b457 Added comments, and replaced a static helper with extension methods 2020-02-25 07:57:59 +01:00
Kenn Jacobsen
69b3bc6fc7 V8: Remove create option in listviews for deleted content (#7655) 2020-02-24 18:46:36 +00:00
Kenn Jacobsen
23f8c3e474 V8: Correct cursor for list view search icon (#7656) 2020-02-24 18:28:11 +00:00
Shannon Deminick
92da83194a Missing null check which will cause a YSOD if empty value (#7661) 2020-02-24 18:27:26 +00:00
Warren Buckley
4275401c4b Merge pull request #7654 from kjac/v8/fix/recycle-bin-without-mculture
V8: Ensure that the recycle bin doesn't delete content at root
2020-02-24 15:50:13 +00:00
Bjarke Berg
14eb630cc3 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/move-mappings-after-httpcontext
# Conflicts:
#	src/Umbraco.Examine/Umbraco.Examine.csproj
2020-02-24 16:19:14 +01:00
Bjarke Berg
36b68f2966 Creating composition root 2020-02-24 16:18:47 +01:00
Warren Buckley
4ed69d21a0 Merge branch 'v8/8.6' up into v8/dev
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
2020-02-24 15:11:58 +00:00
Kenn Jacobsen
2b103f539d Fix overlays in fullscreen RTE (#7697) 2020-02-24 14:06:18 +00:00
Bjarke Berg
20201fb6be Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/executable-backoffice 2020-02-24 14:58:58 +01:00
Bjarke Berg
4425c3d5c0 Merge pull request #7708 from umbraco/netcore/feature/csharp-8
Netcore: Updated projects to have C# 8 support
2020-02-24 14:58:42 +01:00
Bjarke Berg
aad8cba039 Updated projects to have C# 8 support 2020-02-24 13:37:27 +01:00
Sebastiaan Janssen
858390f2b0 Merge branch 'v8/dev' into v8/contrib 2020-02-24 12:16:11 +01:00
Jeavon
5efeb53805 Add missing methods "GetChildren(Guid id)" & "HasChildren(Guid id)" to "IContentTypeBaseService" (#7700) 2020-02-24 11:11:33 +00:00
Bjarke Berg
e74c22ec87 Merge branch 'netcore/feature/move-mappings-after-httpcontext' into netcore/feature/executable-backoffice 2020-02-24 11:46:58 +01:00
Bjarke Berg
1d6e423b98 Added Imagesharp to the website stuff 2020-02-24 11:37:51 +01:00
Nathan Woulfe
51481bbe3a Update editor.service.js (#7703)
fix ngdoc description for templateEditor fn
2020-02-24 10:35:46 +00:00
Bjarke Berg
c9b970e872 Using the ServiceContext from the baseclass instead of Current.Services in tests (#7644) 2020-02-24 11:27:02 +01:00
Bjarke Berg
329ad4324e Removed file 2020-02-24 10:53:54 +01:00
Bjarke Berg
5517186cb7 Added Web.Website 2020-02-24 10:51:48 +01:00
Bjarke Berg
f398f578ea Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/executable-backoffice 2020-02-24 10:40:16 +01:00
Bjarke Berg
de59d499a9 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/move-mappings-after-httpcontext 2020-02-24 10:39:39 +01:00
Bjarke Berg
133b194d7e Roll back to c# 7 on core 2020-02-24 10:14:16 +01:00
Bjarke Berg
de95a1c712 Roll back to c# 7 on core 2020-02-24 10:10:25 +01:00
Bjarke Berg
20a7a6be42 Merge branch 'netcore/dev' into netcore/feature/move-mappings-after-httpcontext 2020-02-24 10:06:59 +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
Niels Lyngsø
fcc079111d Slightly brigther disable state 2020-02-22 20:01:16 +01:00
Nathan Woulfe
d65b8f14ba add pointer-events:none on disabled checkbox/radio 2020-02-22 12:02:50 +01:00
Kenn Jacobsen
634741e35b Make sure mculture is set after logout and login 2020-02-20 19:56:33 +01:00
Poornima Nayar
366b4fc70d Merge pull request #7690 from nathanwoulfe/fix-regression-from-validation-changes
Fix regression from valpropertymsg directive changes
2020-02-20 09:38:59 +00:00
Bjarke Berg
e497079a89 Merge branch 'netcore/feature/move-mappings-after-httpcontext' into netcore/feature/executable-backoffice 2020-02-20 10:16:24 +01:00
Bjarke Berg
8c0e50ccd6 Fix issue in Test project still referencing Umbraco.Examine 2020-02-20 09:25:26 +01:00
Bjarke Berg
bbe9aa1848 Fix issue with NuCache knowing the web project 2020-02-20 09:05:42 +01:00
Bjarke Berg
46a68d1b86 Rename file to align with class name 2020-02-20 09:00:50 +01:00
Bjarke Berg
d1c39a813a Merge branch 'netcore/dev' into netcore/feature/move-mappings-after-httpcontext
# Conflicts:
#	src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
#	src/Umbraco.Web/Install/InstallHelper.cs
2020-02-20 08:46:54 +01:00
Bjarke Berg
46f00cf960 Merge remote-tracking branch 'origin/netcore/dev' into netcore/dev 2020-02-20 08:34:01 +01:00
Bjarke Berg
79ee20a45b Post merge - Move files into correct locations 2020-02-20 08:33:28 +01:00
Bjarke Berg
b8b31e7814 Merge pull request #7639 from emmagarland/netcore/feature/7369-removeservices-unittests
Replaced instances of Current.Services.MediaService in more Unit Tests
2020-02-20 08:31:34 +01:00
Bjarke Berg
e96d094c71 Merge remote-tracking branch 'origin/netcore/dev' into netcore/dev 2020-02-20 08:26:04 +01:00
Shannon Deminick
ba2c0da379 Merge pull request #7646 from AndyButland/netcore/fix-circular-dependency-data-type-repository
Removed circular dependency between data type service and repository
2020-02-20 18:11:01 +11:00
Bjarke Berg
e6c315ff69 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
#	src/Umbraco.Web/Editors/UpdateCheckController.cs
#	src/Umbraco.Web/Install/InstallHelper.cs
2020-02-20 08:06:37 +01:00
Bjarke Berg
4ca4d8e6e0 Merge pull request #7684 from umbraco/v8/feature/AB4953-change-webservice-to-rest
Change web service invocation to new Our rest endpoints
2020-02-20 08:02:38 +01:00
Bjarke Berg
ce821ee2bf worked on HostingEnvironment 2020-02-20 07:55:24 +01:00