From 83bb4087ca284e7ec6137ae00ff8df74d7c7d76a Mon Sep 17 00:00:00 2001 From: Sebastiaan Janssen Date: Mon, 1 Jun 2015 17:58:24 +0200 Subject: [PATCH] Upgrade to 7.2.5 --- Marketplace/packages.config | 9 +- Marketplace/uProject.csproj | 122 +- Notification/Notification.csproj | 120 +- Notification/packages.config | 9 +- NotificationsWeb/NotificationsWeb.csproj | 118 +- NotificationsWeb/packages.config | 9 +- OurUmbraco.Site/Global.asax | 2 +- OurUmbraco.Site/OurUmbraco.Site.csproj | 114 +- .../Views/Partials/Grid/Bootstrap2.cshtml | 4 +- .../Views/Partials/Grid/Bootstrap3.cshtml | 4 +- OurUmbraco.Site/config/umbracoSettings.config | 17 +- OurUmbraco.Site/packages.config | 9 +- .../umbraco/Install/Views/Index.cshtml | 2 +- .../Templates/Breadcrumb.cshtml | 12 +- .../Templates/Gallery.cshtml | 61 +- .../ListAncestorsFromCurrentPage.cshtml | 20 +- .../ListChildPagesFromChangeableSource.cshtml | 34 +- .../ListChildPagesFromCurrentPage.cshtml | 12 +- .../ListChildPagesOrderedByDate.cshtml | 11 +- .../ListChildPagesOrderedByName.cshtml | 11 +- .../ListChildPagesOrderedByProperty.cshtml | 32 +- .../ListChildPagesWithDoctype.cshtml | 41 +- .../ListDescendantsFromCurrentPage.cshtml | 55 +- .../ListImagesFromMediaFolder.cshtml | 30 +- .../Templates/MultinodeTree-picker.cshtml | 25 +- .../Templates/Navigation.cshtml | 17 +- .../Templates/SiteMap.cshtml | 24 +- .../umbraco/Views/AuthorizeUpgrade.cshtml | 2 +- OurUmbraco.Site/umbraco/Views/Default.cshtml | 6 +- .../Views/common/dialogs/mediapicker.html | 265 ++- .../umbraco/Views/content/edit.html | 42 +- .../umbraco/Views/content/recyclebin.html | 2 +- .../Views/dashboard/ChangePassword.html | 1 - .../dashboard/media/mediafolderbrowser.html | 29 +- .../directives/html/umb-photo-folder.html | 13 +- .../directives/html/umb-upload-dropzone.html | 11 +- .../directives/imaging/umb-image-folder.html | 34 + .../Views/directives/umb-content-name.html | 1 - .../Views/directives/umb-sections.html | 2 +- .../umbraco/Views/install/user.html | 2 +- OurUmbraco.Site/umbraco/Views/media/edit.html | 28 +- .../umbraco/Views/media/recyclebin.html | 2 +- .../changepassword/changepassword.html | 8 +- .../colorpicker/colorpicker.html | 2 + .../contentpicker/contentpicker.html | 2 +- .../Views/propertyeditors/email/email.html | 5 +- .../fileupload/fileupload.html | 5 +- .../folderbrowser/folderbrowser.html | 34 +- .../grid/dialogs/layoutconfig.html | 6 +- .../grid/dialogs/rowconfig.html | 18 +- .../grid/dialogs/rowdeleteconfirm.html | 26 + .../propertyeditors/grid/editors/embed.html | 2 +- .../propertyeditors/grid/editors/error.html | 2 + .../propertyeditors/grid/editors/media.html | 4 +- .../grid/editors/textstring.html | 2 +- .../Views/propertyeditors/grid/grid.html | 52 +- .../imagecropper/imagecropper.html | 4 +- .../propertyeditors/integer/integer.html | 4 +- .../propertyeditors/listview/listview.html | 8 +- .../multipletextbox/multipletextbox.html | 25 +- .../relatedlinks/relatedlinks.html | 34 +- .../Views/propertyeditors/tags/tags.html | 15 +- .../umbraco/assets/css/installer.css | 3 +- .../umbraco/assets/css/umbraco.css | 2 +- OurUmbraco.Site/umbraco/config/lang/cs.xml | 2 +- OurUmbraco.Site/umbraco/config/lang/da.xml | 58 +- OurUmbraco.Site/umbraco/config/lang/de.xml | 4 +- OurUmbraco.Site/umbraco/config/lang/en.xml | 40 +- OurUmbraco.Site/umbraco/config/lang/en_us.xml | 52 +- OurUmbraco.Site/umbraco/config/lang/es.xml | 44 +- OurUmbraco.Site/umbraco/config/lang/nl.xml | 30 + OurUmbraco.Site/umbraco/config/lang/sv.xml | 8 +- .../controls/ContentTypeControlNew.ascx | 6 +- .../umbraco/developer/Packages/installer.aspx | 6 +- .../umbraco/dialogs/AssignDomain2.aspx | 3 +- .../umbraco/dialogs/ChangeDocType.aspx | 9 +- OurUmbraco.Site/umbraco/endPreview.aspx | 36 +- OurUmbraco.Site/umbraco/installer.html | 4 +- .../umbraco/js/canvasdesigner.loader.js | 6 +- .../umbraco/js/canvasdesigner.panel.js | 12 +- OurUmbraco.Site/umbraco/js/init.js | 18 +- OurUmbraco.Site/umbraco/js/install.loader.js | 9 +- OurUmbraco.Site/umbraco/js/loader.js | 16 +- .../umbraco/js/umbraco.controllers.js | 1139 +++++++------ .../umbraco/js/umbraco.directives.js | 795 +++++++-- OurUmbraco.Site/umbraco/js/umbraco.filters.js | 2 +- .../umbraco/js/umbraco.installer.js | 2 +- .../umbraco/js/umbraco.resources.js | 43 +- .../umbraco/js/umbraco.security.js | 2 +- .../umbraco/js/umbraco.services.js | 481 +++--- OurUmbraco.Site/umbraco/js/umbraco.testing.js | 4 +- .../tmhDynamicLocale.min.js | 8 + .../blueimp-load-image/load-image.all.min.js | 1 + .../umbraco/lib/bootstrap/less/forms.less | 2 +- .../jquery.fileupload-angular.js | 427 +++++ .../jquery.fileupload-image.js | 295 ++++ .../jquery.fileupload-process.js | 172 ++ .../jquery-file-upload/jquery.fileupload.js | 1417 +++++++++++++++++ .../jquery-ui/jquery-ui-1.10.4.custom.min.css | 7 + .../umbraco/lib/jquery-ui/jquery-ui.min.js | 12 + .../umbraco/lib/jquery/jquery.min.js | 6 + .../umbraco/lib/jquery/jquery.min.map | 1 + .../umbraco/lib/rgrove-lazyload/lazyload.js | 390 +++++ .../tinymce/plugins/codemirror/source.html | 2 +- .../tinymce/plugins/umbracolink/plugin.min.js | 1 + .../lib/typeahead-js/typeahead.bundle.min.js | 7 + .../umbraco/lib/underscore/underscore-min.js | 7 +- .../umbraco/lib/underscore/underscore-min.map | 1 + OurUmbraco.Site/umbraco/preview/index.html | 6 +- .../umbraco/translation/translationTasks.dtd | 39 + .../umbraco_client/Dialogs/AssignDomain2.js | 13 +- .../umbraco_client/PunyCode/punycode.min.js | 2 + OurUmbraco.Site/web.config | 19 +- our.umbraco.org/our.umbraco.org.csproj | 119 +- our.umbraco.org/packages.config | 9 +- uDocumentation/packages.config | 9 +- uDocumentation/uDocumentation.csproj | 117 +- uEvents/packages.config | 9 +- uEvents/uEvents.csproj | 120 +- uForum/packages.config | 9 +- uForum/uForum.csproj | 118 +- uPowers/packages.config | 9 +- uPowers/uPowers.csproj | 119 +- uRelease/packages.config | 9 +- uRelease/uRelease.csproj | 118 +- uRepo/packages.config | 9 +- uRepo/uRepo.csproj | 115 +- uVersion/packages.config | 9 +- uVersion/uVersion.csproj | 120 +- uWiki/packages.config | 9 +- uWiki/uWiki.csproj | 118 +- 131 files changed, 6170 insertions(+), 2268 deletions(-) create mode 100644 OurUmbraco.Site/umbraco/Views/directives/imaging/umb-image-folder.html create mode 100644 OurUmbraco.Site/umbraco/Views/propertyeditors/grid/dialogs/rowdeleteconfirm.html create mode 100644 OurUmbraco.Site/umbraco/Views/propertyeditors/grid/editors/error.html create mode 100644 OurUmbraco.Site/umbraco/lib/angular-dynamic-locale/tmhDynamicLocale.min.js create mode 100644 OurUmbraco.Site/umbraco/lib/blueimp-load-image/load-image.all.min.js create mode 100644 OurUmbraco.Site/umbraco/lib/jquery-file-upload/jquery.fileupload-angular.js create mode 100644 OurUmbraco.Site/umbraco/lib/jquery-file-upload/jquery.fileupload-image.js create mode 100644 OurUmbraco.Site/umbraco/lib/jquery-file-upload/jquery.fileupload-process.js create mode 100644 OurUmbraco.Site/umbraco/lib/jquery-file-upload/jquery.fileupload.js create mode 100644 OurUmbraco.Site/umbraco/lib/jquery-ui/jquery-ui-1.10.4.custom.min.css create mode 100644 OurUmbraco.Site/umbraco/lib/jquery-ui/jquery-ui.min.js create mode 100644 OurUmbraco.Site/umbraco/lib/jquery/jquery.min.js create mode 100644 OurUmbraco.Site/umbraco/lib/jquery/jquery.min.map create mode 100644 OurUmbraco.Site/umbraco/lib/rgrove-lazyload/lazyload.js create mode 100644 OurUmbraco.Site/umbraco/lib/typeahead-js/typeahead.bundle.min.js create mode 100644 OurUmbraco.Site/umbraco/lib/underscore/underscore-min.map create mode 100644 OurUmbraco.Site/umbraco/translation/translationTasks.dtd create mode 100644 OurUmbraco.Site/umbraco_client/PunyCode/punycode.min.js diff --git a/Marketplace/packages.config b/Marketplace/packages.config index 5893c47c..7aafb6c5 100644 --- a/Marketplace/packages.config +++ b/Marketplace/packages.config @@ -1,9 +1,9 @@  - + - + @@ -16,11 +16,12 @@ + - + - + \ No newline at end of file diff --git a/Marketplace/uProject.csproj b/Marketplace/uProject.csproj index 3c64c0a8..8887530d 100644 --- a/Marketplace/uProject.csproj +++ b/Marketplace/uProject.csproj @@ -56,24 +56,25 @@ False ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll - - False - ..\packages\UmbracoCms.Core.7.2.2\lib\businesslogic.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\businesslogic.dll + True - - ..\packages\ClientDependency.1.8.3\lib\net45\ClientDependency.Core.dll + + ..\packages\ClientDependency.1.8.3.1\lib\net45\ClientDependency.Core.dll + True False ..\packages\ClientDependency-Mvc.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll - - False - ..\packages\UmbracoCms.Core.7.2.2\lib\cms.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\cms.dll + True - - False - ..\packages\UmbracoCms.Core.7.2.2\lib\controls.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\controls.dll + True False @@ -82,9 +83,9 @@ ..\dependencies\Our\Elmah.dll - - False - ..\packages\Examine.0.1.60.2941\lib\Examine.dll + + ..\packages\Examine.0.1.63.0\lib\Examine.dll + True False @@ -102,13 +103,13 @@ False ..\packages\ImageProcessor.Web.3.3.1.0\lib\net45\ImageProcessor.Web.dll - - False - ..\packages\UmbracoCms.Core.7.2.2\lib\interfaces.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\interfaces.dll + True - False - ..\packages\UmbracoCms.Core.7.2.2\lib\log4net.dll + ..\packages\UmbracoCms.Core.7.2.5\lib\log4net.dll + True ..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll @@ -142,8 +143,8 @@ ..\dependencies\MarketPlace\MarketPlace.Webservices.dll - False - ..\packages\UmbracoCms.Core.7.2.2\lib\Microsoft.ApplicationBlocks.Data.dll + ..\packages\UmbracoCms.Core.7.2.5\lib\Microsoft.ApplicationBlocks.Data.dll + True @@ -158,17 +159,17 @@ False ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll - - False - ..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll + + ..\packages\MySql.Data.6.9.6\lib\net45\MySql.Data.dll + True False ..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll - - False - ..\packages\UmbracoCms.Core.7.2.2\lib\SQLCE4Umbraco.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\SQLCE4Umbraco.dll + True @@ -176,12 +177,12 @@ + ..\packages\UmbracoCms.Core.7.2.5\lib\System.Data.SqlServerCe.dll True - ..\packages\UmbracoCms.Core.7.2.2\lib\System.Data.SqlServerCe.dll + ..\packages\UmbracoCms.Core.7.2.5\lib\System.Data.SqlServerCe.Entity.dll True - ..\packages\UmbracoCms.Core.7.2.2\lib\System.Data.SqlServerCe.Entity.dll @@ -234,49 +235,49 @@ - False - ..\packages\UmbracoCms.Core.7.2.2\lib\TidyNet.dll + ..\packages\UmbracoCms.Core.7.2.5\lib\TidyNet.dll + True ..\forigndlls\uForum.dll - - False - ..\packages\UmbracoCms.Core.7.2.2\lib\umbraco.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.dll + True - - False - ..\packages\UmbracoCms.Core.7.2.2\lib\Umbraco.Core.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\Umbraco.Core.dll + True - - False - ..\packages\UmbracoCms.Core.7.2.2\lib\umbraco.DataLayer.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.DataLayer.dll + True ..\dependencies\Our\Umbraco.Ecommerce.dll - - False - ..\packages\UmbracoCms.Core.7.2.2\lib\umbraco.editorControls.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.editorControls.dll + True - - False - ..\packages\UmbracoCms.Core.7.2.2\lib\umbraco.MacroEngines.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.MacroEngines.dll + True - - False - ..\packages\UmbracoCms.Core.7.2.2\lib\umbraco.providers.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.providers.dll + True ..\dependencies\Our\Umbraco.Support.dll - - False - ..\packages\UmbracoCms.Core.7.2.2\lib\Umbraco.Web.UI.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\Umbraco.Web.UI.dll + True - - False - ..\packages\UmbracoCms.Core.7.2.2\lib\UmbracoExamine.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\UmbracoExamine.dll + True ..\dependencies\Our\umbracoMemberControls.dll @@ -285,8 +286,8 @@ ..\forigndlls\uPowers.dll - False - ..\packages\UmbracoCms.Core.7.2.2\lib\UrlRewritingNet.UrlRewriter.dll + ..\packages\UmbracoCms.Core.7.2.5\lib\UrlRewritingNet.UrlRewriter.dll + True ..\forigndlls\uVersion.dll @@ -382,6 +383,13 @@ SettingsSingleFileGenerator Settings.Designer.cs + + + web.config + + + web.config + diff --git a/Notification/Notification.csproj b/Notification/Notification.csproj index a45b8746..0c8e82cc 100644 --- a/Notification/Notification.csproj +++ b/Notification/Notification.csproj @@ -49,33 +49,33 @@ False ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\businesslogic.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\businesslogic.dll + True - - False - ..\packages\ClientDependency.1.8.3\lib\net45\ClientDependency.Core.dll + + ..\packages\ClientDependency.1.8.3.1\lib\net45\ClientDependency.Core.dll + True False ..\packages\ClientDependency-Mvc.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\cms.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\cms.dll + True - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\controls.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\controls.dll + True False ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll - - False - ..\packages\Examine.0.1.60.2941\lib\Examine.dll + + ..\packages\Examine.0.1.63.0\lib\Examine.dll + True False @@ -93,25 +93,21 @@ False ..\packages\ImageProcessor.Web.3.3.1.0\lib\net45\ImageProcessor.Web.dll - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\interfaces.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\interfaces.dll + True - False - ..\packages\UmbracoCms.Core.7.2.1\lib\log4net.dll + ..\packages\UmbracoCms.Core.7.2.5\lib\log4net.dll + True False ..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll - False - ..\packages\UmbracoCms.Core.7.2.1\lib\Microsoft.ApplicationBlocks.Data.dll - - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\Microsoft.Web.Helpers.dll + ..\packages\UmbracoCms.Core.7.2.5\lib\Microsoft.ApplicationBlocks.Data.dll + True True @@ -125,17 +121,17 @@ False ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll - - False - ..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll + + ..\packages\MySql.Data.6.9.6\lib\net45\MySql.Data.dll + True False ..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\SQLCE4Umbraco.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\SQLCE4Umbraco.dll + True @@ -144,12 +140,12 @@ + ..\packages\UmbracoCms.Core.7.2.5\lib\System.Data.SqlServerCe.dll True - ..\packages\UmbracoCms.Core.7.2.1\lib\System.Data.SqlServerCe.dll + ..\packages\UmbracoCms.Core.7.2.5\lib\System.Data.SqlServerCe.Entity.dll True - ..\packages\UmbracoCms.Core.7.2.1\lib\System.Data.SqlServerCe.Entity.dll @@ -192,44 +188,44 @@ - False - ..\packages\UmbracoCms.Core.7.2.1\lib\TidyNet.dll + ..\packages\UmbracoCms.Core.7.2.5\lib\TidyNet.dll + True - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\umbraco.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.dll + True - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\Umbraco.Core.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\Umbraco.Core.dll + True - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\umbraco.DataLayer.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.DataLayer.dll + True - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\umbraco.editorControls.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.editorControls.dll + True - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\umbraco.MacroEngines.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.MacroEngines.dll + True - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\umbraco.providers.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.providers.dll + True - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\Umbraco.Web.UI.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\Umbraco.Web.UI.dll + True - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\UmbracoExamine.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\UmbracoExamine.dll + True - False - ..\packages\UmbracoCms.Core.7.2.1\lib\UrlRewritingNet.UrlRewriter.dll + ..\packages\UmbracoCms.Core.7.2.5\lib\UrlRewritingNet.UrlRewriter.dll + True diff --git a/Notification/packages.config b/Notification/packages.config index 4ada0154..7aafb6c5 100644 --- a/Notification/packages.config +++ b/Notification/packages.config @@ -1,9 +1,9 @@  - + - + @@ -16,11 +16,12 @@ + - + - + \ No newline at end of file diff --git a/NotificationsWeb/NotificationsWeb.csproj b/NotificationsWeb/NotificationsWeb.csproj index 9f56f943..37a3a5c1 100644 --- a/NotificationsWeb/NotificationsWeb.csproj +++ b/NotificationsWeb/NotificationsWeb.csproj @@ -49,31 +49,33 @@ False ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\businesslogic.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\businesslogic.dll + True - - ..\packages\ClientDependency.1.8.3\lib\net45\ClientDependency.Core.dll + + ..\packages\ClientDependency.1.8.3.1\lib\net45\ClientDependency.Core.dll + True False ..\packages\ClientDependency-Mvc.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\cms.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\cms.dll + True - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\controls.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\controls.dll + True False ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll - - ..\packages\Examine.0.1.60.2941\lib\Examine.dll + + ..\packages\Examine.0.1.63.0\lib\Examine.dll + True False @@ -91,25 +93,21 @@ False ..\packages\ImageProcessor.Web.3.3.1.0\lib\net45\ImageProcessor.Web.dll - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\interfaces.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\interfaces.dll + True - False - ..\packages\UmbracoCms.Core.7.2.1\lib\log4net.dll + ..\packages\UmbracoCms.Core.7.2.5\lib\log4net.dll + True False ..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll - False - ..\packages\UmbracoCms.Core.7.2.1\lib\Microsoft.ApplicationBlocks.Data.dll - - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\Microsoft.Web.Helpers.dll + ..\packages\UmbracoCms.Core.7.2.5\lib\Microsoft.ApplicationBlocks.Data.dll + True True @@ -123,28 +121,28 @@ False ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll - - False - ..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll + + ..\packages\MySql.Data.6.9.6\lib\net45\MySql.Data.dll + True False ..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\SQLCE4Umbraco.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\SQLCE4Umbraco.dll + True + ..\packages\UmbracoCms.Core.7.2.5\lib\System.Data.SqlServerCe.dll True - ..\packages\UmbracoCms.Core.7.2.1\lib\System.Data.SqlServerCe.dll + ..\packages\UmbracoCms.Core.7.2.5\lib\System.Data.SqlServerCe.Entity.dll True - ..\packages\UmbracoCms.Core.7.2.1\lib\System.Data.SqlServerCe.Entity.dll @@ -197,44 +195,44 @@ - False - ..\packages\UmbracoCms.Core.7.2.1\lib\TidyNet.dll + ..\packages\UmbracoCms.Core.7.2.5\lib\TidyNet.dll + True - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\umbraco.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.dll + True - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\Umbraco.Core.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\Umbraco.Core.dll + True - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\umbraco.DataLayer.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.DataLayer.dll + True - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\umbraco.editorControls.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.editorControls.dll + True - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\umbraco.MacroEngines.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.MacroEngines.dll + True - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\umbraco.providers.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.providers.dll + True - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\Umbraco.Web.UI.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\Umbraco.Web.UI.dll + True - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\UmbracoExamine.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\UmbracoExamine.dll + True - False - ..\packages\UmbracoCms.Core.7.2.1\lib\UrlRewritingNet.UrlRewriter.dll + ..\packages\UmbracoCms.Core.7.2.5\lib\UrlRewritingNet.UrlRewriter.dll + True diff --git a/NotificationsWeb/packages.config b/NotificationsWeb/packages.config index 4ada0154..7aafb6c5 100644 --- a/NotificationsWeb/packages.config +++ b/NotificationsWeb/packages.config @@ -1,9 +1,9 @@  - + - + @@ -16,11 +16,12 @@ + - + - + \ No newline at end of file diff --git a/OurUmbraco.Site/Global.asax b/OurUmbraco.Site/Global.asax index 3d213eb6..08312748 100644 --- a/OurUmbraco.Site/Global.asax +++ b/OurUmbraco.Site/Global.asax @@ -1 +1 @@ -<%@ Application Codebehind="Global.asax.cs" Inherits="Umbraco.Web.UmbracoApplication" Language="C#" %> +<%@ Application Inherits="Umbraco.Web.UmbracoApplication" Language="C#" %> diff --git a/OurUmbraco.Site/OurUmbraco.Site.csproj b/OurUmbraco.Site/OurUmbraco.Site.csproj index 5372f868..b7f7eb62 100644 --- a/OurUmbraco.Site/OurUmbraco.Site.csproj +++ b/OurUmbraco.Site/OurUmbraco.Site.csproj @@ -51,24 +51,25 @@ False ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\businesslogic.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\businesslogic.dll + True - - ..\packages\ClientDependency.1.8.3\lib\net45\ClientDependency.Core.dll + + ..\packages\ClientDependency.1.8.3.1\lib\net45\ClientDependency.Core.dll + True False ..\packages\ClientDependency-Mvc.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\cms.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\cms.dll + True - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\controls.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\controls.dll + True False @@ -81,8 +82,9 @@ ..\packages\EasyHttp.1.6.29.0\lib\net40\EasyHttp.dll True - - ..\packages\Examine.0.1.60.2941\lib\Examine.dll + + ..\packages\Examine.0.1.63.0\lib\Examine.dll + True ..\dependencies\Our\FergusonMoriyama.ConfigFormRenderer.dll @@ -115,17 +117,17 @@ False ..\packages\ImageProcessor.Web.3.3.1.0\lib\net45\ImageProcessor.Web.dll - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\interfaces.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\interfaces.dll + True False ..\packages\JsonFx.2.0.1209.2802\lib\net40\JsonFx.dll - False - ..\packages\UmbracoCms.Core.7.2.1\lib\log4net.dll + ..\packages\UmbracoCms.Core.7.2.5\lib\log4net.dll + True False @@ -147,8 +149,8 @@ ..\dependencies\MarketPlace\Marketplace.Umbraco.dll - False - ..\packages\UmbracoCms.Core.7.2.1\lib\Microsoft.ApplicationBlocks.Data.dll + ..\packages\UmbracoCms.Core.7.2.5\lib\Microsoft.ApplicationBlocks.Data.dll + True @@ -167,9 +169,9 @@ False ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll - - False - ..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll + + ..\packages\MySql.Data.6.9.6\lib\net45\MySql.Data.dll + True False @@ -190,18 +192,18 @@ False ..\dependencies\Our\SignalR.dll - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\SQLCE4Umbraco.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\SQLCE4Umbraco.dll + True + ..\packages\UmbracoCms.Core.7.2.5\lib\System.Data.SqlServerCe.dll True - ..\packages\UmbracoCms.Core.7.2.1\lib\System.Data.SqlServerCe.dll + ..\packages\UmbracoCms.Core.7.2.5\lib\System.Data.SqlServerCe.Entity.dll True - ..\packages\UmbracoCms.Core.7.2.1\lib\System.Data.SqlServerCe.Entity.dll @@ -256,53 +258,53 @@ - False - ..\packages\UmbracoCms.Core.7.2.1\lib\TidyNet.dll + ..\packages\UmbracoCms.Core.7.2.5\lib\TidyNet.dll + True - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\umbraco.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.dll + True - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\Umbraco.Core.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\Umbraco.Core.dll + True - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\umbraco.DataLayer.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.DataLayer.dll + True ..\dependencies\Our\Umbraco.Ecommerce.dll - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\umbraco.editorControls.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.editorControls.dll + True - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\umbraco.MacroEngines.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.MacroEngines.dll + True ..\dependencies\Our\umbraco.presentation.xslt.Exslt.dll - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\umbraco.providers.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\umbraco.providers.dll + True ..\dependencies\Our\Umbraco.Support.dll - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\Umbraco.Web.UI.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\Umbraco.Web.UI.dll + True - - False - ..\packages\UmbracoCms.Core.7.2.1\lib\UmbracoExamine.dll + + ..\packages\UmbracoCms.Core.7.2.5\lib\UmbracoExamine.dll + True - False - ..\packages\UmbracoCms.Core.7.2.1\lib\UrlRewritingNet.UrlRewriter.dll + ..\packages\UmbracoCms.Core.7.2.5\lib\UrlRewritingNet.UrlRewriter.dll + True ..\packages\YouTrackSharp.2.0.11.0\lib\net40\YouTrackSharp.dll diff --git a/OurUmbraco.Site/Views/Partials/Grid/Bootstrap2.cshtml b/OurUmbraco.Site/Views/Partials/Grid/Bootstrap2.cshtml index 50273483..6bc730e1 100644 --- a/OurUmbraco.Site/Views/Partials/Grid/Bootstrap2.cshtml +++ b/OurUmbraco.Site/Views/Partials/Grid/Bootstrap2.cshtml @@ -65,7 +65,7 @@ if(cfg != null) foreach (JProperty property in cfg.Properties()) { - attrs.Add(property.Name + "='" + property.Value.ToString() + "'"); + attrs.Add(property.Name + "=\"" + property.Value.ToString() + "\""); } JObject style = contentItem.styles; @@ -76,7 +76,7 @@ cssVals.Add(property.Name + ":" + property.Value.ToString() + ";"); if (cssVals.Any()) - attrs.Add("style='" + string.Join(" ", cssVals) + "'"); + attrs.Add("style=\"" + string.Join(" ", cssVals) + "\""); } return new MvcHtmlString(string.Join(" ", attrs)); diff --git a/OurUmbraco.Site/Views/Partials/Grid/Bootstrap3.cshtml b/OurUmbraco.Site/Views/Partials/Grid/Bootstrap3.cshtml index a752042e..f76028d2 100644 --- a/OurUmbraco.Site/Views/Partials/Grid/Bootstrap3.cshtml +++ b/OurUmbraco.Site/Views/Partials/Grid/Bootstrap3.cshtml @@ -65,7 +65,7 @@ if(cfg != null) foreach (JProperty property in cfg.Properties()) { - attrs.Add(property.Name + "='" + property.Value.ToString() + "'"); + attrs.Add(property.Name + "=\"" + property.Value.ToString() + "\""); } JObject style = contentItem.styles; @@ -76,7 +76,7 @@ cssVals.Add(property.Name + ":" + property.Value.ToString() + ";"); if (cssVals.Any()) - attrs.Add("style='" + string.Join(" ", cssVals) + "'"); + attrs.Add("style=\"" + string.Join(" ", cssVals) + "\""); } return new MvcHtmlString(string.Join(" ", attrs)); diff --git a/OurUmbraco.Site/config/umbracoSettings.config b/OurUmbraco.Site/config/umbracoSettings.config index c201b2c5..0afbe3a0 100644 --- a/OurUmbraco.Site/config/umbracoSettings.config +++ b/OurUmbraco.Site/config/umbracoSettings.config @@ -12,6 +12,12 @@ 1 + + internalRedirectPreservesTemplate="false" disableAlternativeTemplates="false" disableFindContentByIdPath="false"> diff --git a/OurUmbraco.Site/packages.config b/OurUmbraco.Site/packages.config index 9ee53488..d753b966 100644 --- a/OurUmbraco.Site/packages.config +++ b/OurUmbraco.Site/packages.config @@ -2,9 +2,9 @@ - + - + @@ -19,14 +19,15 @@ + - + - + \ No newline at end of file diff --git a/OurUmbraco.Site/umbraco/Install/Views/Index.cshtml b/OurUmbraco.Site/umbraco/Install/Views/Index.cshtml index 5673ceff..8171aad9 100644 --- a/OurUmbraco.Site/umbraco/Install/Views/Index.cshtml +++ b/OurUmbraco.Site/umbraco/Install/Views/Index.cshtml @@ -54,7 +54,7 @@ "umbracoBaseUrl": "@ViewBag.UmbracoBaseFolder" }; - + diff --git a/OurUmbraco.Site/umbraco/PartialViewMacros/Templates/Breadcrumb.cshtml b/OurUmbraco.Site/umbraco/PartialViewMacros/Templates/Breadcrumb.cshtml index 29dab7ad..8ba3dce3 100644 --- a/OurUmbraco.Site/umbraco/PartialViewMacros/Templates/Breadcrumb.cshtml +++ b/OurUmbraco.Site/umbraco/PartialViewMacros/Templates/Breadcrumb.cshtml @@ -1,19 +1,21 @@ @inherits Umbraco.Web.Macros.PartialViewMacroPage @* - This snippet makes a breadcrumb of parents using an unordred html list. + This snippet makes a breadcrumb of parents using an unordered html list. How it works: - - It uses the Ancestors() method to get all parents and then generates links so the visitor get go back + - It uses the Ancestors() method to get all parents and then generates links so the visitor can go back - Finally it outputs the name of the current page (without a link) *@ -@if (CurrentPage.Ancestors().Any()) +@{ var selection = CurrentPage.Ancestors(); } + +@if (selection.Any()) {