yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
e75c050efff6dd6481f78118d32fb8049a5da510
Umbraco-CMS/src
History
Shannon e75c050eff Merge branch '7.0.0' into 7.0.0--property-editor-guid-to-alias 
Conflicts:
	src/Umbraco.Core/Models/Rdbms/PropertyDataReadOnlyDto.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs
2013-09-11 13:07:22 +10:00
..
.nuget
…
DesktopMediaUploader
…
packages
…
SQLCE4Umbraco
Obsoletes all legacy installer classes from the legacy data layer.
2013-09-10 11:43:07 +10:00
umbraco.businesslogic
delete fontawesome
2013-09-02 15:40:14 +02:00
umbraco.cms
Merge branch '7.0.0' into 7.0.0--property-editor-guid-to-alias
2013-09-11 13:07:22 +10:00
umbraco.controls
legacy Editmacro editor tweaks
2013-09-10 23:33:26 +02:00
Umbraco.Core
Merge branch '7.0.0' into 7.0.0--property-editor-guid-to-alias
2013-09-11 13:07:22 +10:00
umbraco.datalayer
Obsoletes all legacy installer classes from the legacy data layer.
2013-09-10 11:43:07 +10:00
umbraco.editorControls
Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
2013-09-10 11:49:05 +10:00
umbraco.interfaces
Merge branch '7.0.0' into 7.0.0--property-editor-guid-to-alias
2013-09-11 13:07:22 +10:00
umbraco.MacroEngines
Merge branch '7.0.0' into 7.0.0--property-editor-guid-to-alias
2013-09-11 13:07:22 +10:00
umbraco.macroRenderings
…
Umbraco.MSBuild.Tasks
…
umbraco.providers
Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
2013-09-10 11:49:05 +10:00
Umbraco.Tests
Merge branch '7.0.0' into 7.0.0--property-editor-guid-to-alias
2013-09-11 13:07:22 +10:00
Umbraco.Web
Merge branch '7.0.0' into 7.0.0--property-editor-guid-to-alias
2013-09-11 13:07:22 +10:00
Umbraco.Web.UI
Merge branch '7.0.0' into 7.0.0--property-editor-guid-to-alias
2013-09-11 13:07:22 +10:00
Umbraco.Web.UI.Client
Completes: U4-2749 Fix auth filters to return 401 when not logged in and 403 when the user has no access - adds ngSanitize which is required for ng-bind-html so we can add a bit of html to the notification msgs (like line breaks) and since devs might do this as well we require ngSanitize so that unsafe html cannot be injected.
2013-09-11 12:40:43 +10:00
UmbracoExamine
Fixes a few stupid medium trust issues... even though running in full trust... it never ends! :/
2013-09-04 13:18:23 +10:00
UmbracoExamine.Azure
…
UmbracoExamine.PDF
…
UmbracoExamine.PDF.Azure
…
WebPi
…
SolutionInfo.cs
…
Umbraco.MSBuild.Tasks.sln
…
umbraco.presentation.targets
Fix a strange VS2012 build targets problem
2013-08-20 18:08:34 +02:00
umbraco.sln
…
umbraco.sln.DotSettings
…
umbraco.vssscc
…