yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
d37d31246e86c62b46fcb2cb8792833c3519a9e9
Umbraco-CMS/src/Umbraco.Web
History
Shannon d37d31246e Merge remote-tracking branch 'origin/dev-v7' into dev-v8 
Conflicts:
	src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Tests/Persistence/SyntaxProvider/MySqlSyntaxProviderTests.cs
	src/Umbraco.Web.UI/umbraco/create/content.ascx
	src/Umbraco.Web.UI/umbraco/create/member.ascx
	src/Umbraco.Web.UI/umbraco/create/nodeType.ascx
	src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
	src/Umbraco.Web/Security/Identity/BackOfficeCookieManager.cs
	src/Umbraco.Web/Strategies/Migrations/ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs
	src/Umbraco.Web/Strategies/Migrations/PublishAfterUpgradeToVersionSixth.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/WebBootManager.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.cs
2016-03-16 15:02:53 +01:00
..
Cache
Merge remote-tracking branch 'origin/dev-v7' into dev-v8
2016-03-16 15:02:53 +01:00
Controllers
…
Dictionary
Updates DictionaryRepository(s) to have custom GetAll caching options - to basically disable it since there could be tons of these and currently an IDictionaryItem is a massive entity (need to fix that)
2016-01-06 18:34:07 +01:00
Dynamics
…
Editors
Merge remote-tracking branch 'origin/dev-v7' into dev-v8
2016-03-16 15:02:53 +01:00
Install
Removes StateHelper!! Adds a few cookie extensions and http extensions to more easily replace.
2016-03-16 14:59:21 +01:00
LegacyActions
remore ui replacements
2016-03-15 16:39:17 +01:00
Macros
Moves strings to constants, adds ControllerContextExtensions to get the UmbracoContext from the hierarchy of ControllerContext's, changes RenderModelBinder to use this method to get the UmbracoContext, changes UmbracoViewPageOfTModel to use this method to get the UmbracoContext, adds RouteDataExtensions to get the UmbracoContext from routedata, adds extension methods on the HttpContext to get the UmbracoContext from it.
2016-02-17 10:22:22 +01:00
Media
Merge branch 'master-v7' into dev-v8
2016-03-10 19:20:15 +01:00
Models
Merge remote-tracking branch 'origin/dev-v7' into dev-v8
2016-03-16 15:02:53 +01:00
Mvc
Merge remote-tracking branch 'origin/dev-v7' into dev-v8
2016-03-16 15:02:53 +01:00
Properties
Merge branch 'master-v7' into dev-v8
2016-03-10 19:20:15 +01:00
PropertyEditors
Merge remote-tracking branch 'origin/dev-v7' into dev-v8
2016-03-16 15:02:53 +01:00
PublishedCache
Merge remote-tracking branch 'origin/dev-v7' into dev-v8
2016-03-16 15:02:53 +01:00
Routing
Merge remote-tracking branch 'origin/dev-v7' into dev-v8
2016-03-16 15:02:53 +01:00
Scheduling
Merge remote-tracking branch 'origin/dev-v7' into dev-v8
2016-03-16 15:02:53 +01:00
Search
…
Security
Merge remote-tracking branch 'origin/dev-v7' into dev-v8
2016-03-16 15:02:53 +01:00
Services
Merge branch 'master-v7' into dev-v8
2016-03-10 19:20:15 +01:00
Strategies
Merge remote-tracking branch 'origin/dev-v7' into dev-v8
2016-03-16 15:02:53 +01:00
Templates
…
Trees
Merge remote-tracking branch 'origin/dev-v7' into dev-v8
2016-03-16 15:02:53 +01:00
UI
it builds! ... but not sure it works yet.
2016-03-10 19:47:10 +01:00
umbraco.presentation
Merge remote-tracking branch 'origin/dev-v7' into dev-v8
2016-03-16 15:02:53 +01:00
Web References
…
WebApi
Merge branch 'master-v7' into dev-v8
2016-03-10 19:20:15 +01:00
WebServices
Merge remote-tracking branch 'origin/dev-v7' into dev-v8
2016-03-16 15:02:53 +01:00
app.config
…
ApplicationContextExtensions.cs
…
AreaRegistrationContextExtensions.cs
…
BatchedDatabaseServerMessenger.cs
…
BatchedDatabaseServerMessengerStartup.cs
…
BatchedWebServiceServerMessenger.cs
…
CacheHelperExtensions.cs
Updates all cache refreshers to reference the IsolatedRuntimeCache where required, refactors how IsolatedRuntimeCache is exposed on the CacheHelper, ensures that IsolatedRuntimeCache is used in all repositories instead of the global RuntimeCache, changes all obsolete usages of CacheHelper to the non obsolete equivalent, obsoletes many of the cache keys, obsoletes a couple cache refreshers that aren't used anymore in 7.3, simplifies CacheHelper with regards to it's 'disabled' cache state.
2016-01-06 18:08:14 +01:00
CanvasDesignerUtility.cs
…
ContextualPublishedCacheExtensions.cs
…
DefaultHttpContextAccessor.cs
Fixes more merge issues, project builds and runs
2016-03-11 09:23:09 +01:00
DefaultUmbracoContextAccessor.cs
…
ExamineExtensions.cs
…
FormDataCollectionExtensions.cs
…
FormlessPage.cs
…
GridTemplateExtensions.cs
…
HtmlHelperBackOfficeExtensions.cs
Ensures all angular views are cache busted so browser cache is not an issue after upgrading.
2016-03-08 17:23:54 +01:00
HtmlHelperRenderExtensions.cs
U4-7223 GetCropUrl outputs html entities in url when used in css
2016-01-05 14:54:02 +01:00
HtmlStringUtilities.cs
…
HttpCookieExtensions.cs
Removes StateHelper!! Adds a few cookie extensions and http extensions to more easily replace.
2016-03-16 14:59:21 +01:00
HttpRequestExtensions.cs
…
HttpUrlHelperExtensions.cs
…
IDynamicPublishedContentQuery.cs
…
IHttpContextAccessor.cs
U4-7577 Remove dependency on UmbracoContext in CreateServiceContext / RequestLifespanMessagesFactory
2016-02-16 15:07:42 +01:00
ImageCropperBaseExtensions.cs
Fixes TextStringValueConverter to include the text box and multi-textbox (since it's like that in the Core one that this overrides), adds new converter for Image cropper including ToString converter & custom type converter to convert from the strongly typed object to JObject, adds test to support this, adds equatable methods for the strongly typed model so it can be easily compared. Ensures that the webboot manager does not include the core value converter for image cropper.
2016-02-10 14:53:56 +01:00
ImageCropperTemplateExtensions.cs
Fixes TextStringValueConverter to include the text box and multi-textbox (since it's like that in the Core one that this overrides), adds new converter for Image cropper including ToString converter & custom type converter to convert from the strongly typed object to JObject, adds test to support this, adds equatable methods for the strongly typed model so it can be easily compared. Ensures that the webboot manager does not include the core value converter for image cropper.
2016-02-10 14:53:56 +01:00
ITagQuery.cs
…
ITypedPublishedContentQuery.cs
…
IUmbracoComponentRenderer.cs
…
IUmbracoContextAccessor.cs
U4-7577 Remove dependency on UmbracoContext in CreateServiceContext / RequestLifespanMessagesFactory
2016-02-16 15:07:42 +01:00
LightInjectExtensions.cs
…
MediaPropertyExtensions.cs
…
MembershipProviderExtensions.cs
…
ModelStateExtensions.cs
…
NotificationServiceExtensions.cs
umbraco.ui is GONE :)
2016-03-15 19:54:21 +01:00
packages.config
Merge branch 'master-v7' into dev-v8
2016-03-10 19:20:15 +01:00
PluginManagerExtensions.cs
WIP - moving tree and section service implementations to Web because they are web based and they need web based objects, there's no sense in coying all of the non-web objects to Core. Now we need to use IoC for the ServiceContext
2016-02-17 16:45:26 +01:00
PublishedContentExtensions.cs
…
PublishedContentPropertyExtension.cs
…
PublishedContentQuery.cs
…
RenderFieldCaseType.cs
…
RenderFieldEncodingType.cs
…
RequestLifespanMessagesFactory.cs
U4-7577 Remove dependency on UmbracoContext in CreateServiceContext / RequestLifespanMessagesFactory
2016-02-16 15:07:42 +01:00
RouteCollectionExtensions.cs
…
RouteDataExtensions.cs
fixes wrong constant used
2016-02-17 10:22:37 +01:00
SingletonHttpContextAccessor.cs
U4-7577 Remove dependency on UmbracoContext in CreateServiceContext / RequestLifespanMessagesFactory
2016-02-16 15:07:42 +01:00
SingletonUmbracoContextAccessor.cs
…
TagQuery.cs
…
Umbraco.Web.csproj
Merge remote-tracking branch 'origin/dev-v7' into dev-v8
2016-03-16 15:02:53 +01:00
Umbraco.Web.csproj.DotSettings
…
UmbracoApplication.cs
…
UmbracoComponentRenderer.cs
…
UmbracoContext.cs
Merge remote-tracking branch 'origin/dev-v7' into dev-v8
2016-03-16 15:02:53 +01:00
UmbracoContextExtensions.cs
Moves strings to constants, adds ControllerContextExtensions to get the UmbracoContext from the hierarchy of ControllerContext's, changes RenderModelBinder to use this method to get the UmbracoContext, changes UmbracoViewPageOfTModel to use this method to get the UmbracoContext, adds RouteDataExtensions to get the UmbracoContext from routedata, adds extension methods on the HttpContext to get the UmbracoContext from it.
2016-02-17 10:22:22 +01:00
UmbracoDefaultOwinStartup.cs
udpates ext method to specify an explicit marker stage, updates UmbracoDefaultOwinStartup to be more flexible with the methods to override.
2016-03-09 19:37:37 +01:00
UmbracoHelper.cs
…
UmbracoModule.cs
Merge branch 'master-v7' into dev-v8
2016-03-10 19:20:15 +01:00
UriUtility.cs
…
UrlHelperExtensions.cs
…
UrlHelperRenderExtensions.cs
U4-7223 GetCropUrl outputs html entities in url when used in css
2016-01-05 14:54:02 +01:00
WebBootManager.cs
Merge remote-tracking branch 'origin/dev-v7' into dev-v8
2016-03-16 15:02:53 +01:00
WebViewPageExtensions.cs
…