Merge branch 'master' into dev

Orchard.proj

@@ -323,6 +323,7 @@
     <ItemGroup>
     
       <Zip-Exclude Include="
+        $(MSBuildProjectDirectory)\src\**\packages\**\*;
         $(MSBuildProjectDirectory)\src\**\bin\**\*;
         $(MSBuildProjectDirectory)\src\**\obj\**\*;
         $(MSBuildProjectDirectory)\**\App_Data\**\*;
@@ -339,7 +340,7 @@
 
       <Zip-Stage Include="$(StageFolder)\**\*" />
 
-      <Zip-MsDeploy Include="$(MsDeployFolder)\**\*" />
+      <Zip-MsDeploy Include="$(MsDeployFolder)\**\*" Exclude="$(MSBuildProjectDirectory)\**\bin\**\*.pdb;"/>
 
       <Zip-Source Include="
         $(MSBuildProjectDirectory)\lib\**\*;

README.md

@@ -6,7 +6,7 @@ Orchard is a free, open source, community-focused Content Management System buil
 
 You can try it for free on [DotNest.com](https://dotnest.com) or on Microsoft Azure by clicking on this button.
 
-[![Deploy to Azure](https://azuredeploy.net/deploybutton.png)](https://ms.portal.azure.com/#create/OutercurveFoundation.OrchardCMS.0.5.9)
+[![Deploy to Azure](https://azuredeploy.net/deploybutton.png)](https://portal.azure.com/#create/OutercurveFoundation.OrchardCMS.1.0.4)
 
 ## About The Orchard Project
 
@@ -51,4 +51,4 @@ There are many ways you can [contribute to Orchard](http://orchardproject.net/co
 
 ## The Future Of Orchard CMS: Orchard 2
 
-As the underlying frameworks (.NET, ASP.NET and ASP.NET MVC) are constantly evolving, Orchard of course keeps track of the changes and improvements of these: Orchard 2 is the next generation of Orchard releases that is based on [ASP.NET vNext](http://www.asp.net/vnext). Just like the current Orchard project, it's fully [open-source and is publicly available on GitHub](https://github.com/OrchardCMS/Orchard2). Orchard 2 (as a framework) is being built from scratch: it's still in development and does not share any of its code base (at least directly) with the current versions of Orchard.
+As the underlying frameworks (.NET, ASP.NET and ASP.NET MVC) are constantly evolving, Orchard of course keeps track of the changes and improvements of these: Orchard 2 is the next generation of Orchard releases that is based on [ASP.NET vNext](http://www.asp.net/vnext). Just like the current Orchard project, it's fully [open-source and is publicly available on GitHub](https://github.com/OrchardCMS/Orchard2). Orchard 2 (as a framework) is being built from scratch: it's still in development and does not share any of its code base (at least directly) with the current versions of Orchard.

src/Orchard.Web/Core/Common/Drivers/TextFieldDriver.cs

@@ -72,6 +72,7 @@ namespace Orchard.Core.Common.Drivers {
                                         () => shapeHelper.EditorTemplate(TemplateName: "Fields.Common.Text.Edit", Model: viewModel, Prefix: GetPrefix(field, part)));
                 }
 
+                field.Value = viewModel.Text;
                 var settings = field.PartFieldDefinition.Settings.GetModel<TextFieldSettings>();
 
                 if (String.IsNullOrEmpty(field.Value) && !String.IsNullOrEmpty(settings.DefaultValue)) {
@@ -103,4 +104,4 @@ namespace Orchard.Core.Common.Drivers {
                 .Enumerate<TextField>(() => field => new[] { field.Value });
         }
     }
-}
+}

src/Orchard.Web/Modules/Orchard.Autoroute/Handlers/AutoroutePartHandler.cs

@@ -104,7 +104,7 @@ namespace Orchard.Autoroute.Handlers {
 
             // Is this the current home page?
             if (part.ContentItem.Id == homePageId) {
-                _orchardServices.Notifier.Warning(T("You removed the content item that served as the site\'s home page. \nMost possibly this means that instead of the home page a \"404 Not Found\" error page will be displayed without a link to log in or access the dashboard. \n\nTo prevent this you can e.g. publish a content item that has the \"Set as home page\" checkbox ticked."));
+                _orchardServices.Notifier.Warning(T("You removed the content item that served as the site's home page. \nMost possibly this means that instead of the home page a \"404 Not Found\" page will be displayed. \n\nTo prevent this you can e.g. publish a content item that has the \"Set as home page\" checkbox ticked."));
             }
             _autorouteService.Value.RemoveAliases(part);
         }

src/Orchard.Web/Modules/Orchard.ContentTypes/Services/ContentDefinitionService.cs

@@ -272,8 +272,8 @@ namespace Orchard.ContentTypes.Services {
             _contentDefinitionEventHandlers.ContentPartRemoved(new ContentPartRemovedContext {ContentPartDefinition = partDefinition});
         }
 
-        public IEnumerable<ContentFieldInfo> GetFields() {
+        public IEnumerable<ContentFieldInfo> GetFields() {            
-            return _contentFieldDrivers.SelectMany(d => d.GetFieldInfo());
+            return _contentFieldDrivers.SelectMany(d => d.GetFieldInfo()).GroupBy(x => x.FieldTypeName).Select(g => g.First());
         }
 
         public void AddFieldToPart(string fieldName, string fieldTypeName, string partName) {

src/Orchard.Web/Modules/Orchard.Fields/Drivers/TextFieldDriver.cs

@@ -19,11 +19,11 @@ namespace Orchard.Fields.Drivers {
         protected override DriverResult Editor(ContentPart part, TextField field, IUpdateModel updater, dynamic shapeHelper) {
             var settings = field.PartFieldDefinition.Settings.GetModel<TextFieldSettings>();
 
-            if (String.IsNullOrEmpty(field.Value) && !String.IsNullOrEmpty(settings.DefaultValue)) {
+            if (!String.IsNullOrEmpty(settings.DefaultValue) && (String.IsNullOrEmpty(field.Value) || field.Value.Equals(settings.DefaultValue))) {
                 field.Value = _tokenizer.Replace(settings.DefaultValue, new Dictionary<string, object> { { "Content", part.ContentItem } });
             }
 
             return null;
         }
     }
-}
+}

src/Orchard.Web/Modules/Orchard.MediaLibrary/Scripts/media-library.js

@@ -610,7 +610,5 @@ $(function () {
             return false;
         });
 
-        // Select recent folder when the page is initialized.
-        viewModel.selectRecent();
     })(window.mediaLibrarySettings);
 })

src/Orchard.Web/Modules/Orchard.MultiTenancy/Controllers/AdminController.cs

@@ -139,10 +139,9 @@ namespace Orchard.MultiTenancy.Controllers {
                 return new HttpUnauthorizedResult();
 
             var tenant = _tenantService.GetTenants().FirstOrDefault(ss => ss.Name == viewModel.Name);
+
             if (tenant == null)
                 return HttpNotFound();
-            else if (tenant.Name == _thisShellSettings.Name)
-                return new HttpUnauthorizedResult();
 
             if (!ModelState.IsValid) {
                 return View(viewModel);

src/Orchard.Web/Modules/Orchard.Taxonomies/Controllers/TermAdminController.cs

@@ -41,7 +41,7 @@ namespace Orchard.Taxonomies.Controllers {
 
             var taxonomy = _taxonomyService.GetTaxonomy(taxonomyId);
 
-            var terms = _taxonomyService.GetTermsQuery(taxonomyId).Slice(pager.GetStartIndex(), pager.PageSize);
+            var terms = TermPart.Sort(_taxonomyService.GetTermsQuery(taxonomyId).Slice(pager.GetStartIndex(), pager.PageSize));
 
             var pagerShape = Shape.Pager(pager).TotalItemCount(_taxonomyService.GetTermsQuery(taxonomyId).Count());
 

src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyFieldDriver.cs

@@ -62,8 +62,7 @@ namespace Orchard.Taxonomies.Drivers {
 
         protected override DriverResult Editor(ContentPart part, TaxonomyField field, IUpdateModel updater, dynamic shapeHelper) {
             // Initializing viewmodel using the terms that are already selected to prevent loosing them when updating an editor group this field isn't displayed in.
-            // Get all the selected, published terms of all the TaxonomyFields of the content item.
+            var appliedTerms = GetAppliedTerms(part, field, VersionOptions.Latest).ToList();
-            var appliedTerms = GetAppliedTerms(part).ToList();
             var viewModel = new TaxonomyFieldViewModel { Terms = appliedTerms.Select(t => t.CreateTermEntry()).ToList() };
             foreach (var item in viewModel.Terms) item.IsChecked = true;
             

src/Orchard.Web/Themes/TheAdmin/Theme.txt

@@ -2,6 +2,6 @@
 Version: 1.10
 Author: Jon Wall
 Tags: hidden, admin
-Description: An admin theme not to be used for the site so don't click "Activate" (or "Uninstall"). In the near future admin themes won't be mixed in with site themes.
+Description: The Orchard admin theme.
 Website: http://www.orchardproject.net
 Zones: Header, Messages, BeforeContent, LocalNavigation, Content, AfterContent, Footer