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
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
perploug
757178b90b Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-26 15:35:59 +02:00
perploug
f2e7cff048 Minor css updates 2013-09-26 15:35:44 +02:00
perploug
0c350e9cc1 Content name directive refactor 2013-09-26 15:35:28 +02:00
perploug
33b4a73794 Beginning work on localization 2013-09-26 15:34:58 +02:00
perploug
e52cbf7130 Log resource 2013-09-26 15:34:10 +02:00
Sebastiaan Janssen
98e487753f Pointing to the Belle docs for building from source 2013-09-26 14:52:48 +02:00
Shannon
63f5d0acaf Fixes: U4-2787 Copy dialog results in YSOD, converts move/copy dialog to only use the new API. removes xhtmlConformance from web.config. 2013-09-26 17:17:18 +10:00
Stephan
ce15d46a5e Merge remote-tracking branch 'fork1/6.2.0-pubcontent' into 7.0.0-pubcontent 2013-09-26 09:12:02 +02:00
Stephan
02ffebde49 Merge branch '7.0.0' into 7.0.0-pubcontent 2013-09-26 09:06:01 +02:00
Stephan
2e06c61a4f Fix issues after merge 2013-09-26 09:04:23 +02:00
Stephan
36d6e4b4da Merge branch '7.0.0' into 7.0.0-pubcontent 
Conflicts:
	src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs
	src/Umbraco.Core/PublishedContentHelper.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web/Models/XmlPublishedContent.cs
	src/Umbraco.Web/Models/XmlPublishedContentProperty.cs
	src/Umbraco.Web/Templates/TemplateUtilities.cs
 2013-09-26 08:57:01 +02:00
Shannon
57af8727e9 fixes an async issue with .net 4.5 - well actually it fixes an issue with previous versions :) 2013-09-26 16:36:48 +10:00
Shannon
4212199226 Fixes: U4-2941 Sort dialog YSODs on root node and updates media GetChildren to be the same as content with options/sorting/filtering. 2013-09-26 16:26:05 +10:00
Shannon
18c1ec8ae7 fixed issue with the 'do something else' button 2013-09-26 16:05:42 +10:00
Shannon
e1cf3bc597 Implements: U4-2937 A tree item should be able to have a default action 2013-09-26 15:55:38 +10:00
Shannon
c9fd168cbd Fixes: U4-2905 Refresh node at tree root (i.e. content/media) doesn't work 2013-09-26 14:28:18 +10:00
Shannon
ac755d7a22 Fixes: U4-2943 Insert macro dialog no longer works when editing mvc views, U4-2930 Get macro picker dialog working with partial views and partial view macros 2013-09-26 13:20:19 +10:00
Shannon
36ddb872fa fixes: U4-2942 re-publish all on content root not displaying 2013-09-26 13:03:09 +10:00
Shannon
29d849754c Fixes: U4-2703 Content editor save/publish should update modified attributes 2013-09-26 12:53:33 +10:00
Shannon
f9055016ff Completes: U4-2868 Remove ActionSave, fixes unit tests 2013-09-26 12:21:52 +10:00
Shannon
00cb8f08a0 Fixes unit tests 2013-09-26 12:18:52 +10:00
Shannon
0371b44a84 fixes some unit tests 2013-09-26 11:58:03 +10:00
Shannon
f5f25ed017 Completes: U4-2900 remove explicit declarations in web.config 2013-09-26 11:57:45 +10:00
Shannon
bb78e38a67 Updated the default release config for umbracoSettings.config 2013-09-26 11:03:28 +10:00
Shannon
5ba1ad5e93 Completes: U4-2900 remove explicit declarations in web.config, U4-2940 Remove old spellchecker for now 2013-09-26 10:50:19 +10:00
Shannon
611f3a04b6 Fixes api controller tests 2013-09-26 10:00:01 +10:00
perploug
aca64ae08e Fixes: U4-2871 2013-09-25 16:03:34 +02:00
perploug
b918462e40 Missing csproj files + minor css updates 2013-09-25 15:39:23 +02:00
perploug
2415e39e43 merge 2013-09-25 15:17:21 +02:00
perploug
123e70ae21 Small tweaks on the macro dialog 2013-09-25 15:15:52 +02:00
perploug
8a3f1e6fbf NH code refactor 
Moved view into directive
Moved dropzone into directive
Reused in media dialog
 2013-09-25 15:15:35 +02:00
perploug
7d50d0fc6c Replaces all the old core dashboards 2013-09-25 15:14:09 +02:00
Shannon
d689ad488c Fixes macro rte editor to use the current page id 2013-09-25 21:46:04 +10:00