Shannon
|
8f01a2ab0a
|
fixes merge issues
|
2018-03-29 22:13:41 +11:00 |
|
Shannon
|
881fbb7f76
|
Merge remote-tracking branch 'origin/dev-v7' into dev-v8
# Conflicts:
# build/Modules/Umbraco.Build/Umbraco.Build.psm1
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Core/DatabaseContext.cs
# src/Umbraco.Core/IO/FileSystemProviderManager.cs
# src/Umbraco.Core/ObjectExtensions.cs
# src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenSevenZero/AddUserGroupTables.cs
# src/Umbraco.Core/PropertyEditors/ValueConverters/IntegerValueConverter.cs
# src/Umbraco.Core/Services/IdkMap.cs
# src/Umbraco.Core/Services/UserService.cs
# src/Umbraco.Core/packages.config
# src/Umbraco.Tests.Benchmarks/app.config
# src/Umbraco.Tests/UI/LegacyDialogTests.cs
# src/Umbraco.Web/Cache/MediaCacheRefresher.cs
# src/Umbraco.Web/Cache/UnpublishedPageCacheRefresher.cs
# src/Umbraco.Web/Features/DisabledFeatures.cs
# src/Umbraco.Web/Mvc/RenderRouteHandler.cs
# src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs
# src/Umbraco.Web/PublishedCache/ContextualPublishedCache.cs
# src/Umbraco.Web/PublishedCache/ContextualPublishedContentCache.cs
# src/Umbraco.Web/PublishedCache/ContextualPublishedMediaCache.cs
# src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
# src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
# src/Umbraco.Web/PublishedContentQuery.cs
# src/Umbraco.Web/WebApi/Filters/FeatureAuthorizeAttribute.cs
# src/Umbraco.Web/packages.config
# src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs
|
2018-03-29 20:01:14 +11:00 |
|
Stephan
|
c2e1ba21b2
|
Port v7@2aa0dfb2c5 - WIP
|
2018-03-27 16:18:51 +02:00 |
|
Shannon
|
3e2fa64820
|
Changes the Preview Index.cshtml to use a real model instead of viewdata, adds the correct razor web.config for these preview views, changes the enabled feature to be able to inject a razor view instead of strings
|
2018-03-14 13:56:49 +11:00 |
|
Shannon
|
509d27f93b
|
Merge branch 'dev-v7.10' into temp-UAASSCRUM-1405
# Conflicts:
# src/Umbraco.Web/Features/EnabledFeatures.cs
|
2018-03-14 13:38:25 +11:00 |
|
Shannon
|
f42b122e73
|
adding missing files
|
2018-03-14 13:35:51 +11:00 |
|
Shannon
|
bedce100d2
|
Fixes merge and the preview views path
|
2018-03-14 12:55:34 +11:00 |
|
Shannon
|
171e0d87db
|
Updates some of the variable names, removes the EnabledFeatures since we don't really need that
|
2018-03-13 14:31:30 +11:00 |
|
Claus
|
633d1bb0ae
|
changing the template check to an enabled check instead.
|
2018-02-09 13:19:56 +01:00 |
|
Stephan
|
774f333c70
|
U4-10789 - cleanup + beta003
|
2018-01-10 15:24:58 +01:00 |
|
Shannon
|
5cb2dd0036
|
Makes the features internal
|
2018-01-05 15:19:16 +11:00 |
|
Shannon
|
88c20c7c5f
|
Allows for disabling of any umbraco based Controller on startup, this also takes into account disabled trees so if they are disabled, they will not be shown
|
2018-01-03 13:49:36 +11:00 |
|