Bjarke Berg
765f50a301
Merge branch 'netcore/feature/move-more-install-stuff' into netcore/feature/executable-backoffice
2020-02-27 10:04:30 +01:00
Bjarke Berg
6b9042de7d
Merge branch 'netcore/dev' into netcore/feature/move-more-install-stuff
...
# Conflicts:
# src/Umbraco.Web/UmbracoHelper.cs
2020-02-27 10:03:13 +01:00
Bjarke Berg
8e3cb8f3e6
Removed MembershipHelper from UmbracoHelper
2020-02-27 09:56:35 +01:00
Bjarke Berg
ba97598044
- Moved dashboards to Core
...
- Introduced IUserAgentProvider, instead of using HttpContext directly
- Introduced IUmbracoApplicationLifetime, instead of using UmbracoApplication directly
- Introduced IMachineKeyConfig instead of using WebConfigurationManager directly
- Move information about dbProvider to the SqlSyntax
- Moved install steps
2020-02-26 13:52:06 +01:00
Bjarke Berg
c7a45eff1d
Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/executable-backoffice
2020-02-26 10:39:11 +01:00
Bjarke Berg
8d76499969
Separated TreeNode stuff from the commonMapper to allow move of more mappers
2020-02-26 10:33:05 +01:00
Bjarke Berg
57aa93959a
Merge pull request #7717 from umbraco/netcore/feature/migrate-more-property-editors
...
Netcore: Move property editors to Infrastructure
2020-02-26 07:49:36 +01:00
Bjarke Berg
35eb67dd10
Merge pull request #7712 from umbraco/netcore/feature/AB5168-migrate-macros
...
Netcore: Move macros to Abstractions and Infrastructure
2020-02-26 07:39:06 +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
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
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
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
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
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
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
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
