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

7905 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
33599a15a2 Fixes: U4-2952 Preview mode causes ysod - null reference 2013-09-30 16:06:56 +10:00
Shannon
42f9427e24 ignores the built in member properties for now, adds more logging to Resolution to try to figure out the underlying problem. 2013-09-30 15:42:29 +10:00
Shannon
e0878fdd9f fixes unit test 2013-09-30 14:48:05 +10:00
Shannon
fb3bad90d6 had to change port 9999 to 9990 because the new sony vaio admin uses 9999 2013-09-30 14:24:39 +10:00
Shannon
590838302b Merge remote-tracking branch 'origin/6.2.0' into 7.0.0-member-editor-wip 
Conflicts:
	src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
 2013-09-30 14:19:12 +10:00
Shannon
c9aac96c1a Fixes EditUser.aspx 2013-09-30 14:15:39 +10:00
Shannon
bbdce28951 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0-member-editor-wip 
Conflicts:
	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadContent.cs
 2013-09-30 13:52:01 +10:00
Shannon
cf6ecf5bc9 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-member-editor-wip 
Conflicts:
	src/Umbraco.Web.UI/config/trees.config
 2013-09-30 13:51:18 +10:00
Shannon
4df79ce55b re-enables LoadMinimalDocument and adds this to the optimized check, even in optimized model the OnRenderNode can still execute with a minimal doc. 2013-09-30 13:47:19 +10:00
Shannon
15d2021786 Obsoletes the LoadMinimalDocument flag since it no longer serves a purpose. 2013-09-30 13:36:49 +10:00
Shannon
a8f6b9eeb9 Fixes: U4-2925 Tree performance is very poor in 6.1.x when having event subscriptions 2013-09-30 13:31:48 +10:00
Shannon
3d4b403c0e Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-09-30 12:02:51 +10:00
Shannon
957760d29a Creates IDisposeOnRequestEnd and ensures UmbracoContext and UmbracoDatabase implement it, then we only dispose of these types of objects at the end of the request if they are part of the httpcontext items (U4-2738). Fixes: U4-2988 UmbracoObjectTypesExtensions is not thread safe 2013-09-30 12:02:35 +10:00
Stephan
928f7a1ed0 Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/macro.cs
 2013-09-29 16:05:52 +02:00
Stephan
a7603747a6 XmlPublishedCache - 'version' is not a property 2013-09-29 15:22:39 +02:00
Stephan
e7754213f1 INode to IPublishedContent transition for Razor macros 2013-09-29 15:22:35 +02:00
Stephan
ea82e9c67e Web.Routing - fix PublishedContentRequest exception message 2013-09-29 15:22:31 +02:00
Stephan
182cc1ace7 Web.UmbracoHelper - add Url overload w/mode 2013-09-29 15:22:27 +02:00
Stephan
205b9889f2 Macros - PartialViewMacro use IPublishedContent, not INode 2013-09-29 15:22:23 +02:00
Stephan
4a58fbfa1d PublishedContent - add OfType<> extension to IPublishedContent 2013-09-29 15:22:19 +02:00
Stephan
af534e87f3 PublishedContent - bugfix IsDraft on previewed document 2013-09-29 15:22:15 +02:00
Stephan
53c753b8d9 Fix build after merge 2013-09-28 17:11:05 +02:00
Stephan
a8a2c706ba Merge branch '7.0.0' into 7.0.0-pubcontent 
Conflicts:
	src/Umbraco.Core/PublishedContentHelper.cs
 2013-09-27 15:59:42 +02:00
perploug
f456e5b83e One last icon class update in tree.config 2013-09-27 14:21:06 +02:00
perploug
840047335a removes folder.gif references 2013-09-27 13:48:06 +02:00
perploug
6ee7dbb7e6 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-27 13:38:44 +02:00
perploug
f0692329b6 Moved contentpicker button to bottom 2013-09-27 13:36:59 +02:00
Sebastiaan Janssen
4f43172d29 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-27 13:36:17 +02:00
Sebastiaan Janssen
f74b9f9071 Renaming columns in SQL CE is a bit more elaborate.. 2013-09-27 13:35:52 +02:00
Lars-Erik Aabech
b6777e4635 Recursive PublishedContentExtensions IsDocumentType 
Optional recursive parameter defaulted to false for backwards compatibility and no performance hit.
Settings recursive = true fetches content type for content and checks ancestor content types for the same alias.
 2013-09-27 13:12:16 +02:00
perploug
0b856302d9 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-27 12:23:33 +02:00
perploug
540a28ea8b Fixes image upload extensions 
filters out disallowed
converts images to mediaType=image
everything else type = file
 2013-09-27 12:23:12 +02:00
Sebastiaan Janssen
46590c8fce Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-27 12:02:16 +02:00
Sebastiaan Janssen
962bab088c Update nuspec files to get the correct dependencies with the correct versions 2013-09-27 12:00:36 +02:00
perploug
0c8a7f3466 Updates missing dashboard paths 2013-09-27 11:35:59 +02:00
perploug
dcb08250ab Minor search visual tweaks 2013-09-27 11:23:38 +02:00
perploug
23822a97ef fixes dialog legacy redirects 2013-09-27 11:23:03 +02:00
perploug
c4984bffc7 Nodetype create dialog 2013-09-27 11:22:39 +02:00
perploug
10b58fbd29 Adds drag drop to media dashboard 2013-09-27 11:22:26 +02:00
perploug
812ed78cd9 made mediatype editor async 2013-09-27 11:21:56 +02:00
perploug
ba838e893e Polished nodetype dialog windows 2013-09-27 11:21:33 +02:00
perploug
1db94711f5 tree icons updated 2013-09-27 11:21:10 +02:00
perploug
08e21e36a6 minor styling updates 2013-09-27 11:03:01 +02:00
perploug
249015a0e9 Remove non-working doctype add link 2013-09-27 11:02:40 +02:00
Shannon
a3d674f574 Updated the saving model and validator inheritance chain to better support members, have the members editor display data and posting/validating data - now need to get the correct fields being displayed and the correct tab/layout but coming along very nicely! 2013-09-27 16:59:38 +10:00
Stephan
9a66948857 Merge pull request #141 from IDisposable/patch-1 
Fix order of null-check versus dotting through to .UmbracoContext.
 2013-09-26 23:29:59 -07:00
Shannon
82c784d560 Most of the member tree working, have the member editor rendering data 2013-09-27 15:19:39 +10:00
Shannon
30095000e6 Updates to latest version of JSON.Net 2013-09-27 13:25:28 +10:00
Shannon
5d224cca9b Updates to latest version of Microsoft.Net.Http 2013-09-27 13:22:27 +10:00
Shannon
c5c1a7ddfc Upgrades to latest AutoMapper lib 2013-09-27 13:16:25 +10:00