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

431 Commits

Author SHA1 Message Date
Sebastiaan Janssen
c4e6da52d3 Merge with default 2013-01-10 11:13:40 -01:00
Sebastiaan Janssen
a53efb394f Closing 4.11.2 branch 2013-01-10 10:54:56 -01:00
Sebastiaan Janssen
98ed32c8cf Include the new translation files in the project so they get in the build too 2013-01-10 09:55:35 -01:00
Sebastiaan Janssen
df10ebebca Get latest translations in 2013-01-10 08:21:27 -01:00
Sebastiaan Janssen
46b1501ef5 Get latest translations in 2013-01-10 08:20:05 -01:00
Shannon Deminick
0c00f1e3b1 Fixes: #U4-1414 - split buttons not working in template editor 2013-01-10 06:18:12 +03:00
Shannon Deminick
8ed1d76bc7 cleans up a bit of code relating to U4-1412 2013-01-10 05:55:55 +03:00
Shannon Deminick
08859c3b32 Fixes: #U4-1412 - inserting macro with zero params causes JS error. 2013-01-10 05:48:03 +03:00
Shannon Deminick
89332bf3f5 updated all editors using the new html 5 doc type to declare the content area below the ASP.Net page declarations 
(I didn't even know asp.net allowed having controls listed above)
 2013-01-10 05:08:52 +03:00
Shannon Deminick
4532c1b5b9 Updated IMigrations to use the proper plugin format using resolvers, updated unit tests and are passing. 2013-01-10 04:33:30 +03:00
Morten Christensen
03e7a5a80b A bit of tidy up related to the content typoe trees. 
The PropertyFactory contained an issue for MediaTypes similar to the one that existed for ContentTypes.
 2013-01-09 13:29:32 -01:00
Sebastiaan Janssen
4553fcedeb Remove comments/courier from dev dashboard config 2013-01-09 05:40:52 -01:00
Sebastiaan Janssen
d6121ebab2 Connectionstrings section used to be after mailsettings, makes merges easier 
for people who are upgrading
 2013-01-09 05:15:28 -01:00
Sebastiaan Janssen
937fc423ad Change word deprecated to obsolete 2013-01-08 13:27:16 -01:00
Sebastiaan Janssen
3f5e20ca0e Replaced a little bit too much in the compilation section 2013-01-07 15:19:53 -01:00
Sebastiaan Janssen
7d0fecb078 Update uGoLive to v1.3.0 (has better reporting of which folders have incorrect permissions) 2013-01-07 14:06:07 -01:00
Sebastiaan Janssen
a11a1a51c7 Set compilation debug=false explicitly for release version (for uGoLive) 2013-01-07 13:36:43 -01:00
Sebastiaan Janssen
759773deee Correct mistake in config transform 2013-01-07 08:55:43 -01:00
Sebastiaan Janssen
7e489af4c5 Fix an error during development where the razor version was ambiguous 2013-01-07 07:46:59 -01:00
Shannon Deminick
b5635d5b25 Finished: #U4-1303 - adds 'create macro' checkbox for the Partial View Macros tree. 2013-01-04 02:57:40 +03:00
Shannon Deminick
22c7f0d6cc Merge 2013-01-03 17:13:08 +03:00
Shannon Deminick
a6fa5508a8 Completes: #U4-1303 - UI integration for MVC views, partial views and partial view macros including ability to insert 
macros in the view editor.
 2013-01-03 17:11:59 +03:00
Sebastiaan Janssen
5994783644 Remove deleted images from the solution as well 2013-01-03 11:21:23 -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
184b00b3fa Changed html doc type declaration back to transitional until we can properly test. 2013-01-03 02:01:43 +03: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
253d6b0387 Merge 2013-01-02 07:21:43 -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
Sebastiaan Janssen
77df8cff07 U4-1376 Remove appSetting conn.string from release web.config 2012-12-31 14:53:13 -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
2b532f72c3 U4-1376 Remove redundant connectionstring 2012-12-31 12:15:46 -01: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
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
Sebastiaan Janssen
1e4361ed2f Merge with 6.0.0-LegacyApi-Refactor 2012-12-28 08:45:40 -01:00
Sebastiaan Janssen
5e4c4ae57c Fixes U4-1347 Can't enter backoffice of V6 with IE9 2012-12-27 11:21:38 -01:00
Morten Christensen
9f2d41286c Fixing MasterContentType for DocumentTypes. 
Adding ParentId "listener" to the repositories that uses ParentId, so we can ensure that the path is updated correctly.
Fixing how AllowedTemplates are saved upon creation of a new DocumentType.
Ensuring DocumentType.Save is called when creting a new DocumentType.
Fixing Publish/RePublish of Content with previously published children.
Removing UpdateDocumentCache in the save event of editContent.aspx.cs as its now handled in the new api.
Rewiring template methods on DocumentType class to use the new api.
 2012-12-20 14:29:08 -01:00
Sebastiaan Janssen
6a05c4d968 Merge with 6.0.0 2012-12-20 09:49:39 -01:00
Sebastiaan Janssen
ea35ac570e Merge with 4.11.2 2012-12-20 09:43:09 -01:00
Sebastiaan Janssen
c5e7c81c19 Notification and tree refresh when unpublishing content 2012-12-20 09:25:50 -01:00
Morten Christensen
1b465ca709 Merge with 6.0.0 2012-12-19 12:15:34 -01:00
Sebastiaan Janssen
97f759b658 Forgot to add the new image file, oops! 2012-12-19 10:34:06 -01:00
Emil Christiansen
8c9aa8f3e8 Changed editContent.aspx.cs so the 'access-denied' error messages look more Umbraco'ish 
Added access-denied.png picture
Updated Umbraco.Web.UI.csproj so it includes the picture
 2012-12-17 10:00:36 -01:00
Morten Christensen
0cce4a1a9e Updating DefaultData and ContentControl to better support saving through the new api. 
DataTypes doesn't save directly to the db, but keeps the value in-memory so the save can be handled by the new api.
Correcting the usage of versioning in the ContentRepository.
 2012-12-14 11:43:16 -01:00
Morten Christensen
c386aa491b Merge with 6.0.0 2012-12-12 15:18:31 -01:00