yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
ea638c37b7d9c9ca2949c05099844a9164285fca
Umbraco-CMS/src/Umbraco.Web
History
Stephan ea638c37b7 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent 
Conflicts:
	src/Umbraco.Web/UmbracoContext.cs
2013-09-30 14:05:12 +02:00
..
BaseRest
Fixes merge issues, fixes up some unit tests, removes the For<T> config section stuff and simplifies the singleton, refactors it with methods as per discussion with stephen.
2013-09-25 19:23:41 +10:00
Cache
Merge branch '7.0.0' into 7.0.0-pubcontent
2013-09-26 08:57:01 +02:00
Controllers
…
Dictionary
…
Dynamics
Merge branch '7.0.0' into 7.0.0-pubcontent
2013-09-26 08:57:01 +02:00
Editors
Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent
2013-09-30 14:05:12 +02:00
Install
Replaces more calls to legacy UmbracoSettings with the new configuration section, fixes loads of null checks when dealing with package repository APIs
2013-09-16 11:22:11 +10:00
Macros
Macros - PartialViewMacro use IPublishedContent, not INode
2013-09-29 15:22:23 +02:00
Media
Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent
2013-09-29 16:05:52 +02:00
Models
Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent
2013-09-30 14:05:12 +02:00
Mvc
Fixes merge issues, fixes up some unit tests, removes the For<T> config section stuff and simplifies the singleton, refactors it with methods as per discussion with stephen.
2013-09-25 19:23:41 +10:00
Properties
…
PropertyEditors
Merge branch '7.0.0' into 7.0.0-pubcontent
2013-09-26 09:06:01 +02:00
PublishedCache
Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent
2013-09-29 16:05:52 +02:00
Routing
Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent
2013-09-30 14:05:12 +02:00
Search
centralizes the thumbnail/image handling
2013-09-25 21:09:59 +10:00
Security
Fixes merge issues, fixes up some unit tests, removes the For<T> config section stuff and simplifies the singleton, refactors it with methods as per discussion with stephen.
2013-09-25 19:23:41 +10:00
Standalone
merge branch '6.2.0' into '7.0.0'
2013-09-12 13:09:04 +02:00
Strategies
Fixes merge issues, fixes up some unit tests, removes the For<T> config section stuff and simplifies the singleton, refactors it with methods as per discussion with stephen.
2013-09-25 19:23:41 +10:00
Templates
Fix issues after merge
2013-09-26 09:04:23 +02:00
Trees
Most of the member tree working, have the member editor rendering data
2013-09-27 15:19:39 +10:00
UI
WIP on image uploading
2013-09-23 21:24:34 +02:00
umbraco.presentation
Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent
2013-09-30 14:05:12 +02:00
Web References/org.umbraco.update
…
WebApi
Updated the saving model and validator inheritance chain to better support members, have the members editor display data and posting/validating data - now need to get the correct fields being displayed and the correct tab/layout but coming along very nicely!
2013-09-27 16:59:38 +10:00
WebServices
Merge branch '7.0.0' into 7.0.0--property-editor-guid-to-alias
2013-09-11 13:07:22 +10:00
ApplicationContextExtensions.cs
…
CacheHelperExtensions.cs
…
ContextualPublishedCacheExtensions.cs
PublishedContent - the big refactoring
2013-09-16 17:17:45 +02:00
ExamineExtensions.cs
Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent
2013-09-23 21:57:22 +02:00
FormDataCollectionExtensions.cs
…
FormlessPage.cs
…
HtmlHelperRenderExtensions.cs
Fixes merge issues, fixes up some unit tests, removes the For<T> config section stuff and simplifies the singleton, refactors it with methods as per discussion with stephen.
2013-09-25 19:23:41 +10:00
HttpCookieExtensions.cs
…
HttpRequestExtensions.cs
…
HttpUrlHelperExtensions.cs
…
LegacyScheduledTasks.cs
Fixes merge issues, fixes up some unit tests, removes the For<T> config section stuff and simplifies the singleton, refactors it with methods as per discussion with stephen.
2013-09-25 19:23:41 +10:00
ModelStateExtensions.cs
…
packages.config
Updates to latest version of JSON.Net
2013-09-27 13:25:28 +10:00
PluginManagerExtensions.cs
Implements: U4-2937 A tree item should be able to have a default action
2013-09-26 15:55:38 +10:00
PublishedContentExtensions.cs
PublishedContent - add OfType<> extension to IPublishedContent
2013-09-29 15:22:19 +02:00
PublishedContentPropertyExtension.cs
PublishedContent - revert to using property.Value vs .ObjectValue
2013-09-25 13:17:21 +02:00
RenderFieldCaseType.cs
…
RenderFieldEncodingType.cs
…
RouteCollectionExtensions.cs
…
Umbraco.Web.csproj
Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent
2013-09-30 14:05:12 +02:00
UmbracoApplication.cs
…
UmbracoContext.cs
Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent
2013-09-30 14:05:12 +02:00
UmbracoContextExtensions.cs
PublishedContent - the big refactoring
2013-09-16 17:17:45 +02:00
UmbracoHelper.cs
Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent
2013-09-29 16:05:52 +02:00
UmbracoModule.cs
Fixes: U4-2952 Preview mode causes ysod - null reference
2013-09-30 16:06:56 +10:00
UmbracoUserControl.cs
…
UriUtility.cs
Fixes merge issues, fixes up some unit tests, removes the For<T> config section stuff and simplifies the singleton, refactors it with methods as per discussion with stephen.
2013-09-25 19:23:41 +10:00
UrlHelperExtensions.cs
…
UrlHelperRenderExtensions.cs
…
WebBootManager.cs
Merge branch '7.0.0' into 7.0.0-pubcontent
2013-09-26 08:57:01 +02:00
WebViewPageExtensions.cs
…