Shannon 0a26eccd2d Merge remote-tracking branch 'origin/6.1.4' into 7.0.0 ...

Conflicts:
	.gitignore
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Core/Models/PropertyTypeExtensions.cs
	src/Umbraco.Core/Security/AuthenticationExtensions.cs
	src/Umbraco.Core/Security/UmbracoBackOfficeIdentity.cs
	src/Umbraco.Core/Security/UserData.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
	src/Umbraco.Tests/TestHelpers/BaseUmbracoApplicationTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web/Security/WebSecurity.cs
	src/Umbraco.Web/UmbracoModule.cs
	src/umbraco.businesslogic/BasePages/BasePage.cs
	src/umbraco.cms/businesslogic/datatype/DefaultData.cs
	src/umbraco.sln

2013-08-07 10:29:34 +10:00

..

actions

added Umbraco.Web.UI containing only web rendering files

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

assets

Updated icon mappings and updated to latest font-awesome but I have no idea how to make the font-awesome.min.less file from the download... will leave for Per :)

2013-07-11 11:03:03 +10:00

channels

Cleaned up the code fro rsd and wlwmanifest and ensures wlwmanifest actually returns the results in xml format.

2013-04-06 00:04:23 +06:00

config

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

2013-07-24 13:10:43 +10:00

controls

Fixes: U4-2577 Can't save umbraco user - without re-filling in the password

2013-08-02 15:16:04 +10:00

create

Translating the word "or"

2013-06-19 16:28:58 +02:00

css

added Umbraco.Web.UI containing only web rendering files

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

dashboard

U4-2309 BackOffice / ExamineMngr : "Optimize index" don't ends correctly when website has not members.

2013-07-19 12:39:50 +02:00

developer

Merge pull request #41 from michielvoo/u4-667

2013-07-19 13:19:30 +02:00

dialogs

Merge branch '6.0.7' into 6.1.2

2013-06-20 15:49:55 +10:00

images

Fixes U4-2444 Missing image - /umbraco/images/pinnedIcons/umb.ico

2013-07-15 16:31:19 +02:00

js

Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0

2013-07-28 01:01:50 +02:00

lib

Moves larger util classes to their own files, fixes up the notification service to ensure notifications go away properly.

2013-07-22 18:40:02 +10:00

LiveEditing

Fix skin configurator in Chrome not working after install.

2012-10-18 07:46:46 -02:00

masterpages

Got legacy create dialogs working

2013-07-10 15:35:38 +02:00

members

U4-600 Wrong membersearch.png path in MemberSearch.ascx

2013-02-26 09:48:14 -01:00

plugins

Fixes U4-1838 uGoLive Success/Failure Images not showing

2013-07-15 16:07:42 +02:00

scripting/templates

U4-2416 Missing colon in file ListChildPagesOrderedByProperty causes Web site not to run

2013-06-21 15:25:46 +02:00

Search

Converted QuickSearch over to use correct codebehind

2012-11-08 08:12:24 +05:00

settings

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

2013-07-31 18:52:14 +10:00

translation

added Umbraco.Web.UI containing only web rendering files

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

users

added Umbraco.Web.UI containing only web rendering files

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

Views

Ensures all controller names are consistent.

2013-08-06 14:24:30 +10:00

webservices

Removing the umbraco.webservices project

2013-04-29 10:36:11 -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

cacheBrowser.aspx

added Umbraco.Web.UI containing only web rendering files

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

canvas.aspx

added Umbraco.Web.UI containing only web rendering files

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

create.aspx

Fixed merge issue based on overlap with class + namespace name.

2013-03-29 23:52:40 +06:00

Create.aspx.cs

Merge branch '4.11.7---ITask-updates' into 7.0.0

2013-07-12 11:30:06 +10:00

Create.aspx.designer.cs

Fixed merge issue based on overlap with class + namespace name.

2013-03-29 23:52:40 +06:00

dashboard.aspx

added Umbraco.Web.UI containing only web rendering files

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

editContent.aspx

added Umbraco.Web.UI containing only web rendering files

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

editMedia.aspx

added Umbraco.Web.UI containing only web rendering files

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

endPreview.aspx

added Umbraco.Web.UI containing only web rendering files

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

helpRedirect.aspx

added Umbraco.Web.UI containing only web rendering files

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

login.aspx

Remove reference to v4 in text.

2013-05-06 11:06:28 -02:00

logout.aspx

Removed js redirect from logout.aspx

2013-07-05 16:10:00 +02:00

macroResultWrapper.aspx

added Umbraco.Web.UI containing only web rendering files

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

ping.aspx

Fixes: #U4-2059 and removes un-needed ping.aspx files, cleans up some code

2013-04-05 23:28:43 +06:00

publishStatus.aspx

added Umbraco.Web.UI containing only web rendering files

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

tree.aspx

added Umbraco.Web.UI containing only web rendering files

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

treeInit.aspx

Converted treeInit.aspx so that it's codebehind and designer files are in the UI project and only

2012-10-01 03:57:57 +05:00

TreeInit.aspx.cs

Converted Umbraco.aspx, TreeInit.aspx to have proper web forms classes and obsoletes old ones.

2013-02-05 05:43:38 +06:00

TreeInit.aspx.designer.cs

Converted Umbraco.aspx, TreeInit.aspx to have proper web forms classes and obsoletes old ones.

2013-02-05 05:43:38 +06:00

umbraco.aspx

Fixes U4-2444 Missing image - /umbraco/images/pinnedIcons/umb.ico

2013-07-15 16:31:19 +02:00

Umbraco.aspx.cs

Fixes U4-2444 Missing image - /umbraco/images/pinnedIcons/umb.ico

2013-07-15 16:31:19 +02:00

Umbraco.aspx.designer.cs

Silly designer file, of course you need to change to. kthxbi

2013-04-03 11:43:28 -02:00

webService.asmx

added Umbraco.Web.UI containing only web rendering files

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