yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,113 Commits 4 Branches 7 Tags
8de579083c66ce94de0883e15a3f5347dd5587d3
Commit Graph

4113 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Morten Christensen
4365b0a208 Merge 2013-01-03 08:37:45 -01:00
Morten Christensen
c7e8143128 Adds IUmbracoEntity to the structure of interfaces for ContentBase, ContentTypeBase and DataTypeDefinition. 2013-01-03 08:30:38 -01:00
Sebastiaan Janssen
044776fc5a Check if the propertyNode.FirstChild.Value is in content.Properties before trying to get it 2013-01-03 08:19:04 -01:00
Morten Christensen
96bcc74742 Adding UmbracoUserControl, which exposes the various contexts and the umbraco helper similar to the PluginController. 2013-01-03 08:04:19 -01:00
Sebastiaan Janssen
35c16097af Changed all editor to use the HTML5 doctype to make CodeMirror work better 2013-01-03 07:20:04 -01:00
Shannon Deminick
872c163999 Updated EditMacro.js to support inserting different syntax depending on rendering engine. Just need to get it to insert the params for MVC now. 
Added HttpRequestExtenions with a method GetItemAsString which obsoletes/supercedes the old 'umbraco.helper.Request' method.
 2013-01-03 06:21:55 +03:00
Shannon Deminick
e0550a9a57 Fixes: #U4-1381 - LogHelper is public. Obsoletes 'Custm' log type and ensures that they are written to the log4net log too (though 
they will continue to write to the audit trail until it is removed)
 2013-01-03 02:08:29 +03:00
Shannon Deminick
184b00b3fa Changed html doc type declaration back to transitional until we can properly test. 2013-01-03 02:01:43 +03:00
Morten Christensen
84c564dbc5 Merge 2013-01-02 14:28:40 -01:00
Morten Christensen
169db0c15f Fixes U4-1368 so the FileHandlerData doesn't handle setting properties for Document and Media. 
Properties using the UploadField will have its value as well as related values updated in a BeforeSave event.
 2013-01-02 14:28:15 -01:00
