yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
c8a19dff44bfc0131191571dec50d48554c3d3ed
Umbraco-CMS/src/Umbraco.Web
History
Sebastiaan Janssen c8a19dff44 Merge branch '6.0.7' into 6.1.2 
Conflicts:
	src/Umbraco.Web/Media/ImageUrl.cs
	src/Umbraco.Web/Media/ImageUrlProviders/ImageUrlProvider.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/MediaExtensions.cs
2013-06-19 18:26:45 +02:00
..
BaseRest
Core.Configuration - simplify
2013-03-18 15:49:43 -01:00
Cache
Fix U4-2320 - Error on saving User Permissions
2013-06-13 02:50:25 +01:00
Configuration
Web.Routing - fix configuration default
2013-03-19 17:37:35 -01:00
Dictionary
…
Dynamics
Back merged from 6.1 the changes required for #U4-1822 and #U4-1797
2013-03-02 02:43:22 +06:00
Install
Refactors the WebSecurity class to not be static and be part of the UmbracoContext. Makes a few methods internal on it so that
2013-04-04 23:30:17 +06:00
Macros
Fixed a conflict-references between Constants (in Umbraco.Web.Mvc and Umbraco.Core)
2013-03-14 22:01:09 +00:00
Media
Merge branch '6.0.7' into 6.1.2
2013-06-19 18:26:45 +02:00
Models
Merge with 6.0.6
2013-05-07 18:57:39 -10:00
Mvc
Fixes: #U4-2343 for api controllers, already fixed for surface controllers
2013-06-18 15:46:36 +10:00
Properties
publicized some ObjectExtensions, added Umbraco.Belle to internals, updated the names in which plugin routes are created,
2013-04-30 16:43:59 -10:00
PropertyEditors
…
PublishedCache
Manually applies fix for #U4-2094 since the class structure has changed in 6.1
2013-05-07 19:02:36 -10:00
Routing
Changed the trace logger for PublishedContentRequestEngine to be correct.
2013-05-13 22:32:02 -10:00
Search
Fixes merge issues, ensures that the tree node is reloaded when publishing.
2013-04-18 22:01:28 +06:00
Security
Internal creation of backoffice users and unit test to verify
2013-05-27 06:50:14 -02:00
Standalone
Adding some minor changes/adjustments to the TypeFinder to make a bit more flexible for external usage.
2013-06-07 05:19:25 -02:00
Strategies
Replaced all hard-coded GUID references to use the new Constants.
2013-03-14 22:00:37 +00:00
Templates
Web.PublishedCache - introduce contextual caches
2013-03-19 17:51:55 -01:00
Trees
Fixes up tree syncing for views, stylesheets and partial views. Now ensures we can actually
2013-05-08 14:18:18 -10:00
UI
Updated to latest CDF version that has a few bug fixes and added a CDF logger.
2013-05-28 13:24:48 -10:00
umbraco.presentation
Merge branch '6.0.7' into 6.1.2
2013-06-19 18:26:45 +02:00
Web References/org.umbraco.update
…
WebApi
publicized some ObjectExtensions, added Umbraco.Belle to internals, updated the names in which plugin routes are created,
2013-04-30 16:43:59 -10:00
WebServices
Show containers in folderbrowser again
2013-06-02 05:03:51 -02:00
ApplicationContextExtensions.cs
…
CacheHelperExtensions.cs
…
ContextualPublishedCacheExtensions.cs
merge with 6.1.0
2013-04-10 13:56:39 -02:00
ExamineExtensions.cs
Web.PublishedCache - introduce contextual caches
2013-03-19 17:51:55 -01:00
FormlessPage.cs
…
HtmlHelperRenderExtensions.cs
Changed the profiler over to use resolvers again. We no longer will call MiniProfiler directly.
2013-05-13 20:10:28 -10:00
HttpRequestExtensions.cs
…
HttpUrlHelperExtensions.cs
publicized some ObjectExtensions, added Umbraco.Belle to internals, updated the names in which plugin routes are created,
2013-04-30 16:43:59 -10:00
LegacyScheduledTasks.cs
Merge with 6.0.4
2013-04-06 01:23:29 +06:00
ModelStateExtensions.cs
…
packages.config
Fixes: #U4-2315 - CDF grouping issue, updated to new version
2013-06-03 13:35:41 -10:00
PluginManagerExtensions.cs
moved web api controllers to namespace Umbraco.Web.WebApi and created web api member authorize attribute
2013-02-26 22:14:32 +06:00
PublishedContentExtensions.cs
Merge with 6.0.4
2013-04-17 01:57:50 +06:00
RenderFieldCaseType.cs
…
RenderFieldEncodingType.cs
…
RouteCollectionExtensions.cs
…
Umbraco.Web.csproj
Merge branch '6.0.7' into 6.1.2
2013-06-18 15:13:43 +10:00
UmbracoApplication.cs
oops, removed test code
2013-04-28 16:15:19 -10:00
UmbracoContext.cs
Web.Routing - public, though readonly, UmbracoContext.PublishedContentRequest
2013-04-11 11:44:15 -02:00
UmbracoHelper.cs
merges changes for UmbracoHelper from 6.0.x to deal with null objects when using Content method (dynamic)
2013-04-10 22:51:19 +06:00
UmbracoModule.cs
Merge branch '6.0.7' into 6.1.2
2013-06-19 18:26:45 +02:00
UmbracoUserControl.cs
…
UriUtility.cs
Merge with 6.0.3
2013-03-15 08:29:22 +04:00
UrlHelperExtensions.cs
fixed issue with test project's invalid references (for web api). Added UmbracoAuthorizedApiController, change the
2013-02-27 05:24:45 +06:00
WebBootManager.cs
Fixes: #U4-2343 for api controllers, already fixed for surface controllers
2013-06-18 15:46:36 +10:00