Morten Christensen
7bebb78bfc
Merge
2013-01-03 13:20:43 -01:00
Morten Christensen
78d6cac14a
Cleaning up how MasterContentTypes are used to load inherited propertytypes in the backoffice.
...
Fixing the loading of tabs on DocumentTypes in backoffice.
Adding check for saving boolean property values in the Integer db column.
2013-01-03 13:19:41 -01:00
Sebastiaan Janssen
d990b4318f
Merge
2013-01-03 11:22:29 -01:00
Sebastiaan Janssen
5994783644
Remove deleted images from the solution as well
2013-01-03 11:21:23 -01:00
Morten Christensen
f70f72f3e0
Merge
2013-01-03 10:13:40 -01:00
Morten Christensen
ec221d76e7
Document Cache needs to be updated here as the PublishWithResult has been changed to omit the cache refresh.
2013-01-03 10:10:19 -01:00
Morten Christensen
4639be974b
Fixes U4-1367 so media recycle bin shows trashed media and is actually able to empty it by permanantly deleting the items.
2013-01-03 09:59:26 -01:00
Sebastiaan Janssen
867f2a6c4a
Merge
2013-01-03 09:49:22 -01:00
Sebastiaan Janssen
4166cd9f5d
Extra checks for empty strings and non-existing paths, use PhysicalFileSystem
2013-01-03 09:48:29 -01:00
Morten Christensen
fe75a09afa
Updates Publish to call new SaveAndPublish method as per discussion in U4-1363
...
Publish will now also save the document before publishing it.
2013-01-03 09:43:47 -01:00
Morten Christensen
85f81537c5
Fixes U4-1371 so that media can be created through the RTE again.
2013-01-03 09:33:25 -01:00
Morten Christensen
0ca91c9229
Removing dependency no MediaFileSytem and UmbracoFile in the UploadField workaround, as it was causing problems when setting an image path thats not within the /media folder.
2013-01-03 08:59:44 -01:00
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