Sebastiaan Janssen
55dbce3a93 Okay, really fixed the getdate() problem now. Maybe.. I should.. You know.. build my code first before I test it! D'oh. 2013-01-02 11:49:57 -01:00
Sebastiaan Janssen
ecd3f3c54d Merge 2013-01-02 11:34:07 -01:00
Sebastiaan Janssen
01fa4bdc78 Fix badly formated "getdate()" default value (CE didn't like it) 2013-01-02 11:33:56 -01:00
Morten Christensen
0312caa166 Ensuring closed connections in unit tests using either the legacy or PetaPoco datalayer. 2013-01-02 10:44:28 -01:00
Sebastiaan Janssen
56bcb2f804 Remove version number from login / about page images and removed some old images 2013-01-02 09:02:13 -01:00
Sebastiaan Janssen
a47f566fb0 Move assemblyversion to UmbracoVersion, where it belongs 2013-01-02 08:57:40 -01:00
Sebastiaan Janssen
f391029a2a Fixed U4-1378 "About" dialog is broken 2013-01-02 07:36:33 -01:00
Sebastiaan Janssen
253d6b0387 Merge 2013-01-02 07:21:43 -01:00
Sebastiaan Janssen
2e5ba0b1e4 Set the providername as well when updating the connection string 2013-01-02 07:21:08 -01:00
Sebastiaan Janssen
212fd47237 U4-1376 Better formatting of the CE connectionstring and fixing the installer 2013-01-02 07:08:02 -01:00
Shannon Deminick
fdbf254e7a Changed over master pages to use Html5 DocType. Updated EditMacro to use correct JS classes and correct CSS instead of inline. Also updated 
it to use knockoutjs for all UI handling and cleaned up a bit of the code (though it could still do with even more overhaul but at least its legible now).
Ensures that knockoutjs is included in all pages and dialog pages.
Now just need to update the EditMacro page to check for MVC vs Webforms to insert the correct macro syntax for MVC.
 2013-01-02 07:20:01 +03:00
Shannon Deminick
a8f808f488 Converted EditMacro.aspx over to use the correct webforms inheritance. 2013-01-01 03:28:09 +03:00
Shannon Deminick
72898dc154 Updates RenderMacro syntax for inserting a macro in mvc views that have no params 2013-01-01 02:52:25 +03:00
Shannon Deminick
e88dce59fe Added create dialog to partial view macros files, now need to update that dialog to support creating 
macros at the same time like with xslt, etc... but at least you can create/edit/delete them now.
 2013-01-01 01:00:33 +03:00
Shannon Deminick
e9f581bb51 Fixes #U4-1366 - conflict with partial view macro engine. 2013-01-01 00:42:20 +03:00
Sebastiaan Janssen
77df8cff07 U4-1376 Remove appSetting conn.string from release web.config 2012-12-31 14:53:13 -01:00
Sebastiaan Janssen
1e961860c3 U4-1376 Use the umbracoDbDsn everywhere 2012-12-31 14:52:49 -01:00
Shannon Deminick
503f62b4d6 Merge 2012-12-31 18:40:29 +03:00
Shannon Deminick
b292cb3ab3 Crated InsertMacroSplitButton webforms control instead of the hacky js code used to insert the split button in the template editor. 
Have implemented it now in the EditView (will transition over its use in editTemplate soon but is low priority).
Have got the js callbacks working now for inserting a macro for the mvc editor but need to implement the correct syntax. Also need
to migrate and update the editMacro dialog screen to check if we are rendering for MVC or not and if it is MVC then use the correct
syntax.
 2012-12-31 18:39:36 +03:00
Sebastiaan Janssen
1d42dc02c4 Fix failing tests due to new ApplicationTrees for Child Action Macros 2012-12-31 14:08:32 -01:00
Sebastiaan Janssen
173d5552c0 U4-1376 Remove internal dependencies on GlobalSettings.DbDsn 2012-12-31 13:57:29 -01:00
Sebastiaan Janssen
f251017c5d U4-1376 fix the GlobalSettings.DbDsn setter for backwards compatibility 2012-12-31 12:28:38 -01:00
Sebastiaan Janssen
2b532f72c3 U4-1376 Remove redundant connectionstring 2012-12-31 12:15:46 -01:00
Shannon Deminick
eeabee22bd Merge 2012-12-31 02:51:55 +03:00
Shannon Deminick
3ad793c4c5 Got partial view tree and partial view macros tree done. Need to get the custom create dialogs done now. 2012-12-31 02:51:30 +03:00
Morten Christensen
f4706fcfb7 Fixes U4-1370 for ContentTypes thats loading using new api meaning that the fix only applies to Content and Media, but currently not Members. 
For Members there is still an issue with MasterContentTypes, as the full structure is not loaded. Need to make the sql lookup recursive-
 2012-12-30 18:26:08 -01:00
Morten Christensen
f794730118 Merge 2012-12-30 07:17:48 -01:00
Morten Christensen
b3b23e736b Restructering strategies in folders 2012-12-30 07:17:04 -01:00
Shannon Deminick
746c2b960b Merge 2012-12-30 03:11:42 +03:00
Shannon Deminick
a7834b45da Created UmbracoAuthorizeAttribute, UmbracoAuthorizedController for all base MVC controllers that required a back office user to be logged in. 
Converted over the SaveTemplate and SavePartialView methods of the codeEditorSave legacy web service to use MVC services and marked them obsolete.
Created a generic route to route all controllers found in the namespace Umbraco.Web.WebServices. Added a 'Url' property on the BasePage webforms class
to expose a UrlHelper for use in views. Created UrlHelper extensions to easily get the base url path of the REST MVC web services.
Converted the EditView page and JavaScript to use the new REST services with jQuery instead of crappy MS ajax.
 2012-12-30 03:11:21 +03:00
Shannon Deminick
dbe9c6a2a9 Fixes: #U4-1360 - full names of tree types in config. 
Updates: #U4-1303 - basic UI support for partial view macros.
 2012-12-30 00:59:25 +03:00
Morten Christensen
782c23588c Adding a simplified implementation of PetaPoco's IMapper, which is used to correct an issue with inserting nullable dates in the db. 2012-12-29 18:53:13 -01:00
Morten Christensen
602e9c6d7e Adding trailing slash to failing routing tests. 
The issue with these tests might again be because of the UmbracoSettings file, which has the trailing slash setting. But with the settings being reset after teardown the tests were still failing, so made these minor corrections which shoudl correspond to the default setting.
 2012-12-29 18:22:51 -01:00
Morten Christensen
655964f11b Fixing up a few path issues after having changed FullpathToRoot in GlobalSettings. 
Corrected the path concat of path + web.config file.
 2012-12-29 18:18:49 -01:00
Morten Christensen
bcccc37f93 Changing t.GetAllProperties back to original t.GetProperties to avoid the use of binding flags, which is no longer necessary after having refactored the querying. 2012-12-29 18:17:16 -01:00
Morten Christensen
8999db6362 Refactoring ExpressionHelpers and querying to seperate the mapping used for our Database DTOs and Public Model. 
Adding a MediaTypeMapper similar to the ContentTypeMapper, but type specific.
The PetaPoco IMapper implementation is removed as its no longer needed.
Updating a few unit tests, as the Where clause is now correctly formatted.
Adding unit tests for the new ExpressionHelper and MappingResolver classes.
 2012-12-29 17:34:42 -01:00
Morten Christensen
3955f78966 Removing the camel case enforcement on the Alias of ContentTypes and MediaTypes in the new api. 2012-12-29 11:12:29 -01:00
Morten Christensen
56e2a89199 Adding a few new test cases to verify that AllowedChildContentTypes are saved correctly on ContentTypes and MediaTypes. 2012-12-29 11:11:09 -01:00
Morten Christensen
3e47d38a71 Adding missing directory seperator in FullpathToRoot. 
Changing Umbraco.Core to use the SqlCe assemblies from the nuget package instead of those in the GAC, as that could cause problems for the build of the Umbraco.Core.dll.
 2012-12-28 20:51:08 -01:00
Morten Christensen
c98d906f36 Correcting a few formatting issues after importing patch. 2012-12-28 19:08:01 -01:00