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

5857 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
8cd9266ea6 Updated obsolete msg after feedback here: 2b532f72c3 (commitcomment-3899011) 2013-08-23 14:17:40 +02:00
Sebastiaan Janssen
ad44feb6dd Don't throw exception when node has no template and asking for GetTemplateAlias (return string.Empty instead) 2013-08-23 14:08:13 +02:00
Sebastiaan Janssen
16ed85ecc9 Merge branch '4.11.10' into 6.2.0 
Conflicts:
	.gitignore
	build/Build.bat
	src/Umbraco.Core/Configuration/GlobalSettings.cs
 2013-08-23 13:48:38 +02:00
Sebastiaan Janssen
9d45b10ee5 Merge pull request #104 from umbraco/6.0.7 
6.0.7
 2013-08-23 04:46:41 -07:00
Sebastiaan Janssen
e9f8cf25b9 Merge branch '6.0.0-PetaPocoExtension' into 6.2.0 
Conflicts:
	.hgignore
 2013-08-23 13:42:26 +02:00
Sebastiaan Janssen
19a3b8809e Merge branch '4.11.9' into 6.2.0 
Conflicts:
	.hgtags
 2013-08-23 12:18:25 +02:00
Sebastiaan Janssen
96e40b8b4f Merge pull request #101 from umbraco/4.11.8 
Closing branch 4.11.9 as that version number was used for the emergency ...
 2013-08-23 03:17:46 -07:00
Sebastiaan Janssen
53aeb59eb4 Merge pull request #100 from umbraco/6.0.5 
Closing branch 6.0.5 as that version number was used for the emergency s...
 2013-08-23 03:17:29 -07:00
Sebastiaan Janssen
befb42cd68 Merge pull request #99 from umbraco/4.11.7---cmsContentXml-fixes 
Close 4.11.7 - cmsContentXml fixes branch
 2013-08-23 03:17:06 -07:00
Sebastiaan Janssen
15bab05e18 Merge branch '6.2.0' of github.com:umbraco/Umbraco-CMS into 6.2.0 2013-08-23 12:15:37 +02:00
Sebastiaan Janssen
7d2e408363 Merge branch '4.11.5' into 6.2.0 
Conflicts:
	.hgtags
 2013-08-23 12:15:28 +02:00
Sebastiaan Janssen
c1cc62543d Merge pull request #97 from umbraco/6.1.0-public 
Close 6.1.0-public branch, merged.
 2013-08-23 03:13:19 -07:00
Sebastiaan Janssen
6d61c93f62 Merge pull request #96 from umbraco/6.0.0-LegacyApi-Refactor 
Close 6.0.0-LegacyApi-Refactor branch
 2013-08-23 03:12:29 -07:00
Sebastiaan Janssen
38c8860e92 Merge pull request #95 from umbraco/6.0.0-Repository-Resolvers-refactor 
Closing branch after having merged the changes to events to the main 6.0...
 2013-08-23 03:12:08 -07:00
Sebastiaan Janssen
4719bfb4ad Merge pull request #94 from umbraco/4.10.1 
Close 4.10.1 branch
 2013-08-23 03:11:49 -07:00
Sebastiaan Janssen
b5719ab103 Merge pull request #93 from umbraco/4.6.1 
Closing branch
 2013-08-23 03:10:24 -07:00
Sebastiaan Janssen
c82573a697 Merge pull request #92 from umbraco/4.7.1 
Closing branch
 2013-08-23 03:10:03 -07:00
Sebastiaan Janssen
6448554343 Merge pull request #91 from umbraco/4.7.2 
Closing branch
 2013-08-23 03:09:40 -07:00
Sebastiaan Janssen
c0b9e803d9 Merge pull request #90 from umbraco/4.8-apptreexml-wip 
Closing branch
 2013-08-23 03:08:55 -07:00
Sebastiaan Janssen
ab06a22272 Merge pull request #89 from umbraco/4.8-tinymce-wip 
Closing old branch
 2013-08-23 03:08:31 -07:00
Sebastiaan Janssen
eac56eba47 Merge pull request #88 from umbraco/4.8-solutioncleanup-wip 
Close 4.8-solutioncleanup-wip branch
 2013-08-23 03:07:25 -07:00
Sebastiaan Janssen
0e822bdc81 Merge pull request #87 from umbraco/4.6.0 
Closing branch
 2013-08-23 02:52:25 -07:00
Shannon
ec4f6de631 Fixes: U4-2701 The media creation process needs to be optimized, there's far too much IO occuring 2013-08-23 13:41:16 +10:00
Shannon
3bb61294e9 Ensures all IDisposables are in a using clause for all processes involved with the media uploader, there were also a few streams not being closed or disposed either! 
U4-2699 The media upload process doesn't dispose all resources
 2013-08-23 11:46:55 +10:00
