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

7146 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Shannon
7684381326 Fixes issue with media edit controller not having a $timeout reference. 2013-09-27 13:05:57 +10:00
Shannon
ed7851c962 Fixes more issues with the legacy API backwards compatibility issues with new property editor that don't have legacy predecessors. - can now create a member. 2013-09-27 12:51:52 +10:00
Shannon
bf124cb326 Fixes: U4-2957 Member type saving generates YSOD 2013-09-27 12:39:52 +10:00
Shannon
e0fb09c6bc Added better backwards compatibility for when people are using the legacy business logic APIs but they are using new property editors when there is no legacy property editor predecessor (IDataType implementation). 2013-09-27 11:02:59 +10:00
Shannon
49554b7983 updates macro script web.config to what it should be 2013-09-27 09:30:08 +10:00
Shannon
6cf689220e Fixed up the log controller & models (based on feedback http://bit.ly/1h6KiJf ) 2013-09-27 09:25:08 +10:00
perploug
51912bd50f Fixes those resizing issues we've been having 2013-09-26 23:07:51 +02:00
perploug
afb5139aec enables the super rough search data in navigation 2013-09-26 22:56:01 +02:00
perploug
c9ce0117b9 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-26 21:44:08 +02:00
perploug
67a81d7b2d content name directive exit method change 2013-09-26 21:43:55 +02:00
perploug
7c66d26973 Latest edits dashboard 2013-09-26 21:43:42 +02:00
perploug
bcac690fd5 Media picker tinymce icon 2013-09-26 21:43:33 +02:00
Marc Brooks
b5022bb183 Fix order of null-check versus dotting through to .UmbracoContext. 
The order of operations in the constructor dots through to the _routingContext.UmbracoContext before checking if the value was null and throwing the argument exception (which really isn't an ArgumentException...)
 2013-09-26 13:41:51 -05:00
Sebastiaan Janssen
1138e54672 Unignore macroscripts/web.config and add an empty config as a placeholder for now 2013-09-26 15:52:16 +02:00
Sebastiaan Janssen
5d9ffde268 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-26 15:45:44 +02:00
Sebastiaan Janssen
e37ce030f9 Pointing to the Belle docs for building from source 2013-09-26 15:44:12 +02:00
Sebastiaan Janssen
2e9bc3bb2b Oops updated wrong branch 2013-09-26 15:43:08 +02:00