yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
00ae650ee2f401b553d2fee9aa0209d774882ef8
Umbraco-CMS/src/Umbraco.Web.UI/umbraco/masterpages
History
Shannon 155e7338cf Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Web.UI/umbraco/masterpages/umbracoDialog.Master
	src/Umbraco.Web.UI/umbraco_client/tinymce3/plugins/autolink/editor_plugin_src.js
	src/Umbraco.Web.UI/umbraco_client/tinymce3/plugins/table/editor_plugin_src.js
	src/Umbraco.Web.UI/umbraco_client/tinymce3/tiny_mce_popup.js
2013-12-19 15:30:17 +11:00
..
default.Master
Converted ~/Umbraco/MasterPages/Default.Master to use correct web forms code behind structure.
2013-02-23 03:20:05 +06:00
Default.Master.cs
Converted ~/Umbraco/MasterPages/Default.Master to use correct web forms code behind structure.
2013-02-23 03:20:05 +06:00
Default.Master.designer.cs
Converted ~/Umbraco/MasterPages/Default.Master to use correct web forms code behind structure.
2013-02-23 03:20:05 +06:00
umbracoDialog.Master
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
2013-12-19 15:30:17 +11:00
UmbracoDialog.master.cs
Changed umbracoDialog.master to have correct codebehind structure.
2012-10-08 23:46:49 +05:00
UmbracoDialog.master.designer.cs
Completes: U4-1521 Updated back office to use ClientDependency bundles for common files
2013-12-19 15:05:05 +11:00
umbracoPage.Master
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
2013-12-19 15:30:17 +11:00
UmbracoPage.master.cs
added missing codebehinds. updated ignore file.
2012-10-10 20:04:11 +05:00
UmbracoPage.master.designer.cs
Completes: U4-1521 Updated back office to use ClientDependency bundles for common files
2013-12-19 15:05:05 +11:00