Shannon
c477da95fd Ensures all IDisposables are in a using clause for all processes involved with the media uploader, there were also a few streams not being closed or disposed either! 2013-08-23 11:20:00 +10:00
Sebastiaan Janssen
adb059e0da Revert U4-2511 Locallink:NODEID not working as it was breaking expectations of people running site without this fix 2013-08-22 13:13:32 +02:00
Morten Christensen
4337976887 Merge branch '6.1.4' of https://github.com/umbraco/Umbraco-CMS into 6.1.4 2013-08-22 12:59:08 +02:00
Morten Christensen
efe5de87a6 Updating readme for nuget packages 2013-08-22 12:58:53 +02:00
Sebastiaan Janssen
389642946e Merge pull request #85 from rolfis/patch-1 
Update sv.xml
 2013-08-21 09:03:37 -07:00
rolfis
53d30aa3cb Update sv.xml 
Changed {0} to %0% in login screen bottomText to display correct end year of copyright notice.
 2013-08-21 16:55:53 +02:00
Shannon
e233cffb9d Changes the cache keys in PluginManager to reference a const to make it a bit more clear. 2013-08-21 11:19:27 +10:00
Shannon
9e58ebed24 Merge branch '6.1.4' of https://github.com/umbraco/Umbraco-CMS into 6.1.4 2013-08-21 11:14:59 +10:00
Shannon
f51c4e332e Fixes: U4-2653 BeginUmbracoForm should use absolute path with query string URLs without the protocol 2013-08-21 11:14:37 +10:00
Sebastiaan Janssen
03a0a0a0e9 Fix a strange VS2012 build targets problem 2013-08-20 18:06:09 +02:00
Sebastiaan Janssen
dcb381770f Fix unit test that was looking at the wrong filename 2013-08-19 12:54:20 +02:00
Sebastiaan Janssen
65db0e69a9 Fixes: U4-2642 Make SQL CE more resilient to server crashes 2013-08-19 12:26:01 +02:00
Sebastiaan Janssen
23c6a91e9c Fixes merge issue 2013-08-19 11:47:53 +02:00
Sebastiaan Janssen
a03c6dcf13 Merge pull request #80 from ThomasSkyldahl/6.1.4 
UmbracoViewPage.WriteLiteral(object value)  optimized memory usage and combined markup injection
 2013-08-19 02:34:13 -07:00
Sebastiaan Janssen
3029d97f33 Merge pull request #78 from dprothero/6.1.4 
Fixed membership provider to correctly log failed attempts.
 2013-08-19 02:06:15 -07:00
Sebastiaan Janssen
f41d967864 Fixes: U4-2637 Error adding a User using AD Membership Provider when no Email Address Defined 2013-08-19 10:41:49 +02:00
Thomas Skyldahl Sørensen
4a481b05d4 Optimized WriteLiteral 2013-08-16 10:09:09 +02:00
Shannon
66c6b5b524 Fixes: U4-2632 Remove the recursive permissions check on the move/copy dialog 2013-08-16 12:46:40 +10:00
Shannon
e3b0f71549 Merge branch '6.1.4' of https://github.com/umbraco/Umbraco-CMS into 6.1.4 2013-08-16 12:25:55 +10:00
Shannon
973b466798 Fixes: U4-2627 Ensure that the plugins cache files are named with the machine name 2013-08-16 12:25:38 +10:00
Shandem
fa0eef4333 Merge pull request #79 from sniffdk/6.1.4 
Moved WriteLiteral method to UmbracoViewPage
 2013-08-15 19:12:54 -07:00
Mads Krohn
a343a76a26 Moved WriteLiteral method to UmbracoViewPage 
When we use a custom model through a custom controller, in our view, we
inherit from UmbracoViewPage, so the WriteLiteral method, which provides
preview badge and miniprofiler code, should be placed there.
 2013-08-16 00:01:31 +02:00
Morten Christensen
d0a9e3236e Promise for the changed unit test was incorrect, so correcting it in this commit 2013-08-15 10:26:24 +02:00
Morten Christensen
b899805ec9 Correcting issue introduced in d3b69e04e1 where the returned IProfile would contain the Username and not the Name. This will have changed the Creator and Writer name in the xml cache to be the Login instead of the Name of the user, so for those that use these fields its important to republish to update the xml cache. 
Fixes U4-2628 creatorName and writerName should use username - not loginname. Also verified through file history back to v4.
 2013-08-15 10:08:59 +02:00
Morten Christensen
766497e355 Refactoring QueryHelper to be a base class instead. 
Fix U4-2607 Creating nodes with special characters causes YSOD
 2013-08-14 17:07:21 +02:00
Morten Christensen
67a2a9cfe4 Refactoring the optimized Recycle Bin, so that the Recycle Bin's repository is more independent and easier to use with the new events added to the Content- and MediaService. 2013-08-14 16:12:13 +02:00