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
|
33b4af0340
|
UnitOfWork RIP, IScopeAccessor
|
2017-12-14 17:04:44 +01:00 |
|
Stephan
|
9a28250a8d
|
Port 7.7 - WIP
|
2017-09-15 18:22:19 +02:00 |
|
Stephan
|
c76403077f
|
Normalize cr/lf/tab
|
2017-07-20 11:21:28 +02:00 |
|
Stephan
|
e87be7ad9d
|
Fixing tests - and all sorts of issues
|
2017-06-23 18:58:08 +02:00 |
|
Stephan
|
e11b267ef4
|
Bugfix FileSystems vs Scopes
|
2017-06-02 14:00:09 +02:00 |
|
Stephan
|
2435449854
|
Break ScopeProvider vs FileSystems circular dependency
|
2017-05-30 18:59:15 +02:00 |
|
Stephan
|
1f5c47f029
|
Move Plugins to Composing
|
2017-05-30 15:56:30 +02:00 |
|
Stephan
|
81234cd702
|
Rename DI to Composing
|
2017-05-30 15:46:25 +02:00 |
|
Stephan
|
13ec3db2d3
|
fix 7.6-rc1 port
|
2017-05-24 12:25:59 +02:00 |
|
Stephan
|
8561d85f7a
|
porting 7.6-rc1 into 8
|
2017-05-24 12:25:39 +02:00 |
|
Stephan
|
c6e4e3b3ed
|
Merge origin/dev-v7-deploy into dev-v8-zbwip
|
2016-11-04 18:40:42 +01:00 |
|
Stephan
|
b29bc66026
|
Post-merge fixing & refactoring (tests ok)
|
2016-11-04 11:36:58 +01:00 |
|
Stephan
|
b26b415096
|
Merge origin/dev-v7-deploy into dev-v8-zbwip (builds)
|
2016-11-03 10:31:44 +01:00 |
|