Commit Graph

32934 Commits

Author SHA1 Message Date
Kenn Jacobsen
5e155a871c Fix the create dialog on empty installs 2020-02-25 21:42:37 +01:00
Kenn Jacobsen
f4cd1c2f0c Fix JS errors for Nested Content in single mode 2020-02-25 21:28:40 +01:00
Bjarke Berg
5e1ac76e5f Bugfix: Sometimes the httpcontext is null here 2020-02-25 21:11:17 +01:00
elitsa
42db16b430 Moving the last few Property Editors to Infrastructure proj 2020-02-25 16:06:14 +01:00
Elitsa Marinovska
e0b9219528 Update MacroContent.cs to use is operator for comparison to null
Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
2020-02-25 14:27:58 +01:00
Warren Buckley
aa8e2b0859 Merge pull request #7696 from kjac/v8/fix/login-culture-unset-2
V8: Make sure mculture is set after logout and login
(cherry picked from commit 4acddb288a)
2020-02-25 13:08:22 +00:00
Warren Buckley
4acddb288a Merge pull request #7696 from kjac/v8/fix/login-culture-unset-2
V8: Make sure mculture is set after logout and login
2020-02-25 13:07:34 +00:00
elitsa
02fbf0f9e7 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5168-migrate-macros 2020-02-25 13:44:48 +01:00
elitsa
0bdf03bda2 Removing the last references to MacroTypes and removing the references to pageElements coming from old legacy (PublishedContentHashtableConverter), which is deleted as well 2020-02-25 13:43:08 +01:00
elitsa
65e719cfa6 Migrating more Macro files to Abstractions or Infrastructure 2020-02-25 13:40:22 +01:00
elitsa
0a130d6bbd Removing MacroType enum as we only have one type - PartialView. Refactoring all its references and fixing tests 2020-02-25 13:38:36 +01:00
elitsa
c3d3e6e27d As GetAsText() had no other purpose when WebForm Controls were removed, it is now replaced with the populated Text property 2020-02-25 13:33:22 +01:00
elitsa
10563577d9 Eliminating WebForms Controls from MacroContent and migrating the file from Web to Abstractions/Core project 2020-02-25 13:29:03 +01:00
Bjarke Berg
85df997486 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/executable-backoffice 2020-02-25 12:00:40 +01:00
Bjarke Berg
bf4023afa7 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev
# Conflicts:
#	src/Umbraco.Infrastructure/PropertyEditors/DataValueReferenceFactoryCollection.cs
#	src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
#	src/Umbraco.Web/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs
2020-02-25 11:57:11 +01:00
Bjarke Berg
814e74b5c5 removed reference to non existing project 2020-02-25 10:58:53 +01:00
Bjarke Berg
d140723b22 Cleanup legacy stuff in Umbraco.Web.csproj 2020-02-25 10:56:33 +01:00
Warren Buckley
a65bf08f1a Merge pull request #7630 from kjac/v8/fix/nested-content-single-mode-add-more-than-one
V8: Nested Content can't add multiple items
2020-02-25 09:43:56 +00:00
Bjarke Berg
95a27b82a2 Fix for jobject casting issue 2020-02-25 10:40:39 +01:00
Bjarke Berg
f5a1981ea5 Moved dashboards 2020-02-25 10:18:31 +01:00
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