yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
b5c3b85298458ebde851431e27983b1aab79dcb1
Umbraco-CMS/src/Umbraco.Web.UI
History
Sebastiaan Janssen b5c3b85298 Merge branch 'hackathon-export-doc-type-to-angular' of https://github.com/kows/Umbraco-CMS into kows-hackathon-export-doc-type-to-angular 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/resources/contenttype.resource.js
#	src/Umbraco.Web.UI/Umbraco/dialogs/exportDocumenttype.aspx
#	src/Umbraco.Web.UI/umbraco_client/Application/UmbracoApplicationActions.js
#	src/Umbraco.Web/Editors/ContentTypeController.cs
#	src/Umbraco.Web/Trees/LegacyTreeDataConverter.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/exportDocumenttype.aspx
#	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/exportDocumenttype.aspx.cs
2018-07-25 11:40:29 +02:00
..
App_Browsers
Renormalize
2018-06-29 19:52:40 +02:00
App_Plugins/ModelsBuilder
Fix up modelsbuilder dashboard - we now use ng-bind-html directive as opposed to ng-bind-html-unsafe
2018-06-13 12:27:22 +01:00
config
Fixes tests and merging issues, simplifies TabsAndPropertiesResolver since it doesn't need umbracocontext, only the MemberTabsAndPropertiesResolver one does
2018-07-18 15:42:12 +10:00
Content
Port 7.7 - WIP
2017-09-08 19:39:13 +02:00
Media
U4-8472 Add web.config file to media folder path to prevent all execution based files from being run by IIS
2016-06-28 16:01:23 +02:00
Properties
Renormalize
2018-06-29 19:52:40 +02:00
Umbraco
Merge branch 'hackathon-export-doc-type-to-angular' of https://github.com/kows/Umbraco-CMS into kows-hackathon-export-doc-type-to-angular
2018-07-25 11:40:29 +02:00
umbraco_client
Merge branch 'hackathon-export-doc-type-to-angular' of https://github.com/kows/Umbraco-CMS into kows-hackathon-export-doc-type-to-angular
2018-07-25 11:40:29 +02:00
Views
Renormalize
2018-06-29 19:52:40 +02:00
default.aspx
Renormalize
2018-06-29 19:52:40 +02:00
Global.asax
Renormalize
2018-06-29 19:52:40 +02:00
Umbraco.Web.UI.csproj
Merge branch 'hackathon-export-doc-type-to-angular' of https://github.com/kows/Umbraco-CMS into kows-hackathon-export-doc-type-to-angular
2018-07-25 11:40:29 +02:00
web.Template.config
Renormalize
2018-06-29 19:52:40 +02:00
web.Template.Debug.config
Renormalize
2018-06-29 19:52:40 +02:00
web.Template.Release.config
Renormalize
2018-06-29 19:52:40 +02:00