From 189315809c5ee0f05712c56dad1611ea0e23c71a Mon Sep 17 00:00:00 2001 From: Aaron Powell Date: Sun, 6 Nov 2016 21:18:16 -0800 Subject: [PATCH] Umbraco 7.5 (#34) * Updating to umbraco 7.5 * Adding release notes --- .../ModelsBuilder/modelsbuilder.controller.js | 31 ++ .../ModelsBuilder/modelsbuilder.htm | 41 ++ .../ModelsBuilder/modelsbuilder.resource.js | 23 + .../ModelsBuilder/package.manifest | 7 + Chauffeur.Demo/Chauffeur.Demo.csproj | 227 +++++--- Chauffeur.Demo/Views/Web.config | 14 +- Chauffeur.Demo/Web.config | 192 ++++++- Chauffeur.Demo/config/ClientDependency.config | 16 +- Chauffeur.Demo/config/Dashboard.config | 39 +- Chauffeur.Demo/config/EmbeddedMedia.config | 72 ++- Chauffeur.Demo/config/ExamineIndex.config | 8 +- Chauffeur.Demo/config/ExamineSettings.config | 2 +- Chauffeur.Demo/config/Lang/cs-CZ.user.xml | 3 + Chauffeur.Demo/config/Lang/da-DK.user.xml | 3 + Chauffeur.Demo/config/Lang/de-DE.user.xml | 3 + Chauffeur.Demo/config/Lang/en-GB.user.xml | 3 + Chauffeur.Demo/config/Lang/en-US.user.xml | 3 + Chauffeur.Demo/config/Lang/es-ES.user.xml | 3 + Chauffeur.Demo/config/Lang/fr-FR.user.xml | 3 + Chauffeur.Demo/config/Lang/he-IL.user.xml | 3 + Chauffeur.Demo/config/Lang/it-IT.user.xml | 3 + Chauffeur.Demo/config/Lang/ja-JP.user.xml | 3 + Chauffeur.Demo/config/Lang/ko-KR.user.xml | 3 + Chauffeur.Demo/config/Lang/nb-NO.user.xml | 3 + Chauffeur.Demo/config/Lang/nl-NL.user.xml | 3 + Chauffeur.Demo/config/Lang/pl-PL.user.xml | 3 + Chauffeur.Demo/config/Lang/pt-BR.user.xml | 3 + Chauffeur.Demo/config/Lang/ru-RU.user.xml | 3 + Chauffeur.Demo/config/Lang/sv-SE.user.xml | 3 + Chauffeur.Demo/config/Lang/zh-CN.user.xml | 3 + Chauffeur.Demo/config/UrlRewriting.config | 31 +- Chauffeur.Demo/config/applications.config | 18 +- Chauffeur.Demo/config/grid.editors.config.js | 109 +--- Chauffeur.Demo/config/log4net.config | 12 +- Chauffeur.Demo/config/tinyMceConfig.config | 485 ++++++++++-------- Chauffeur.Demo/config/trees.config | 35 +- Chauffeur.Demo/config/umbracoSettings.config | 11 +- Chauffeur.Demo/packages.config | 54 +- Chauffeur.Tests/Chauffeur.Tests.csproj | 16 + Chauffeur.Tests/packages.config | 1 + ReleaseNotes.md | 3 + SolutionInfo.cs | 4 +- appveyor.yml | 2 +- 43 files changed, 961 insertions(+), 546 deletions(-) create mode 100644 Chauffeur.Demo/App_Plugins/ModelsBuilder/modelsbuilder.controller.js create mode 100644 Chauffeur.Demo/App_Plugins/ModelsBuilder/modelsbuilder.htm create mode 100644 Chauffeur.Demo/App_Plugins/ModelsBuilder/modelsbuilder.resource.js create mode 100644 Chauffeur.Demo/App_Plugins/ModelsBuilder/package.manifest create mode 100644 Chauffeur.Demo/config/Lang/cs-CZ.user.xml create mode 100644 Chauffeur.Demo/config/Lang/da-DK.user.xml create mode 100644 Chauffeur.Demo/config/Lang/de-DE.user.xml create mode 100644 Chauffeur.Demo/config/Lang/en-GB.user.xml create mode 100644 Chauffeur.Demo/config/Lang/en-US.user.xml create mode 100644 Chauffeur.Demo/config/Lang/es-ES.user.xml create mode 100644 Chauffeur.Demo/config/Lang/fr-FR.user.xml create mode 100644 Chauffeur.Demo/config/Lang/he-IL.user.xml create mode 100644 Chauffeur.Demo/config/Lang/it-IT.user.xml create mode 100644 Chauffeur.Demo/config/Lang/ja-JP.user.xml create mode 100644 Chauffeur.Demo/config/Lang/ko-KR.user.xml create mode 100644 Chauffeur.Demo/config/Lang/nb-NO.user.xml create mode 100644 Chauffeur.Demo/config/Lang/nl-NL.user.xml create mode 100644 Chauffeur.Demo/config/Lang/pl-PL.user.xml create mode 100644 Chauffeur.Demo/config/Lang/pt-BR.user.xml create mode 100644 Chauffeur.Demo/config/Lang/ru-RU.user.xml create mode 100644 Chauffeur.Demo/config/Lang/sv-SE.user.xml create mode 100644 Chauffeur.Demo/config/Lang/zh-CN.user.xml diff --git a/Chauffeur.Demo/App_Plugins/ModelsBuilder/modelsbuilder.controller.js b/Chauffeur.Demo/App_Plugins/ModelsBuilder/modelsbuilder.controller.js new file mode 100644 index 0000000..942b79e --- /dev/null +++ b/Chauffeur.Demo/App_Plugins/ModelsBuilder/modelsbuilder.controller.js @@ -0,0 +1,31 @@ +function modelsBuilderController($scope, umbRequestHelper, $log, $http, modelsBuilderResource) { + + $scope.generate = function() { + $scope.generating = true; + umbRequestHelper.resourcePromise( + $http.post(umbRequestHelper.getApiUrl("modelsBuilderBaseUrl", "BuildModels")), + 'Failed to generate.') + .then(function (result) { + $scope.generating = false; + $scope.dashboard = result; + }); + }; + + $scope.reload = function () { + $scope.ready = false; + modelsBuilderResource.getDashboard().then(function (result) { + $scope.dashboard = result; + $scope.ready = true; + }); + }; + + function init() { + modelsBuilderResource.getDashboard().then(function(result) { + $scope.dashboard = result; + $scope.ready = true; + }); + } + + init(); +} +angular.module("umbraco").controller("Umbraco.Dashboard.ModelsBuilderController", modelsBuilderController); \ No newline at end of file diff --git a/Chauffeur.Demo/App_Plugins/ModelsBuilder/modelsbuilder.htm b/Chauffeur.Demo/App_Plugins/ModelsBuilder/modelsbuilder.htm new file mode 100644 index 0000000..5049e5f --- /dev/null +++ b/Chauffeur.Demo/App_Plugins/ModelsBuilder/modelsbuilder.htm @@ -0,0 +1,41 @@ +
+ +
+ +
+ +

Models Builder

+ +
+ Loading... +
+ +
+
+ +
+

Models are out-of-date. +

+
+ +
+
+

Generating models will restart the application.

+
+
+ +
+
+
+
+
+ +
+ Last generation failed with the following error: + 
{{dashboard.lastError}}
+
+
+ +
diff --git a/Chauffeur.Demo/App_Plugins/ModelsBuilder/modelsbuilder.resource.js b/Chauffeur.Demo/App_Plugins/ModelsBuilder/modelsbuilder.resource.js new file mode 100644 index 0000000..58ca77c --- /dev/null +++ b/Chauffeur.Demo/App_Plugins/ModelsBuilder/modelsbuilder.resource.js @@ -0,0 +1,23 @@ +function modelsBuilderResource($q, $http, umbRequestHelper) { + + return { + getModelsOutOfDateStatus: function () { + return umbRequestHelper.resourcePromise( + $http.get(umbRequestHelper.getApiUrl("modelsBuilderBaseUrl", "GetModelsOutOfDateStatus")), + "Failed to get models out-of-date status"); + }, + + buildModels: function () { + return umbRequestHelper.resourcePromise( + $http.post(umbRequestHelper.getApiUrl("modelsBuilderBaseUrl", "BuildModels")), + "Failed to build models"); + }, + + getDashboard: function () { + return umbRequestHelper.resourcePromise( + $http.get(umbRequestHelper.getApiUrl("modelsBuilderBaseUrl", "GetDashboard")), + "Failed to get dashboard"); + } + }; +} +angular.module("umbraco.resources").factory("modelsBuilderResource", modelsBuilderResource); diff --git a/Chauffeur.Demo/App_Plugins/ModelsBuilder/package.manifest b/Chauffeur.Demo/App_Plugins/ModelsBuilder/package.manifest new file mode 100644 index 0000000..d835235 --- /dev/null +++ b/Chauffeur.Demo/App_Plugins/ModelsBuilder/package.manifest @@ -0,0 +1,7 @@ +{ + //array of files we want to inject into the application on app_start + javascript: [ + '~/App_Plugins/ModelsBuilder/modelsbuilder.controller.js', + '~/App_Plugins/ModelsBuilder/modelsbuilder.resource.js' + ] +} \ No newline at end of file diff --git a/Chauffeur.Demo/Chauffeur.Demo.csproj b/Chauffeur.Demo/Chauffeur.Demo.csproj index 1c3009a..0e76d0b 100644 --- a/Chauffeur.Demo/Chauffeur.Demo.csproj +++ b/Chauffeur.Demo/Chauffeur.Demo.csproj @@ -1,6 +1,6 @@  - + Debug @@ -44,105 +44,161 @@ 4 - - ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll + + ..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.dll + True - - ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll + + ..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll + True - - ..\packages\UmbracoCms.Core.7.2.5\lib\businesslogic.dll + + ..\packages\UmbracoCms.Core.7.5.4\lib\businesslogic.dll True - - ..\packages\ClientDependency.1.8.3.1\lib\net45\ClientDependency.Core.dll + + ..\packages\ClientDependency.1.9.1\lib\net45\ClientDependency.Core.dll True - ..\packages\ClientDependency-Mvc.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll + ..\packages\ClientDependency-Mvc5.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll True - - ..\packages\UmbracoCms.Core.7.2.5\lib\cms.dll + + ..\packages\UmbracoCms.Core.7.5.4\lib\cms.dll True - - ..\packages\UmbracoCms.Core.7.2.5\lib\controls.dll + + ..\packages\UmbracoCms.Core.7.5.4\lib\controls.dll True ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll - - ..\packages\Examine.0.1.63.0\lib\Examine.dll + + ..\packages\Examine.0.1.70.0\lib\Examine.dll True - - ..\packages\HtmlAgilityPack.1.4.6\lib\Net45\HtmlAgilityPack.dll + + ..\packages\HtmlAgilityPack.1.4.9\lib\Net45\HtmlAgilityPack.dll + True ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - - ..\packages\ImageProcessor.1.9.5.0\lib\ImageProcessor.dll + + ..\packages\ImageProcessor.2.4.5.0\lib\net45\ImageProcessor.dll True - - ..\packages\ImageProcessor.Web.3.3.1.0\lib\net45\ImageProcessor.Web.dll + + ..\packages\ImageProcessor.Web.4.6.6.0\lib\net45\ImageProcessor.Web.dll True - - ..\packages\UmbracoCms.Core.7.2.5\lib\interfaces.dll + + ..\packages\UmbracoCms.Core.7.5.4\lib\interfaces.dll True - ..\packages\UmbracoCms.Core.7.2.5\lib\log4net.dll + ..\packages\UmbracoCms.Core.7.5.4\lib\log4net.dll True ..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll + + ..\packages\Markdown.1.14.4\lib\net45\MarkdownSharp.dll + True + - ..\packages\UmbracoCms.Core.7.2.5\lib\Microsoft.ApplicationBlocks.Data.dll + ..\packages\UmbracoCms.Core.7.5.4\lib\Microsoft.ApplicationBlocks.Data.dll + True + + + ..\packages\Microsoft.AspNet.Identity.Core.2.2.1\lib\net45\Microsoft.AspNet.Identity.Core.dll + True + + + ..\packages\Microsoft.AspNet.Identity.Owin.2.2.1\lib\net45\Microsoft.AspNet.Identity.Owin.dll + True + + + ..\packages\Microsoft.CodeAnalysis.Common.1.0.0\lib\net45\Microsoft.CodeAnalysis.dll + True + + + ..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0\lib\net45\Microsoft.CodeAnalysis.CSharp.dll True - + + ..\packages\Microsoft.Owin.3.0.1\lib\net45\Microsoft.Owin.dll + True + + + ..\packages\Microsoft.Owin.Host.SystemWeb.3.0.1\lib\net45\Microsoft.Owin.Host.SystemWeb.dll + True + + + ..\packages\Microsoft.Owin.Security.3.0.1\lib\net45\Microsoft.Owin.Security.dll + True + + + ..\packages\Microsoft.Owin.Security.Cookies.3.0.1\lib\net45\Microsoft.Owin.Security.Cookies.dll True - ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.1\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll + + ..\packages\Microsoft.Owin.Security.OAuth.3.0.1\lib\net45\Microsoft.Owin.Security.OAuth.dll True + + True + ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll - - ..\packages\MySql.Data.6.9.6\lib\net45\MySql.Data.dll + + ..\packages\MySql.Data.6.9.9\lib\net45\MySql.Data.dll True - ..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll + True + + + ..\packages\Owin.1.0\lib\net40\Owin.dll True - - ..\packages\UmbracoCms.Core.7.2.5\lib\SQLCE4Umbraco.dll + + ..\packages\semver.1.1.2\lib\net45\Semver.dll True - - ..\packages\UmbracoCms.Core.7.2.5\lib\System.Data.SqlServerCe.dll + + ..\packages\UmbracoCms.Core.7.5.4\lib\SQLCE4Umbraco.dll True - - ..\packages\UmbracoCms.Core.7.2.5\lib\System.Data.SqlServerCe.Entity.dll + + ..\packages\System.Collections.Immutable.1.1.36\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll + True + + + ..\packages\UmbracoCms.Core.7.5.4\lib\System.Data.SqlServerCe.dll + True + + + ..\packages\UmbracoCms.Core.7.5.4\lib\System.Data.SqlServerCe.Entity.dll True - - ..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll + + ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll + True + + ..\packages\System.Reflection.Metadata.1.0.21\lib\portable-net45+win8\System.Reflection.Metadata.dll + True + @@ -152,37 +208,37 @@ - + + ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll True - ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll - - ..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll + + ..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll True - - ..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll + + ..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.3\lib\net45\System.Web.Http.WebHost.dll True - - ..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll + + ..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll True - + + ..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll True - ..\packages\Microsoft.AspNet.Razor.2.0.20710.0\lib\net40\System.Web.Razor.dll - + + ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll True - ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll - + + ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll True - ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll - + + ..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll True - ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll @@ -192,43 +248,47 @@ - ..\packages\UmbracoCms.Core.7.2.5\lib\TidyNet.dll + ..\packages\UmbracoCms.Core.7.5.4\lib\TidyNet.dll True - - ..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.dll + + ..\packages\UmbracoCms.Core.7.5.4\lib\umbraco.dll True - - ..\packages\UmbracoCms.Core.7.2.5\lib\Umbraco.Core.dll + + ..\packages\UmbracoCms.Core.7.5.4\lib\Umbraco.Core.dll True - - ..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.DataLayer.dll + + ..\packages\UmbracoCms.Core.7.5.4\lib\umbraco.DataLayer.dll True - - ..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.editorControls.dll + + ..\packages\UmbracoCms.Core.7.5.4\lib\umbraco.editorControls.dll True - - ..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.MacroEngines.dll + + ..\packages\UmbracoCms.Core.7.5.4\lib\umbraco.MacroEngines.dll True - - ..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.providers.dll + + ..\packages\Umbraco.ModelsBuilder.3.0.4\lib\Umbraco.ModelsBuilder.dll True - - ..\packages\UmbracoCms.Core.7.2.5\lib\Umbraco.Web.UI.dll + + ..\packages\UmbracoCms.Core.7.5.4\lib\umbraco.providers.dll True - - ..\packages\UmbracoCms.Core.7.2.5\lib\UmbracoExamine.dll + + ..\packages\UmbracoCms.Core.7.5.4\lib\Umbraco.Web.UI.dll True - - ..\packages\UmbracoCms.Core.7.2.5\lib\UrlRewritingNet.UrlRewriter.dll + + ..\packages\UmbracoCms.Core.7.5.4\lib\UmbracoExamine.dll + True + + + ..\packages\UrlRewritingNet.2.0.7\lib\UrlRewritingNet.UrlRewriter.dll True @@ -240,8 +300,9 @@ - + + @@ -260,7 +321,6 @@ - @@ -282,6 +342,10 @@ + + + + 10.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -313,12 +377,13 @@ This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - + + - + + - + - + diff --git a/Chauffeur.Demo/Web.config b/Chauffeur.Demo/Web.config index 4f5c1c2..e0fcd98 100644 --- a/Chauffeur.Demo/Web.config +++ b/Chauffeur.Demo/Web.config @@ -26,7 +26,6 @@ - @@ -52,6 +51,9 @@ + + + @@ -64,8 +66,8 @@ - - + + @@ -79,7 +81,7 @@ - + - - + + @@ -192,7 +302,7 @@ - + @@ -204,6 +314,8 @@ + + @@ -213,6 +325,12 @@ + + + + + + @@ -230,25 +348,20 @@ + + - + - + - - + + - - - - - - - @@ -259,7 +372,39 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -273,5 +418,8 @@ + + + diff --git a/Chauffeur.Demo/config/ClientDependency.config b/Chauffeur.Demo/config/ClientDependency.config index dd49158..b6cd1d5 100644 --- a/Chauffeur.Demo/config/ClientDependency.config +++ b/Chauffeur.Demo/config/ClientDependency.config @@ -10,7 +10,7 @@ NOTES: * Compression/Combination/Minification is not enabled unless debug="false" is specified on the 'compiliation' element in the web.config * A new version will invalidate both client and server cache and create new persisted files --> - + - + - + diff --git a/Chauffeur.Demo/config/Dashboard.config b/Chauffeur.Demo/config/Dashboard.config index 9223d5f..1633b23 100644 --- a/Chauffeur.Demo/config/Dashboard.config +++ b/Chauffeur.Demo/config/Dashboard.config @@ -22,7 +22,7 @@ - +
developer @@ -68,11 +68,6 @@ - - - views/dashboard/ChangePassword.html - -
@@ -85,4 +80,36 @@
+ +
+ + developer + + + + /App_Plugins/ModelsBuilder/modelsbuilder.htm + + +
+ +
+ + developer + + + + views/dashboard/developer/healthcheck.html + + +
+
+ + content + + + + views/dashboard/developer/redirecturls.html + + +
diff --git a/Chauffeur.Demo/config/EmbeddedMedia.config b/Chauffeur.Demo/config/EmbeddedMedia.config index ece2a0b..46f366a 100644 --- a/Chauffeur.Demo/config/EmbeddedMedia.config +++ b/Chauffeur.Demo/config/EmbeddedMedia.config @@ -1,17 +1,11 @@ - + - - - - - - @@ -20,16 +14,54 @@ xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - @@ -67,5 +99,21 @@ - + + + + + + + + + + + + + + + + + diff --git a/Chauffeur.Demo/config/ExamineIndex.config b/Chauffeur.Demo/config/ExamineIndex.config index 4a1b572..67cf3ad 100644 --- a/Chauffeur.Demo/config/ExamineIndex.config +++ b/Chauffeur.Demo/config/ExamineIndex.config @@ -4,14 +4,14 @@ Umbraco examine is an extensible indexer and search engine. This configuration file can be extended to create your own index sets. Index/Search providers can be defined in the UmbracoSettings.config -More information and documentation can be found on CodePlex: http://umbracoexamine.codeplex.com +More information and documentation can be found on GitHub: https://github.com/Shazwazza/Examine/ --> - + - + @@ -24,5 +24,5 @@ More information and documentation can be found on CodePlex: http://umbracoexami - + \ No newline at end of file diff --git a/Chauffeur.Demo/config/ExamineSettings.config b/Chauffeur.Demo/config/ExamineSettings.config index 346fd09..0134beb 100644 --- a/Chauffeur.Demo/config/ExamineSettings.config +++ b/Chauffeur.Demo/config/ExamineSettings.config @@ -4,7 +4,7 @@ Umbraco examine is an extensible indexer and search engine. This configuration file can be extended to add your own search/index providers. Index sets can be defined in the ExamineIndex.config if you're using the standard provider model. -More information and documentation can be found on CodePlex: http://umbracoexamine.codeplex.com +More information and documentation can be found on GitHub: https://github.com/Shazwazza/Examine/ --> diff --git a/Chauffeur.Demo/config/Lang/cs-CZ.user.xml b/Chauffeur.Demo/config/Lang/cs-CZ.user.xml new file mode 100644 index 0000000..d4902d5 --- /dev/null +++ b/Chauffeur.Demo/config/Lang/cs-CZ.user.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/Chauffeur.Demo/config/Lang/da-DK.user.xml b/Chauffeur.Demo/config/Lang/da-DK.user.xml new file mode 100644 index 0000000..7a8ce2c --- /dev/null +++ b/Chauffeur.Demo/config/Lang/da-DK.user.xml @@ -0,0 +1,3 @@ + + + diff --git a/Chauffeur.Demo/config/Lang/de-DE.user.xml b/Chauffeur.Demo/config/Lang/de-DE.user.xml new file mode 100644 index 0000000..7a8ce2c --- /dev/null +++ b/Chauffeur.Demo/config/Lang/de-DE.user.xml @@ -0,0 +1,3 @@ + + + diff --git a/Chauffeur.Demo/config/Lang/en-GB.user.xml b/Chauffeur.Demo/config/Lang/en-GB.user.xml new file mode 100644 index 0000000..7a8ce2c --- /dev/null +++ b/Chauffeur.Demo/config/Lang/en-GB.user.xml @@ -0,0 +1,3 @@ + + + diff --git a/Chauffeur.Demo/config/Lang/en-US.user.xml b/Chauffeur.Demo/config/Lang/en-US.user.xml new file mode 100644 index 0000000..7a8ce2c --- /dev/null +++ b/Chauffeur.Demo/config/Lang/en-US.user.xml @@ -0,0 +1,3 @@ + + + diff --git a/Chauffeur.Demo/config/Lang/es-ES.user.xml b/Chauffeur.Demo/config/Lang/es-ES.user.xml new file mode 100644 index 0000000..7a8ce2c --- /dev/null +++ b/Chauffeur.Demo/config/Lang/es-ES.user.xml @@ -0,0 +1,3 @@ + + + diff --git a/Chauffeur.Demo/config/Lang/fr-FR.user.xml b/Chauffeur.Demo/config/Lang/fr-FR.user.xml new file mode 100644 index 0000000..7a8ce2c --- /dev/null +++ b/Chauffeur.Demo/config/Lang/fr-FR.user.xml @@ -0,0 +1,3 @@ + + + diff --git a/Chauffeur.Demo/config/Lang/he-IL.user.xml b/Chauffeur.Demo/config/Lang/he-IL.user.xml new file mode 100644 index 0000000..3a0ad35 --- /dev/null +++ b/Chauffeur.Demo/config/Lang/he-IL.user.xml @@ -0,0 +1,3 @@ + + + diff --git a/Chauffeur.Demo/config/Lang/it-IT.user.xml b/Chauffeur.Demo/config/Lang/it-IT.user.xml new file mode 100644 index 0000000..3a0ad35 --- /dev/null +++ b/Chauffeur.Demo/config/Lang/it-IT.user.xml @@ -0,0 +1,3 @@ + + + diff --git a/Chauffeur.Demo/config/Lang/ja-JP.user.xml b/Chauffeur.Demo/config/Lang/ja-JP.user.xml new file mode 100644 index 0000000..7a8ce2c --- /dev/null +++ b/Chauffeur.Demo/config/Lang/ja-JP.user.xml @@ -0,0 +1,3 @@ + + + diff --git a/Chauffeur.Demo/config/Lang/ko-KR.user.xml b/Chauffeur.Demo/config/Lang/ko-KR.user.xml new file mode 100644 index 0000000..3a0ad35 --- /dev/null +++ b/Chauffeur.Demo/config/Lang/ko-KR.user.xml @@ -0,0 +1,3 @@ + + + diff --git a/Chauffeur.Demo/config/Lang/nb-NO.user.xml b/Chauffeur.Demo/config/Lang/nb-NO.user.xml new file mode 100644 index 0000000..3a0ad35 --- /dev/null +++ b/Chauffeur.Demo/config/Lang/nb-NO.user.xml @@ -0,0 +1,3 @@ + + + diff --git a/Chauffeur.Demo/config/Lang/nl-NL.user.xml b/Chauffeur.Demo/config/Lang/nl-NL.user.xml new file mode 100644 index 0000000..7a8ce2c --- /dev/null +++ b/Chauffeur.Demo/config/Lang/nl-NL.user.xml @@ -0,0 +1,3 @@ + + + diff --git a/Chauffeur.Demo/config/Lang/pl-PL.user.xml b/Chauffeur.Demo/config/Lang/pl-PL.user.xml new file mode 100644 index 0000000..3a0ad35 --- /dev/null +++ b/Chauffeur.Demo/config/Lang/pl-PL.user.xml @@ -0,0 +1,3 @@ + + + diff --git a/Chauffeur.Demo/config/Lang/pt-BR.user.xml b/Chauffeur.Demo/config/Lang/pt-BR.user.xml new file mode 100644 index 0000000..3a0ad35 --- /dev/null +++ b/Chauffeur.Demo/config/Lang/pt-BR.user.xml @@ -0,0 +1,3 @@ + + + diff --git a/Chauffeur.Demo/config/Lang/ru-RU.user.xml b/Chauffeur.Demo/config/Lang/ru-RU.user.xml new file mode 100644 index 0000000..7a8ce2c --- /dev/null +++ b/Chauffeur.Demo/config/Lang/ru-RU.user.xml @@ -0,0 +1,3 @@ + + + diff --git a/Chauffeur.Demo/config/Lang/sv-SE.user.xml b/Chauffeur.Demo/config/Lang/sv-SE.user.xml new file mode 100644 index 0000000..3a0ad35 --- /dev/null +++ b/Chauffeur.Demo/config/Lang/sv-SE.user.xml @@ -0,0 +1,3 @@ + + + diff --git a/Chauffeur.Demo/config/Lang/zh-CN.user.xml b/Chauffeur.Demo/config/Lang/zh-CN.user.xml new file mode 100644 index 0000000..8d2add9 --- /dev/null +++ b/Chauffeur.Demo/config/Lang/zh-CN.user.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/Chauffeur.Demo/config/UrlRewriting.config b/Chauffeur.Demo/config/UrlRewriting.config index 3c04583..9f32219 100644 --- a/Chauffeur.Demo/config/UrlRewriting.config +++ b/Chauffeur.Demo/config/UrlRewriting.config @@ -2,32 +2,9 @@ + URLRewriting.net is obsolete and will be removed from Umbraco in the future. + If you want to do rewrites, make sure to use IIS URL rewrite: https://www.iis.net/downloads/microsoft/url-rewrite + The advantage of using IIS rewrite is that it is much faster, much less CPU intensive and much less memory intensive. + --> diff --git a/Chauffeur.Demo/config/applications.config b/Chauffeur.Demo/config/applications.config index 1821ac2..7f88f58 100644 --- a/Chauffeur.Demo/config/applications.config +++ b/Chauffeur.Demo/config/applications.config @@ -1,11 +1,11 @@ - + - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/Chauffeur.Demo/config/grid.editors.config.js b/Chauffeur.Demo/config/grid.editors.config.js index 1adb6da..b904920 100644 --- a/Chauffeur.Demo/config/grid.editors.config.js +++ b/Chauffeur.Demo/config/grid.editors.config.js @@ -1,4 +1,4 @@ -[ +[ { "name": "Rich text editor", "alias": "rte", @@ -11,40 +11,6 @@ "view": "media", "icon": "icon-picture" }, - { - "name": "Image wide", - "alias": "media_wide", - "view": "media", - "render": "/App_Plugins/Grid/Editors/Render/media_wide.cshtml", - "icon": "icon-picture" - }, - { - "name": "Image wide cropped", - "alias": "media_wide_cropped", - "view": "media", - "render": "media", - "icon": "icon-picture", - "config": { - "size": { - "width": 1920, - "height": 700 - } - } - }, - { - "name": "Image rounded", - "alias": "media_round", - "view": "media", - "render": "/App_Plugins/Grid/Editors/Render/media_round.cshtml", - "icon": "icon-picture" - }, - { - "name": "Image w/ text right", - "alias": "media_text_right", - "view": "/App_Plugins/Grid/Editors/Views/media_with_description.html", - "render": "/App_Plugins/Grid/Editors/Render/media_text_right.cshtml", - "icon": "icon-picture" - }, { "name": "Macro", "alias": "macro", @@ -55,29 +21,8 @@ "name": "Embed", "alias": "embed", "view": "embed", - "render": "/App_Plugins/Grid/Editors/Render/embed_videowrapper.cshtml", "icon": "icon-movie-alt" }, - { - "name": "Banner Headline", - "alias": "banner_headline", - "view": "textstring", - "icon": "icon-coin", - "config": { - "style": "font-size: 36px; line-height: 45px; font-weight: bold; text-align:center", - "markup": "

#value#

" - } - }, - { - "name": "Banner Tagline", - "alias": "banner_tagline", - "view": "textstring", - "icon": "icon-coin", - "config": { - "style": "font-size: 25px; line-height: 35px; font-weight: normal; text-align:center", - "markup": "

#value#

" - } - }, { "name": "Headline", "alias": "headline", @@ -87,36 +32,6 @@ "style": "font-size: 36px; line-height: 45px; font-weight: bold", "markup": "

#value#

" } - }, - { - "name": "Headline centered", - "alias": "headline_centered", - "view": "textstring", - "icon": "icon-coin", - "config": { - "style": "font-size: 30px; line-height: 45px; font-weight: bold; text-align:center;", - "markup": "

#value#

" - } - }, - { - "name": "Abstract", - "alias": "abstract", - "view": "textstring", - "icon": "icon-coin", - "config": { - "style": "font-size: 16px; line-height: 20px; font-weight: bold;", - "markup": "

#value#

" - } - }, - { - "name": "Paragraph", - "alias": "paragraph", - "view": "textstring", - "icon": "icon-font", - "config": { - "style": "font-size: 16px; line-height: 20px; font-weight: light;", - "markup": "

#value#

" - } }, { "name": "Quote", @@ -124,28 +39,8 @@ "view": "textstring", "icon": "icon-quote", "config": { - "style": "border-left: 3px solid #ccc; padding: 10px; color: #ccc; font-family: serif; font-variant: italic; font-size: 18px", + "style": "border-left: 3px solid #ccc; padding: 10px; color: #ccc; font-family: serif; font-style: italic; font-size: 18px", "markup": "
#value#
" } - }, - { - "name": "Quote with description", - "alias": "quote_D", - "view": "/App_Plugins/Grid/Editors/Views/quote_with_description.html", - "render": "/App_Plugins/Grid/Editors/Render/quote_with_description.cshtml", - "icon": "icon-quote", - "config": { - "style": "border-left: 3px solid #ccc; padding: 10px; color: #ccc; font-family: serif; font-variant: italic; font-size: 18px" - } - }, - { - "name": "Code", - "alias": "code", - "view": "textstring", - "icon": "icon-code", - "config": { - "style": "overflow: auto;padding: 6px 10px;border: 1px solid #ddd;border-radius: 3px;background-color: #f8f8f8;font-size: .9rem;font-family: 'Courier 10 Pitch', Courier, monospace;line-height: 19px;", - "markup": "
#value#
" - } } ] \ No newline at end of file diff --git a/Chauffeur.Demo/config/log4net.config b/Chauffeur.Demo/config/log4net.config index 15d2e0a..da04571 100644 --- a/Chauffeur.Demo/config/log4net.config +++ b/Chauffeur.Demo/config/log4net.config @@ -5,19 +5,23 @@ - - - + + + - + + + + + diff --git a/Chauffeur.Demo/config/tinyMceConfig.config b/Chauffeur.Demo/config/tinyMceConfig.config index 91ffbaa..09cdffb 100644 --- a/Chauffeur.Demo/config/tinyMceConfig.config +++ b/Chauffeur.Demo/config/tinyMceConfig.config @@ -2,216 +2,249 @@ - - - code - images/editor/code.gif - code - 1 - - - removeformat - images/editor/removeformat.gif - removeformat - 2 - - - - Undo - images/editor/undo.gif - undo - 11 - - - Redo - images/editor/redo.gif - redo - 12 - - - Cut - images/editor/cut.gif - cut - 13 - - - Copy - images/editor/copy.gif - copy - 14 - - - - styleselect - images/editor/showStyles.png - styleselect - 20 - - - bold - images/editor/bold.gif - bold - 21 - - - italic - images/editor/italic.gif - italic - 22 - - - Underline - images/editor/underline.gif - underline - 23 - - - Strikethrough - images/editor/strikethrough.gif - strikethrough - 24 - - - - JustifyLeft - images/editor/justifyleft.gif - justifyleft - 31 - - - JustifyCenter - images/editor/justifycenter.gif - justifycenter - 32 - - - JustifyRight - images/editor/justifyright.gif - justifyright - 33 - - - JustifyFull - images/editor/justifyfull.gif - alignjustify - 34 - - - - bullist - images/editor/bullist.gif - bullist - 41 - - - numlist - images/editor/numlist.gif - numlist - 42 - - - Outdent - images/editor/outdent.gif - outdent - 43 - - - Indent - images/editor/indent.gif - indent - 44 - - - - mceLink - images/editor/link.gif - link - 51 - - - unlink - images/editor/unLink.gif - unlink - 52 - - - mceInsertAnchor - images/editor/anchor.gif - anchor - 53 - - - - mceImage - images/editor/image.gif - image - 61 - - - - umbracomacro - images/editor/insMacro.gif - umbracomacro - 62 - - - - - - mceInsertTable - images/editor/table.gif - table - 63 - - - - umbracoembed - images/editor/media.gif - umbracoembed - 66 - - - inserthorizontalrule - images/editor/hr.gif - hr - 71 - - - subscript - images/editor/sub.gif - subscript - 72 - - - - superscript - images/editor/sup.gif - superscript - 73 - - - - mceCharMap - images/editor/charmap.gif - charmap - 74 - - - - - code - paste - umbracolink - anchor - charmap - table + + + code + Code + images/editor/code.gif + code + 1 + + + codemirror + Code mirror + images/editor/code.gif + codemirror + 1 + + + removeformat + Remove format + images/editor/removeformat.gif + removeformat + 2 + + + undo + Undo + Remove Format + images/editor/undo.gif + undo + 11 + + + redo + Redo + images/editor/redo.gif + redo + 12 + + + cut + Cut + images/editor/cut.gif + cut + 13 + + + copy + Copy + images/editor/copy.gif + copy + 14 + + + paste + Paste + images/editor/paste.gif + paste + 15 + + + styleselect + Style select + images/editor/showStyles.png + styleselect + 20 + + + bold + Bold + images/editor/bold.gif + bold + 21 + + + italic + Italic + images/editor/italic.gif + italic + 22 + + + underline + Underline + images/editor/underline.gif + underline + 23 + + + strikethrough + Strikethrough + images/editor/strikethrough.gif + strikethrough + 24 + + + justifyleft + Justify left + images/editor/justifyleft.gif + justifyleft + 31 + + + justifycenter + Justify center + images/editor/justifycenter.gif + justifycenter + 32 + + + justifyright + Justify right + images/editor/justifyright.gif + justifyright + 33 + + + justifyfull + Justify full + images/editor/justifyfull.gif + alignjustify + 34 + + + bullist + Bullet list + images/editor/bullist.gif + bullist + 41 + + + numlist + Numbered list + images/editor/numlist.gif + numlist + 42 + + + outdent + Decrease indent + images/editor/outdent.gif + outdent + 43 + + + indent + Increase indent + images/editor/indent.gif + indent + 44 + + + mceLink + Insert/edit link + images/editor/link.gif + link + 51 + + + unlink + Remove link + images/editor/unLink.gif + unlink + 52 + + + mceInsertAnchor + Anchor + images/editor/anchor.gif + anchor + 53 + + + mceImage + Image + images/editor/image.gif + image + 61 + + + umbracomacro + Macro + images/editor/insMacro.gif + umbracomacro + 62 + + + mceInsertTable + Table + images/editor/table.gif + table + 63 + + + umbracoembed + Embed + images/editor/media.gif + umbracoembed + 66 + + + inserthorizontalrule + Horizontal rule + images/editor/hr.gif + hr + 71 + + + subscript + Subscript + images/editor/sub.gif + subscript + 72 + + + superscript + Superscript + images/editor/sup.gif + superscript + 73 + + + mceCharMap + Character map + images/editor/charmap.gif + charmap + 74 + + + + code + codemirror + paste + umbracolink + anchor + charmap + table lists - - - hr + + + - - font + + font - - - - raw - - { - "indentOnInit": false, - "path": "../../../../../umbraco_client/CodeMirror/Js", - "config": { - }, - "jsFiles": [ - ], - "cssFiles": [ - ] - } - - + + + + raw + + { + "indentOnInit": false, + "path": "../../../../lib/codemirror", + "config": { + }, + "jsFiles": [ + ], + "cssFiles": [ + ] + } + + \ No newline at end of file diff --git a/Chauffeur.Demo/config/trees.config b/Chauffeur.Demo/config/trees.config index a27f1a5..c2df969 100644 --- a/Chauffeur.Demo/config/trees.config +++ b/Chauffeur.Demo/config/trees.config @@ -3,39 +3,46 @@ + + - + + + + - - - - - - - + + + + + - - - - + + + + + - - + + + + + \ No newline at end of file diff --git a/Chauffeur.Demo/config/umbracoSettings.config b/Chauffeur.Demo/config/umbracoSettings.config index 79e394c..3474424 100644 --- a/Chauffeur.Demo/config/umbracoSettings.config +++ b/Chauffeur.Demo/config/umbracoSettings.config @@ -48,7 +48,7 @@ - throw - Throw an exception which can be caught by the global error handler defined in Application_OnError. If no such error handler is defined then you'll see the Yellow Screen Of Death (YSOD) error page. Note the error can also be handled by the umbraco.macro.Error event, where you can log/alarm with your own code and change the behaviour per event. --> - inline + throw ashx,aspx,ascx,config,cshtml,vbhtml,asmx,air,axd,swf,xml,html,htm,svg,php,htaccess @@ -130,7 +130,7 @@ @trySkipIisCustomErrors Tries to skip IIS custom errors. Starting with IIS 7.5, this must be set to true for Umbraco 404 pages to show. Else, IIS will take - over and render its build-in error page. See MS doc for HttpResponseBase.TrySkipIisCustomErrors. + over and render its built-in error page. See MS doc for HttpResponseBase.TrySkipIisCustomErrors. The default value is false, for backward compatibility reasons, which means that IIS _will_ take over, and _prevent_ Umbraco 404 pages to show. @internalRedirectPreservesTemplate @@ -147,10 +147,15 @@ By default you can call any content Id in the url and show the content with that id, for example: http://mysite.com/1092 or http://mysite.com/1092.aspx would render the content with id 1092. Setting this setting to true stops that behavior + @umbracoApplicationUrl + The url of the Umbraco application. By default, Umbraco will figure it out from the first request. + Configure it here if you need anything specific. Needs to be a complete url with scheme and umbraco + path, eg http://mysite.com/umbraco. NOT just "mysite.com" or "mysite.com/umbraco" or "http://mysite.com". --> + internalRedirectPreservesTemplate="false" disableAlternativeTemplates="false" disableFindContentByIdPath="false" + umbracoApplicationUrl=""> diff --git a/Chauffeur.Demo/packages.config b/Chauffeur.Demo/packages.config index abd37f3..6b297be 100644 --- a/Chauffeur.Demo/packages.config +++ b/Chauffeur.Demo/packages.config @@ -1,28 +1,46 @@  - - + + - - - - + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + - - + + + + - - + + + + + + \ No newline at end of file diff --git a/Chauffeur.Tests/Chauffeur.Tests.csproj b/Chauffeur.Tests/Chauffeur.Tests.csproj index 3061440..39b326c 100644 --- a/Chauffeur.Tests/Chauffeur.Tests.csproj +++ b/Chauffeur.Tests/Chauffeur.Tests.csproj @@ -120,9 +120,25 @@ ..\packages\NSubstitute.1.7.2.0\lib\NET45\NSubstitute.dll + + ..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.dll + False + + + ..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll + False + ..\packages\NUnit.2.6.3\lib\nunit.framework.dll + + ..\packages\NUnitTestAdapter.2.0.0\lib\nunit.util.dll + False + + + ..\packages\NUnitTestAdapter.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll + False + ..\packages\UmbracoCms.Core.7.2.5\lib\SQLCE4Umbraco.dll True diff --git a/Chauffeur.Tests/packages.config b/Chauffeur.Tests/packages.config index 9323d73..84adb1d 100644 --- a/Chauffeur.Tests/packages.config +++ b/Chauffeur.Tests/packages.config @@ -23,6 +23,7 @@ + diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 180c3e3..6fd335b 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,3 +1,6 @@ +## New in 0.7.0 (Unreleased) +* Updated to Umbraco 7.5.4 + ## New in 0.6.4 (Released 08/09/2015) * Merging PR #32. Thanks @dinc5150 diff --git a/SolutionInfo.cs b/SolutionInfo.cs index c984a8a..b95ef80 100644 --- a/SolutionInfo.cs +++ b/SolutionInfo.cs @@ -7,7 +7,7 @@ [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("0.6.0.0")] -[assembly: AssemblyFileVersion("0.6.0.0")] +[assembly: AssemblyVersion("0.7.0.0")] +[assembly: AssemblyFileVersion("0.7.0.0")] [assembly: ComVisible(false)] diff --git a/appveyor.yml b/appveyor.yml index dc8d856..d36500c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 0.6.{build} +version: 0.7.{build} test: off build_script: - ps: .\build.ps1