Umbraco-CMS

BaseRest

Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

2014-02-13 16:22:51 +11:00

Cache

Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

2014-02-20 13:40:17 +11:00

Controllers

undo my custom test change to login controller

2013-12-05 16:20:02 +11:00

Dictionary

Fixes up some logging API issues. Fixed up tracing in the macro class. Added support for Partial View macro rendering in the macro class.

2012-12-04 11:08:02 +05:00

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/6.2.0' into 7.1.0

2014-02-20 13:40:17 +11:00

Install

merge

2013-11-07 17:16:22 +01:00

Macros

Fixes: U4-4223 MVC based forms with SurfaceControllers don't work when rendered in Webforms mode.

2014-02-13 13:19:51 +11:00

Media

Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent

2013-10-03 18:17:35 +02:00

Models

Cropsizes config and upload compatible

2014-02-20 12:59:15 +01:00

Mvc

Fixes merge issues

2014-02-13 16:46:52 +11:00

Properties

Moves the our umbraco web reference to where it needs to be.

2013-11-01 09:21:29 +11:00

PropertyEditors

Cropsizes config and upload compatible

2014-02-20 12:59:15 +01:00

PublishedCache

Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

2014-02-13 16:22:51 +11:00

Routing

Fixes: U4-3942 Cannot configure the request if there is not content assigned - exception

2013-12-28 13:57:20 +11:00

Search

Fixes member data indexing to ensure it includes the unique key, fixes the EntityService search to return IEnumerable<EntityBasic>, not search results so the data returned is limited to non-sensitive data, adds AdditionalData to EntityBasic so we can add additional values like URL to outgoing entities, Fixes up the searchService, searchControllers to use new structure.

2013-10-29 11:39:34 +11:00

Security

Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

2014-02-20 13:56:37 +11:00

Standalone

Fixes merge issues

2013-10-28 11:38:07 +11:00

Strategies

Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

2014-02-13 16:22:51 +11:00

Templates

Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent

2013-09-30 14:12:36 +02:00

Trees

Enables change content type action for v7 as well (see issue 1468)

2014-02-19 21:48:17 +01:00

UI

Updates yepnope cache in jsinit.cs to append correct rnd value

2014-02-19 00:19:16 +01:00

umbraco.presentation

Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

2014-02-20 13:40:17 +11:00

Web References

merge

2013-11-07 17:16:22 +01:00

WebApi

Fixes merge issues

2014-02-13 16:46:52 +11:00

WebServices

U4-2317 - issue with domains & languages management

2014-01-30 16:19:09 +01:00

app.config

merge

2013-11-07 17:16:22 +01:00

ApplicationContextExtensions.cs

Moving interfaces for services to Umbraco.Core.

2012-11-06 10:47:14 -01:00

CacheHelperExtensions.cs

Merge remote-tracking branch 'origin/6.2.0' into 7.0.2

2013-12-19 12:53:32 +11:00

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

added new tests for model mapping and serialization of the content display models. Started integrating trees. Committed the compiled

2013-05-30 21:21:52 -10:00

FormlessPage.cs

Added ObjectExtensionsTests, Added functionality for MVC to render any macro types (i.e. razor and xslt, etc..)

2012-09-03 07:54:09 +07:00

HtmlHelperRenderExtensions.cs

Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

2014-02-13 16:22:51 +11:00

HttpCookieExtensions.cs

Fixes: U4-3907 Token cookie issues in 7.0.1

2013-12-24 10:48:32 +11:00

HttpRequestExtensions.cs

Merge remote-tracking branch 'origin/6.2.0' into 7.0.1

2013-12-04 13:50:55 +11:00

HttpUrlHelperExtensions.cs

Fixes member data indexing to ensure it includes the unique key, fixes the EntityService search to return IEnumerable<EntityBasic>, not search results so the data returned is limited to non-sensitive data, adds AdditionalData to EntityBasic so we can add additional values like URL to outgoing entities, Fixes up the searchService, searchControllers to use new structure.

2013-10-29 11:39:34 +11:00

ImageCropperBaseExtensions.cs

Fixing totally broken merge

2014-02-20 12:59:11 +01:00

ImageCropperTemplateExtensions.cs

Fixing totally broken merge

2014-02-20 12:59:11 +01:00

LegacyScheduledTasks.cs

Removes unpublish context menu option since it's not currently implemented, cleans up some code.

2013-11-05 09:38:54 +11:00

MediaPropertyExtensions.cs

Cropsizes config and upload compatible

2014-02-20 12:59:15 +01:00

MembershipProviderExtensions.cs

merge

2013-11-07 17:16:22 +01:00

ModelStateExtensions.cs

Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

2014-02-13 16:22:51 +11:00

NotificationServiceExtensions.cs

Fixes: U4-3830 Unable to get email notifications working in version 7

2014-01-13 16:13:53 +11:00

packages.config

Fixes: U4-4012 When loading in a lot of separate assets in a manifest CDF is throwing exceptions with a 'too long query string' - updates to latest CDF

2014-01-09 15:58:06 +11:00

PluginManagerExtensions.cs

Gets view paths to load in dynamically based on whether a core or plugin tree is rendering, this allows us to store view files based on conventions for packages. Completes: U4-2849 Ensure editor views, etc... can exist outside of the /umbraco folder for package devs

2013-10-03 11:25:26 +10:00

PublishedContentExtensions.cs

U4-4241 - UrlAbsolute() returns relative urls

2014-02-17 10:49:26 +01:00

PublishedContentPropertyExtension.cs

merge

2013-11-07 17:16:22 +01:00

PublishedContentQuery.cs

merge

2013-11-07 17:16:22 +01:00

RenderFieldCaseType.cs

Got .Field method for MVC working and have macro's rendering inside of RTE in MVC.

2012-09-05 09:35:24 +07:00

RenderFieldEncodingType.cs

Got .Field method for MVC working and have macro's rendering inside of RTE in MVC.

2012-09-05 09:35:24 +07:00

RouteCollectionExtensions.cs

Added all code to support auto-routing surface controllers and started implementing the code for

2012-09-25 13:09:59 +07:00

TagQuery.cs

merge

2013-11-07 17:16:22 +01:00

Umbraco.Web.csproj

Cropsizes config and upload compatible

2014-02-20 12:59:15 +01:00

UmbracoApplication.cs

oops, removed test code

2013-04-28 16:15:19 -10:00

UmbracoContext.cs

Fix for U4-3908 YSOD on frontend after being logged out

2013-12-19 10:41:44 +01:00

UmbracoContextExtensions.cs

merge

2013-11-07 17:16:22 +01:00

UmbracoHelper.cs

Fixing: U4-3686 Umbraco 7 - Rich Text Editor and Macro Issues + fixed up the per-controller webapi configuration and more fixes to loading propertyeditors/param editors, this saves a assembly scan.

2013-12-06 15:01:58 +11:00

UmbracoModule.cs

Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

2014-02-20 13:42:02 +11:00

UmbracoUserControl.cs

Moves UmbracoUserControl to it's correct home and obsoletes the old one (even though its really new)

2013-02-05 05:00:16 +06:00

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

Adds cache bursting to production mode

2014-02-10 13:02:16 +01:00

UrlHelperRenderExtensions.cs

merge

2013-11-07 17:16:22 +01:00

WebBootManager.cs

Merge remote-tracking branch 'origin/6.2.0' into 7.0.2

2014-01-15 13:28:41 +11:00

WebViewPageExtensions.cs

merge

2013-11-07 17:16:22 +01:00