Shannon b6cbd521ce Merge branch '6.1.2' into 7.0.0 ...

Conflicts:
	src/Umbraco.Core/Models/ContentExtensions.cs
	src/Umbraco.Web.UI/config/ClientDependency.config

2013-06-20 16:06:23 +10:00

..

App_Browsers

added Umbraco.Web.UI containing only web rendering files

2012-07-18 04:35:30 +06:00

App_Plugins

moved umbraco property editors into the core and outside the manifest (as c# declarations). Changed property editor names to not be editor.html and instead be the name of the folder as a convention.

2013-06-19 16:42:50 +10:00

config

gitignore file

2013-06-11 12:27:05 +02:00

install

Added more methods to User Repo/Service to get an IUser by id. Upgraded to angular 1.5.5 to fix an animation bug. Got authorization working nicely now. Fixed up the animation.less files with 1.5.5's breaking animation changes. Fixed up WebSecurity class to always have an instance of HttpContextBase (still requires much more fixing though).

2013-06-17 16:03:27 +10:00

Properties

Correcting SolutionInfo and AssemblyInfo, so assembly version is correct for all shipped assemblies

2012-11-26 07:46:29 -01:00

umbraco

Merge branch '6.1.2' into 7.0.0

2013-06-20 16:06:23 +10:00

umbraco_client

Merge branch '6.0.7' into 6.1.2

2013-06-19 18:26:45 +02:00

Views

Fixing nuget related issue #U4-2067 and updating version

2013-04-22 06:01:31 -02:00

xslt

added web.config files to the root of xslt folders which will disable the ability for people

2013-05-12 19:29:05 -10:00

default.aspx

added Umbraco.Web.UI containing only web rendering files

2012-07-18 04:35:30 +06:00

Global.asax

Moves app initialization into new UmbracoApplication (global.asax)

2012-07-20 22:02:28 +06:00

packages.config

Fixes: #U4-2315 - CDF grouping issue, updated to new version

2013-06-03 13:35:41 -10:00

Umbraco.Web.UI.csproj

Merge branch '6.1.2' into 7.0.0

2013-06-20 16:06:23 +10:00

web.Template.config

Implemented auto-mapper for mapping and converted over the user mappings. Got the gravatar directive working now too. Removed all umbracoUseMediumTrust settings.

2013-06-18 17:22:01 +10:00

web.Template.Debug.config

Implemented auto-mapper for mapping and converted over the user mappings. Got the gravatar directive working now too. Removed all umbracoUseMediumTrust settings.

2013-06-18 17:22:01 +10:00

web.Template.Release.config

Keep umbracoDbDSN in the appSettings in the released version to prevent people

2013-01-10 12:05:03 -01:00