yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/6.2.0' into 7.1.0

Browse Source 
Conflicts:
	build/NuSpecs/build/net40/UmbracoCms.targets
	build/NuSpecs/build/net45/UmbracoCms.targets
	build/NuSpecs/build/net451/UmbracoCms.targets
	build/NuSpecs/tools/Readme.txt
	build/NuSpecs/tools/install.ps1
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
This commit is contained in:
Shannon
2014-03-24 11:31:52 +11:00
parent 3e0a754dc0 81600f0f3c
commit 2e8993adb8
4 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/NuSpecs/build/net40/UmbracoCms.targets
View File

@@ -27,6 +27,10 @@
<Copy SourceFiles="%(UmbracoClientFiles.FullPath)"
DestinationFiles="umbraco_client\%(RecursiveDir)%(Filename)%(Extension)"
Condition="!Exists('umbraco_client\%(RecursiveDir)%(Filename)%(Extension)')" />
</Target>
<Copy SourceFiles="%(UmbracoClientFiles.FullPath)"
DestinationFiles="umbraco_client\%(RecursiveDir)%(Filename)%(Extension)"
Condition="!Exists('umbraco_client\%(RecursiveDir)%(Filename)%(Extension)')" />
</Target>
<Target Name="AddUmbracoFilesToOutput">
<ItemGroup>

4
build/NuSpecs/build/net45/UmbracoCms.targets
View File

@@ -27,6 +27,10 @@
<Copy SourceFiles="%(UmbracoClientFiles.FullPath)"
DestinationFiles="umbraco_client\%(RecursiveDir)%(Filename)%(Extension)"
Condition="!Exists('umbraco_client\%(RecursiveDir)%(Filename)%(Extension)')" />
</Target>
<Copy SourceFiles="%(UmbracoClientFiles.FullPath)"
DestinationFiles="umbraco_client\%(RecursiveDir)%(Filename)%(Extension)"
Condition="!Exists('umbraco_client\%(RecursiveDir)%(Filename)%(Extension)')" />
</Target>
<Target Name="AddUmbracoFilesToOutput">
<ItemGroup>

4
build/NuSpecs/build/net451/UmbracoCms.targets
View File

@@ -27,6 +27,10 @@
<Copy SourceFiles="%(UmbracoClientFiles.FullPath)"
DestinationFiles="umbraco_client\%(RecursiveDir)%(Filename)%(Extension)"
Condition="!Exists('umbraco_client\%(RecursiveDir)%(Filename)%(Extension)')" />
</Target>
<Copy SourceFiles="%(UmbracoClientFiles.FullPath)"
DestinationFiles="umbraco_client\%(RecursiveDir)%(Filename)%(Extension)"
Condition="!Exists('umbraco_client\%(RecursiveDir)%(Filename)%(Extension)')" />
</Target>
<Target Name="AddUmbracoFilesToOutput">
<ItemGroup>

5
src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMemberGroups.cs
View File

@@ -63,7 +63,10 @@ function openMemberGroup(id) {
public override void Render(ref XmlTree tree)
{
foreach(string role in Roles.GetAllRoles()) {
var roles = Roles.GetAllRoles();
Array.Sort(roles);
foreach(string role in roles) {
// MemberGroup[] MemberGroups = MemberGroup.GetAll;
// for (int i = 0; i < MemberGroups.Length; i++)