From 7baca85f6a12e2ade4608dd8aa5738b7ffc39d42 Mon Sep 17 00:00:00 2001 From: Imran Haider Date: Fri, 27 Jul 2018 16:08:38 +0100 Subject: [PATCH 1/2] Update ourumbraco references to https --- .../UmbracoSettings/HelpElement.cs | 2 +- .../Packaging/Models/PackageAction.cs | 2 +- src/Umbraco.Core/Sync/ApplicationUrlHelper.cs | 2 +- .../umbracoSettings.minimal.config | 36 +++++++++--------- .../SqlScripts/SqlCe-SchemaAndData-4110.sql | Bin 422840 -> 422888 bytes .../Importing/ImportResources.Designer.cs | 4 +- .../Importing/StandardMvc-Package.xml | 4 +- .../Importing/TemplateOnly-Package.xml | 2 +- .../TemplateOnly-Updated-Package.xml | 2 +- .../Services/Importing/uBlogsy-Package.xml | 2 +- .../Services/PerformanceTests.cs | 2 +- .../src/common/services/help.service.js | 2 +- .../installer/steps/permissionsreport.html | 2 +- .../src/installer/steps/starterkit.html | 2 +- .../src/views/common/dialogs/help.html | 2 +- .../src/views/common/drawers/help/help.html | 2 +- .../src/views/common/overlays/help/help.html | 2 +- .../developer/developerdashboardintro.html | 6 +-- .../members/membersdashboardintro.html | 2 +- .../Properties/Settings.Designer.cs | 2 +- .../Properties/Settings.settings | 2 +- src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml | 4 +- .../Umbraco/config/lang/zh_tw.xml | 4 +- .../config/umbracoSettings.Release.config | 2 +- src/Umbraco.Web.UI/umbraco/config/lang/da.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/de.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 4 +- .../umbraco/config/lang/en_us.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/es.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/fr.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/he.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/it.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/ja.xml | 2 +- src/Umbraco.Web.UI/umbraco/config/lang/ko.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/nl.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/pl.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/pt.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/ru.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/sv.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/tr.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/zh.xml | 4 +- .../Tree/jquery.tree.contextmenu.js | 2 +- src/Umbraco.Web.UI/web.Template.config | 2 +- src/Umbraco.Web/Install/InstallHelper.cs | 2 +- .../EnsurePublishedContentRequestAttribute.cs | 2 +- src/Umbraco.Web/Properties/Settings.settings | 2 +- .../Properties/Settings1.Designer.cs | 2 +- src/Umbraco.Web/Umbraco.Web.csproj | 4 +- .../org.umbraco.our/Reference.map | 4 +- .../org.umbraco.our/repository.disco | 6 +-- .../org.umbraco.our/repository.wsdl | 8 ++-- src/Umbraco.Web/app.config | 2 +- .../developer/Packages/editPackage.aspx | 2 +- .../umbraco/uQuery/DocumentExtensions.cs | 4 +- .../umbraco/uQuery/NodeExtensions.cs | 8 ++-- .../umbraco/uQuery/uQuery-Nodes.cs | 2 +- .../IntegerDataTypeModel.cs | 2 +- 57 files changed, 106 insertions(+), 106 deletions(-) diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/HelpElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/HelpElement.cs index eb1e452100..6224150c51 100644 --- a/src/Umbraco.Core/Configuration/UmbracoSettings/HelpElement.cs +++ b/src/Umbraco.Core/Configuration/UmbracoSettings/HelpElement.cs @@ -9,7 +9,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings [Obsolete("This is no longer used and will be removed in future versions")] internal class HelpElement : ConfigurationElement, IHelpSection { - [ConfigurationProperty("defaultUrl", DefaultValue = "http://our.umbraco.org/wiki/umbraco-help/{0}/{1}")] + [ConfigurationProperty("defaultUrl", DefaultValue = "https://our.umbraco.org/wiki/umbraco-help/{0}/{1}")] public string DefaultUrl { get { return (string) base["defaultUrl"]; } diff --git a/src/Umbraco.Core/Packaging/Models/PackageAction.cs b/src/Umbraco.Core/Packaging/Models/PackageAction.cs index 58f7de8078..a5fcc75220 100644 --- a/src/Umbraco.Core/Packaging/Models/PackageAction.cs +++ b/src/Umbraco.Core/Packaging/Models/PackageAction.cs @@ -27,7 +27,7 @@ namespace Umbraco.Core.Packaging.Models set { _runAt = value; } } - public bool Undo //NOTE: Should thid default to "False"? but the documentation says default "True" (http://our.umbraco.org/wiki/reference/packaging/package-actions) + public bool Undo //NOTE: Should thid default to "False"? but the documentation says default "True" (https://our.umbraco.org/wiki/reference/packaging/package-actions) { get { return _undo ?? true; } set { _undo = value; } diff --git a/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs b/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs index 57520a3754..bee4351577 100644 --- a/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs +++ b/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs @@ -156,7 +156,7 @@ namespace Umbraco.Core.Sync // otherwise, // if non-standard ports used, // user may need to set umbracoApplicationUrl manually per - // http://our.umbraco.org/documentation/Using-Umbraco/Config-files/umbracoSettings/#ScheduledTasks + // https://our.umbraco.org/documentation/Using-Umbraco/Config-files/umbracoSettings/#ScheduledTasks var port = (request.IsSecureConnection == false && GlobalSettings.UseSSL == false) || (request.IsSecureConnection && GlobalSettings.UseSSL) ? ":" + request.ServerVariables["SERVER_PORT"] diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config index b6ea54d75e..f105e17463 100644 --- a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config +++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config @@ -3,27 +3,27 @@ - + - + - + - + 1 - + robot@umbraco.dk @@ -31,42 +31,42 @@ - - - + Mvc - + - + - + - + - + - + - + - + - + diff --git a/src/Umbraco.Tests/Migrations/SqlScripts/SqlCe-SchemaAndData-4110.sql b/src/Umbraco.Tests/Migrations/SqlScripts/SqlCe-SchemaAndData-4110.sql index ee157be2a7727816291ced4cab1a95fadc67e061..23a8acfd31d0ce6c35c48652dc43e4116f7bf9ed 100644 GIT binary patch delta 345 zcmdn-T=KlQW>|oB^zGfB^4-;eY_K!j=$;>dpJz^|dfPx?us?+CX zvgmE^Sj^-x1Ej2jITb7;#8SL{!x7edP-WTM1^Ss6AnR$^E^?Dejd6Q~8}lqD5_N`5 zV%DmIIfghFP6xU$V!M|&f=z{$opEr-=<`>`{u HpOygt5gLcD delta 402 zcmaFyTyn>A$%YojEle)6rYB@DvrVrMV@cc2BFMtQ1mVwcWLB6yp_|!fdxJ2`2Z-Qy zpdvA5i2RC77N6}C7BhLwfU8g0p4Z9zixJLO*bdaM1yR2pXdVkf>%8qblbF>Qw`aI9 z&vJrmAk_e^I*3+s+&&%X_K59PQY?$yNVUHm==bd_GFhV{NYx3{#d3pj`T|ZizUcy` RtWMJ;SXs9JI>Y*I835nFhB5#E diff --git a/src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs b/src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs index c640d21aa7..46dada5a9b 100644 --- a/src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs +++ b/src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs @@ -313,7 +313,7 @@ namespace Umbraco.Tests.Services.Importing { /// <name>Template-Update</name> /// <version>0.1</version> /// <license url="http://www.opensource.org/licenses/mit-license.php">MIT license</license> - /// <url>http://our.umbraco.org/projects</url> + /// <url>https://our.umbraco.org/projects</url> /// <requirements> /// <major>3</major> /// <minor>0</minor> @@ -339,7 +339,7 @@ namespace Umbraco.Tests.Services.Importing { /// <name>Template-Update</name> /// <version>0.1</version> /// <license url="http://www.opensource.org/licenses/mit-license.php">MIT license</license> - /// <url>http://our.umbraco.org/projects</url> + /// <url>https://our.umbraco.org/projects</url> /// <requirements> /// <major>3</major> /// <minor>0</minor> diff --git a/src/Umbraco.Tests/Services/Importing/StandardMvc-Package.xml b/src/Umbraco.Tests/Services/Importing/StandardMvc-Package.xml index 82cbcc5d84..e6e4708a2e 100644 --- a/src/Umbraco.Tests/Services/Importing/StandardMvc-Package.xml +++ b/src/Umbraco.Tests/Services/Importing/StandardMvc-Package.xml @@ -177,7 +177,7 @@ StandardWebsiteMVC 2.0 MIT license - http://our.umbraco.org/projects/starter-kits/standard-website-mvc + https://our.umbraco.org/projects/starter-kits/standard-website-mvc 3 0 @@ -218,7 +218,7 @@ Google Maps - A map macro that you can use within Rich Text Areas Contact Us -

Contact Us on TwitterWe'd love to hear how this package has helped you and how it can be improved. Get in touch on the project website or via twitter

]]> +

Contact Us on TwitterWe'd love to hear how this package has helped you and how it can be improved. Get in touch on the project website or via twitter

]]>
Standard Website MVC, Company Address, Glasgow, Postcode
diff --git a/src/Umbraco.Tests/Services/Importing/TemplateOnly-Package.xml b/src/Umbraco.Tests/Services/Importing/TemplateOnly-Package.xml index 1f29ffb806..675a5f8483 100644 --- a/src/Umbraco.Tests/Services/Importing/TemplateOnly-Package.xml +++ b/src/Umbraco.Tests/Services/Importing/TemplateOnly-Package.xml @@ -6,7 +6,7 @@ Template-Update 0.1 MIT license - http://our.umbraco.org/projects + https://our.umbraco.org/projects 3 0 diff --git a/src/Umbraco.Tests/Services/Importing/TemplateOnly-Updated-Package.xml b/src/Umbraco.Tests/Services/Importing/TemplateOnly-Updated-Package.xml index 1225b36fa2..1cbd9bb3f3 100644 --- a/src/Umbraco.Tests/Services/Importing/TemplateOnly-Updated-Package.xml +++ b/src/Umbraco.Tests/Services/Importing/TemplateOnly-Updated-Package.xml @@ -6,7 +6,7 @@ Template-Update 0.1 MIT license - http://our.umbraco.org/projects + https://our.umbraco.org/projects 3 0 diff --git a/src/Umbraco.Tests/Services/Importing/uBlogsy-Package.xml b/src/Umbraco.Tests/Services/Importing/uBlogsy-Package.xml index 98e12465f5..86addb351f 100644 --- a/src/Umbraco.Tests/Services/Importing/uBlogsy-Package.xml +++ b/src/Umbraco.Tests/Services/Importing/uBlogsy-Package.xml @@ -332,7 +332,7 @@ uBlogsy 3.0 MIT license - http://our.umbraco.org/projects/starter-kits/ublogsy + https://our.umbraco.org/projects/starter-kits/ublogsy 3 0 diff --git a/src/Umbraco.Tests/Services/PerformanceTests.cs b/src/Umbraco.Tests/Services/PerformanceTests.cs index 69f39392d6..39a3f00bed 100644 --- a/src/Umbraco.Tests/Services/PerformanceTests.cs +++ b/src/Umbraco.Tests/Services/PerformanceTests.cs @@ -314,7 +314,7 @@ namespace Umbraco.Tests.Services Umbraco Development

UmbracoUmbraco the the leading ASP.NET open source CMS, under pinning over 150,000 websites. Our Certified Developers are experts in developing high performance and feature rich websites.

]]> Contact Us -

Contact Us on TwitterWe'd love to hear how this package has helped you and how it can be improved. Get in touch on the project website or via twitter

]]> +

Contact Us on TwitterWe'd love to hear how this package has helped you and how it can be improved. Get in touch on the project website or via twitter

]]>
Standard Website MVC, Company Address, Glasgow, Postcode
Copyright &copy; 2012 Your Company diff --git a/src/Umbraco.Web.UI.Client/src/common/services/help.service.js b/src/Umbraco.Web.UI.Client/src/common/services/help.service.js index 77621eee9c..bad1fa4e49 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/help.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/help.service.js @@ -2,7 +2,7 @@ angular.module('umbraco.services') .factory('helpService', function ($http, $q, umbRequestHelper) { var helpTopics = {}; - var defaultUrl = "http://our.umbraco.org/rss/help"; + var defaultUrl = "https://our.umbraco.org/rss/help"; var tvUrl = "http://umbraco.tv/feeds/help"; function getCachedHelp(url){ diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/permissionsreport.html b/src/Umbraco.Web.UI.Client/src/installer/steps/permissionsreport.html index 3ced6ed678..266f360394 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/steps/permissionsreport.html +++ b/src/Umbraco.Web.UI.Client/src/installer/steps/permissionsreport.html @@ -3,7 +3,7 @@

In order to run umbraco, you'll need to update your permission settings. Detailed information about the correct file & folder permissions for Umbraco can be found - here. + here.

The following report list the permissions that are currently failing. Once the permissions are fixed press the 'Go back' button to restart the installation. diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html b/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html index 0b9e22a0f3..2f76de5525 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html +++ b/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html @@ -12,7 +12,7 @@

  • Loading... - {{pck.name}} + {{pck.name}}
    • diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html index b9428fb242..a6d3827343 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html @@ -22,7 +22,7 @@
    • - + go to our.umbraco.org The friendliest community diff --git a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html index 7fb25df0d5..e387ef48b7 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html @@ -103,7 +103,7 @@ - +
      Visit our.umbraco.org
      diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/help/help.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/help/help.html index ecfdd24828..3d90d86971 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/help/help.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/help/help.html @@ -15,7 +15,7 @@
      • - + go to our.umbraco.org diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardintro.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardintro.html index 9b7f1433e3..5f2b4e1873 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardintro.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardintro.html @@ -5,9 +5,9 @@

        Find out more:

          -
        • Find the answers to your Umbraco questions on our Community Wiki
          • -
        • Ask a question in the Community Forum
          • -
        • Find an add-on package to help you get going quickly
          • +
        • Find the answers to your Umbraco questions on our Community Wiki
          • +
        • Ask a question in the Community Forum
          • +
        • Find an add-on package to help you get going quickly
        • Watch our tutorial videos (some are free, some require a subscription)
        • Find out about our productivity boosting tools and commercial support
        • Find out about real-life training and certification opportunities
          • diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardintro.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardintro.html index d42d3ebf7c..8754a30837 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardintro.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardintro.html @@ -6,5 +6,5 @@

          More about members

          diff --git a/src/Umbraco.Web.UI/Properties/Settings.Designer.cs b/src/Umbraco.Web.UI/Properties/Settings.Designer.cs index 11dc1e00c3..76e52a80c2 100644 --- a/src/Umbraco.Web.UI/Properties/Settings.Designer.cs +++ b/src/Umbraco.Web.UI/Properties/Settings.Designer.cs @@ -25,7 +25,7 @@ namespace Umbraco.Web.UI.Properties { [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("http://our.umbraco.org/umbraco/webservices/api/repository.asmx")] + [global::System.Configuration.DefaultSettingValueAttribute("https://our.umbraco.org/umbraco/webservices/api/repository.asmx")] public string Umbraco_Web_UI_org_umbraco_our_Repository { get { return ((string)(this["Umbraco_Web_UI_org_umbraco_our_Repository"])); diff --git a/src/Umbraco.Web.UI/Properties/Settings.settings b/src/Umbraco.Web.UI/Properties/Settings.settings index 5df40e9fea..cd6d9aa4a7 100644 --- a/src/Umbraco.Web.UI/Properties/Settings.settings +++ b/src/Umbraco.Web.UI/Properties/Settings.settings @@ -3,7 +3,7 @@ - http://our.umbraco.org/umbraco/webservices/api/repository.asmx + https://our.umbraco.org/umbraco/webservices/api/repository.asmx \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml index ce0975b780..f79805f9a2 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml @@ -2,7 +2,7 @@ The Umbraco community - http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files Angi domene @@ -469,7 +469,7 @@ Databasekonfigurasjon installer-knappen for å installere Umbraco %0% databasen]]> Neste for å fortsette.]]> - Databasen ble ikke funnet! Vennligst sjekk at informasjonen i "connection string" i "web.config"-filen er korrekt.

          For å fortsette, vennligst rediger "web.config"-filen (bruk Visual Studio eller din favoritteditor), rull ned til bunnen, og legg til tilkoblingsstrengen for din database i nøkkelen "umbracoDbDSN" og lagre filen.

          Klikk prøv på nytt når du er ferdig.
          Mer informasjon om redigering av web.config her.

          ]]>           + Databasen ble ikke funnet! Vennligst sjekk at informasjonen i "connection string" i "web.config"-filen er korrekt.

          For å fortsette, vennligst rediger "web.config"-filen (bruk Visual Studio eller din favoritteditor), rull ned til bunnen, og legg til tilkoblingsstrengen for din database i nøkkelen "umbracoDbDSN" og lagre filen.

          Klikk prøv på nytt når du er ferdig.
          Mer informasjon om redigering av web.config her.

          ]]>           Vennligst kontakt din ISP om nødvendig. Hvis du installerer på en lokal maskin eller server, må du kanskje skaffe informasjonen fra din systemadministrator.]]> Trykk på knappen oppgrader for å oppgradere databasen din til Umbraco %0%

          Ikke vær urolig - intet innhold vil bli slettet og alt vil fortsette å virke etterpå!

          ]]>           Trykk Neste for å fortsette.]]> diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml index b1997a1c0a..432929c613 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml @@ -2,7 +2,7 @@ The Umbraco community - http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files 管理主機名稱 @@ -553,7 +553,7 @@

          請編輯檔案"web.config" (例如使用Visual Studio或您喜歡的編輯器)，移動到檔案底部，並在名稱為"UmbracoDbDSN"的字串中設定資料庫連結資訊，並存檔。

          點選重試按鈕當上述步驟完成。
          - + 在此查詢更多編輯web.config的資訊。

          ]]> 若需要時，請聯繫您的網路公司。如果您在本地機器或伺服器安裝的話，您也許需要聯絡系統管理者。]]> diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config index 8fc637a1d8..3a445574af 100644 --- a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config +++ b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config @@ -3,7 +3,7 @@ diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml index 90a8d574f4..b23b537c86 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml @@ -2,7 +2,7 @@ The Umbraco community - http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files Tilføj domæne @@ -705,7 +705,7 @@ Næste for at fortsætte.]]> Databasen er ikke fundet. Kontrollér venligst at informationen i database forbindelsesstrengen i "web.config" filen er korrekt.

          -

          For at fortsætte bedes du venligst rette "web.config" filen (ved at bruge Visual Studio eller dit favoritprogram), scroll til bunden, tilføj forbindelsesstrengen til din database i feltet som hedder "umbracoDbDSN" og gem filen.

          Klik på Forsøg igen knappen når du er færdig.
          Mere information om at redigere web.config her.

          ]]> +

          For at fortsætte bedes du venligst rette "web.config" filen (ved at bruge Visual Studio eller dit favoritprogram), scroll til bunden, tilføj forbindelsesstrengen til din database i feltet som hedder "umbracoDbDSN" og gem filen.

          Klik på Forsøg igen knappen når du er færdig.
          Mere information om at redigere web.config her.

          ]]>           Kontakt venligst din ISP hvis det er nødvendigt. Hvis du installerer på en lokal maskine eller server kan du muligvis få informationerne fra din systemadministrator.]]> Tryk på Opgradér knappen for at opgradere din database til Umbraco %0%

          Bare rolig - intet indhold vil blive slettet og alt vil stadig fungere bagefter!

          ]]>           diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml index d82662cfae..133f50b862 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml @@ -2,7 +2,7 @@ The Umbraco community - http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files Hostnamen verwalten @@ -465,7 +465,7 @@ Die Datenbank wurde für Umbraco %0% konfiguriert. Klicken Sie auf <strong>weiter</strong>, um fortzufahren. <p>Die angegebene Datenbank ist leider nicht erreichbar. Bitte prüfen Sie die Verbindungszeichenfolge ("Connection String") in der "web.config"-Datei.</p> <p>Um fortzufahren, passen Sie bitte die "web.config"-Datei mit einem beliebigen Text-Editor an. Scrollen Sie dazu nach unten, fügen Sie die Verbindungszeichenfolge für die zuverbindende Datenbank als Eintrag "UmbracoDbDSN" hinzu und speichern Sie die Datei.</p> -<p>Klicken Sie nach erfolgter Anpassung auf <strong>Wiederholen</strong>.<br />Wenn Sie weitere technische Informationen benötigen, besuchen Sie <a href="http://our.Umbraco.org/wiki" target="_blank">The Umbraco documentation wiki</a>.</p> +<p>Klicken Sie nach erfolgter Anpassung auf <strong>Wiederholen</strong>.<br />Wenn Sie weitere technische Informationen benötigen, besuchen Sie <a href="https://our.umbraco.org/wiki" target="_blank">The Umbraco documentation wiki</a>.</p> Um diesen Schritt abzuschließen, müssen Sie die notwendigen Informationen zur Datenbankverbindung angeben.<br />Bitte kontaktieren Sie Ihren Provider bzw. Server-Administrator für weitere Informationen. diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index 0d24970c54..02e6af666a 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -2,7 +2,7 @@ The Umbraco community - http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files Culture and Hostnames @@ -757,7 +757,7 @@

          To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "UmbracoDbDSN" and save the file.

          Click the retry button when - done.
          + done.
           More information on editing web.config here.

          ]]>           diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml index cbb86697c8..228d46ee05 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml @@ -2,7 +2,7 @@ The Umbraco community - http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files Culture and Hostnames @@ -755,7 +755,7 @@

          To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "UmbracoDbDSN" and save the file.

          Click the retry button when - done.
          + done.
           More information on editing web.config here.

          ]]>           diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml index cf44e6e955..ee8356c826 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml @@ -2,7 +2,7 @@ The Umbraco community - http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files Administrar hostnames @@ -698,7 +698,7 @@ Configuración de la base de datos instalar para instalar %0% la base de datos de Umbraco]]> Próximo para continuar]]> - ¡No se ha encontrado ninguna base de datos! Mira si la información en la "connection string" del “web.config” es correcta.

          Para continuar, edite el "web.config" (bien sea usando Visual Studio o su editor de texto preferido), vaya al final del archivo y añada la cadena de conexión para la base de datos con el nombre (key) "umbracoDbDSN" y guarde el archivo.

          Pinche en reintentar cuando haya terminado.
          Pinche aquí para mayor información de como editar el web.config (en inglés)

          ]]>           + ¡No se ha encontrado ninguna base de datos! Mira si la información en la "connection string" del “web.config” es correcta.

          Para continuar, edite el "web.config" (bien sea usando Visual Studio o su editor de texto preferido), vaya al final del archivo y añada la cadena de conexión para la base de datos con el nombre (key) "umbracoDbDSN" y guarde el archivo.

          Pinche en reintentar cuando haya terminado.
          Pinche aquí para mayor información de como editar el web.config (en inglés)

          ]]>           Por favor, contacta con tu ISP si es necesario. Si estás realizando la instalación en una máquina o servidor local, quizás necesites información de tu administrador de sistemas.]]> Pinche en actualizar para actualizar la base de datos a Umbraco %0%

          Ningún contenido será borrado de la base de datos y seguirá funcionando después de la actualización

          ]]>           Pinche en Próximo para continuar. ]]> diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml index 37c22b1a44..4e725d35b0 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml @@ -2,7 +2,7 @@ The Umbraco community - http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files Culture et noms d'hôte @@ -754,7 +754,7 @@

          Pour poursuivre, veuillez éditer le fichier "web.config" (avec Visual Studio ou votre éditeur de texte favori), scroller jusqu'en bas, ajouter le "connection string" pour votre base de données dans la ligne avec la clé "umbracoDbDSN" et sauvegarder le fichier.

          Cliquez sur le bouton Réessayer lorsque cela est fait. -
          +
          Plus d'informations sur l'édition du fichier web.config ici.

          ]]>           diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml index 686ac9f837..5ceca5d2fe 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml @@ -2,7 +2,7 @@ The Umbraco community - http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files נהל שמות מתחם @@ -383,7 +383,7 @@

          To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "UmbracoDbDSN" and save the file.

          Click the retry button when - done.
          + done.
           More information on editing web.config here.

          ]]>           Please contact your ISP if necessary. diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml index f7a32fbd69..7fdb37fc98 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml @@ -2,7 +2,7 @@ The Umbraco community - http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files Gestisci hostnames @@ -381,7 +381,7 @@ Avanti per proseguire.]]> Database non trovato! Perfavore, controlla che le informazioni della stringa di connessione nel file "web.config" siano corrette.

          -

          Per procedere, edita il file "web.config" (utilizzando Visual Studio o l'editor di testo che preferisci), scorri in basso, aggiungi la stringa di connessione per il database chiamato "umbracoDbDSN" e salva il file.

          Clicca il tasto riprova quando hai finito.
          Maggiori dettagli per la modifica del file web.config qui.

          ]]> +

          Per procedere, edita il file "web.config" (utilizzando Visual Studio o l'editor di testo che preferisci), scorri in basso, aggiungi la stringa di connessione per il database chiamato "umbracoDbDSN" e salva il file.

          Clicca il tasto riprova quando hai finito.
          Maggiori dettagli per la modifica del file web.config qui.

          ]]>           Premi il tasto aggiorna per aggiornare il database ad Umbraco %0%

          Non preoccuparti, il contenuto non verrà perso e tutto continuerà a funzionare dopo l'aggiornamento!

          ]]>           diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml index fb5918db81..d7282c906c 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml @@ -2,7 +2,7 @@ The Umbraco community - http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files ドメインの割り当て diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml index 01c2704178..33be0b5e46 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml @@ -2,7 +2,7 @@ The Umbraco community - http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files 호스트명 관리 @@ -378,7 +378,7 @@ 데이터베이스를 찾을 수 없습니다. “web.config”파일의 "connection string"이 바르게 설정되었는지 확인하세요.

          "web.config" 파일에 맨아래에 ,키네임을 "UmbracoDbDSN"로 하여 사용하시는 데이터베이스의 connection string 정보를 입력하시고 파일을 저장하세요.

          - 완료 후재시도버튼을 누르세요.
          + 완료 후재시도버튼을 누르세요.
           web.config의 더많은 정보는 여기에 있습니다.

          ]]>           필요하시다면 사용하시는 ISP쪽에 문의하시기 바랍니다.. diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml index e271a11fe7..84502139c3 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml @@ -2,7 +2,7 @@ The Umbraco community - http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files Beheer domeinnamen @@ -586,7 +586,7 @@ Database configuratie installeren om de Umbraco %0% database te installeren]]> Volgende om door te gaan.]]> - De database kon niet gevonden worden! Gelieve na te kijken of de informatie in de "connection string" van het "web.config" bestand correct is.

          Om door te gaan, gelieve het "web.config" bestand aan te passen (met behulp van Visual Studio of je favoriete tekstverwerker), scroll in het bestand naar beneden, voeg de connection string voor je database toe in de key met naam "umbracoDbDSN" en sla het bestand op.

          Klik op de knop opnieuw proberen als je hiermee klaar bent.
          Meer informatie over het aanpassen van de web.config vind je hier.

          ]]>           + De database kon niet gevonden worden! Gelieve na te kijken of de informatie in de "connection string" van het "web.config" bestand correct is.

          Om door te gaan, gelieve het "web.config" bestand aan te passen (met behulp van Visual Studio of je favoriete tekstverwerker), scroll in het bestand naar beneden, voeg de connection string voor je database toe in de key met naam "umbracoDbDSN" en sla het bestand op.

          Klik op de knop opnieuw proberen als je hiermee klaar bent.
          Meer informatie over het aanpassen van de web.config vind je hier.

          ]]>           Gelieve contact op te nemen met je ISP indien nodig. Wanneer je installeert op een lokale computer of server, dan heb je waarschijnlijk informatie nodig van je systeembeheerder.]]> Klik de upgrade knop om je database te upgraden naar Umbraco %0%

          Maak je geen zorgen - er zal geen inhoud worden gewist en alles blijft gewoon werken!

          ]]>           Klik Volgende om verder te gaan.]]> diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml index d47b06d10e..93c825315b 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml @@ -2,7 +2,7 @@ The Umbraco community - http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files Zarządzanie hostami @@ -688,7 +688,7 @@ Naciśnij przycisk instaluj, aby zainstalować bazę danych Umb

          Aby kontynuować, dokonaj edycji pliku "web.config" (używając Visual Studio lub dowolnego edytora tekstu), przemieść kursor na koniec pliku, dodaj parametry połączenia do Twojej bazy danych w kluczu o nazwie "umbracoDbDSN" i zapisz plik.

          Kliknij ponów próbę kiedy - skończysz.
          + skończysz.
           Tu znajdziesz więcej informacji na temat edycji pliku "web.config".

          ]]>           Skontaktuj się z Twoim dostawą usług internetowych jeśli zajdzie taka potrzeba. diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml index 1ffa74f87f..0bc6748cd8 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml @@ -2,7 +2,7 @@ The Umbraco community - http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files Gerenciar hostnames @@ -374,7 +374,7 @@ Próximo para prosseguir.]]> Banco de dados não encontrado! Favor checar se a informação no "connection string" do "web.config" esteja correta.

          Para prosseguir, favor editar o arquivo "web.config" (usando Visual Studio ou seu editor de texto favorito), role até embaixo, adicione a connection string para seu banco de dados com a chave de nome "UmbracoDbDSN" e salve o arquivo

          -

          Clique o botão tentar novamente quando terminar.
          +

          Clique o botão tentar novamente quando terminar.
          Mais informações em como editar o web.config aqui.

          ]]>           Favor contatar seu provedor de internet ou hospedagem web se necessário. Se você estiver instalando em uma máquina ou servidor local é possível que você precise dessas informações por um administrador de sistema.]]> diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml index c18dada042..d6cb71cd97 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml @@ -2,7 +2,7 @@ The Umbraco community - http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files Языки и домены @@ -897,7 +897,7 @@

          Для настройки откройте файл "web.config" с помощью любого текстового редактора и добавьте нужную информацию в строку подключения (параметр "UmbracoDbDSN"), затем сохраните файл.

          Нажмите кнопку "Повторить" когда все будет готово
          - Более подробно о внесении изменений в файл "web.config" рассказано здесь.

          ]]>           diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml index fa59b36a26..2a414c1303 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml @@ -2,7 +2,7 @@ The Umbraco community - http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files Hantera domännamn @@ -456,7 +456,7 @@ Databaskonfiguration installera]]> Nästa för att fortsätta.]]> - Databasen kunde inte hittas! Kontrollera att informationen i databasanslutnings-inställningarna i filen "web.config" är rätt.

          För att fortsätta måste du redigera filen "web.config" (du kan använda Visual Studio eller din favorit text-redigerare), bläddra till slutet, lägg till databasanslutnings-inställningarna för din databas i fältet som heter "umbracoDbDSN" och spara filen.

          Klicka på Försök igen knappen när du är klar.
          > Mer information om att redigera web.config hittar du här.

          ]]>           + Databasen kunde inte hittas! Kontrollera att informationen i databasanslutnings-inställningarna i filen "web.config" är rätt.

          För att fortsätta måste du redigera filen "web.config" (du kan använda Visual Studio eller din favorit text-redigerare), bläddra till slutet, lägg till databasanslutnings-inställningarna för din databas i fältet som heter "umbracoDbDSN" och spara filen.

          Klicka på Försök igen knappen när du är klar.
          > Mer information om att redigera web.config hittar du här.

          ]]>           Eventuellt kan du behöva kontakta ditt webb-hotell. Om du installerar på en lokal maskin eller server kan du få informationen från din systemadministratör.]]> Tryck Uppgradera knappen för att uppgradera din databas till Umbraco %0%

          Du behöver inte vara orolig. Inget innehåll kommer att raderas och efteråt kommer allt att fungera som vanligt!

          ]]>           Tryck Nästa för att fortsätta.]]> diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/tr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/tr.xml index fe40a16d41..6c461c909d 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/tr.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/tr.xml @@ -2,7 +2,7 @@ The Umbraco community - http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files Kültür ve Hostnames @@ -456,7 +456,7 @@

          Tekrar dene.
          - + Burada düzenleme web.config Hakkında Daha Fazla Bilgi.

          ]]>           diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml index da2c1e3159..9f21e04b9a 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml @@ -2,7 +2,7 @@ 黄仁祥(wanddy@163.com) - http://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files 管理主机名 @@ -613,7 +613,7 @@ 数据库未找到！请检查数据库连接串设置。

          您可以自行编辑“web.config”文件，键名为 “UmbracoDbDSN”

          - 当自行编辑后，单击重试按钮
          。 + 当自行编辑后，单击重试按钮
          。 如何编辑web.config

          ]]>           diff --git a/src/Umbraco.Web.UI/umbraco_client/Tree/jquery.tree.contextmenu.js b/src/Umbraco.Web.UI/umbraco_client/Tree/jquery.tree.contextmenu.js index b1b476aa59..32a3e81f8c 100644 --- a/src/Umbraco.Web.UI/umbraco_client/Tree/jquery.tree.contextmenu.js +++ b/src/Umbraco.Web.UI/umbraco_client/Tree/jquery.tree.contextmenu.js @@ -48,7 +48,7 @@ if (opts.items[i].separator_before === true) str += "
        •  
          • "; str += '
        • '; - // updated from patch by Matt Brailsford (http://our.umbraco.org/forum/using/ui-questions/6225-Custom-icon-in-Context-menu#comment39514) + // updated from patch by Matt Brailsford (https://our.umbraco.org/forum/using/ui-questions/6225-Custom-icon-in-Context-menu#comment39514) str += " "; str += ""; if (opts.items[i].icon && opts.items[i].icon.indexOf("/") >= 0) { str += "
          " + opts.items[i].label + "
          "; diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config index 608fda2190..7343934292 100644 --- a/src/Umbraco.Web.UI/web.Template.config +++ b/src/Umbraco.Web.UI/web.Template.config @@ -39,7 +39,7 @@ diff --git a/src/Umbraco.Web/Install/InstallHelper.cs b/src/Umbraco.Web/Install/InstallHelper.cs index b2c3d1213d..269a1c64c4 100644 --- a/src/Umbraco.Web/Install/InstallHelper.cs +++ b/src/Umbraco.Web/Install/InstallHelper.cs @@ -195,7 +195,7 @@ namespace Umbraco.Web.Install try { - var requestUri = string.Format("http://our.umbraco.org/webapi/StarterKit/Get/?umbracoVersion={0}", + var requestUri = string.Format("https://our.umbraco.org/webapi/StarterKit/Get/?umbracoVersion={0}", UmbracoVersion.Current); using (var request = new HttpRequestMessage(HttpMethod.Get, requestUri)) diff --git a/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs b/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs index 463afe1900..a29b9e10ec 100644 --- a/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs +++ b/src/Umbraco.Web/Mvc/EnsurePublishedContentRequestAttribute.cs @@ -15,7 +15,7 @@ namespace Umbraco.Web.Mvc /// /// /// This is inspired from this discussion: - /// http://our.umbraco.org/forum/developers/extending-umbraco/41367-Umbraco-6-MVC-Custom-MVC-Route?p=3 + /// https://our.umbraco.org/forum/developers/extending-umbraco/41367-Umbraco-6-MVC-Custom-MVC-Route?p=3 /// /// which is based on custom routing found here: /// http://shazwazza.com/post/Custom-MVC-routing-in-Umbraco diff --git a/src/Umbraco.Web/Properties/Settings.settings b/src/Umbraco.Web/Properties/Settings.settings index 21c75952fe..cfdc5dd871 100644 --- a/src/Umbraco.Web/Properties/Settings.settings +++ b/src/Umbraco.Web/Properties/Settings.settings @@ -12,7 +12,7 @@ Somthing - http://our.umbraco.org/umbraco/webservices/api/repository.asmx + https://our.umbraco.org/umbraco/webservices/api/repository.asmx \ No newline at end of file diff --git a/src/Umbraco.Web/Properties/Settings1.Designer.cs b/src/Umbraco.Web/Properties/Settings1.Designer.cs index 1b72efc115..63b5429a0e 100644 --- a/src/Umbraco.Web/Properties/Settings1.Designer.cs +++ b/src/Umbraco.Web/Properties/Settings1.Designer.cs @@ -54,7 +54,7 @@ namespace Umbraco.Web.Properties { [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)] - [global::System.Configuration.DefaultSettingValueAttribute("http://our.umbraco.org/umbraco/webservices/api/repository.asmx")] + [global::System.Configuration.DefaultSettingValueAttribute("https://our.umbraco.org/umbraco/webservices/api/repository.asmx")] public string umbraco_org_umbraco_our_Repository { get { return ((string)(this["umbraco_org_umbraco_our_Repository"])); diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj index 019ccb5084..0f706be21d 100644 --- a/src/Umbraco.Web/Umbraco.Web.csproj +++ b/src/Umbraco.Web/Umbraco.Web.csproj @@ -1990,10 +1990,10 @@ - + Dynamic Web References\org.umbraco.our\ - http://our.umbraco.org/umbraco/webservices/api/repository.asmx + https://our.umbraco.org/umbraco/webservices/api/repository.asmx diff --git a/src/Umbraco.Web/Web References/org.umbraco.our/Reference.map b/src/Umbraco.Web/Web References/org.umbraco.our/Reference.map index 29e3094fbf..b8282a32c4 100644 --- a/src/Umbraco.Web/Web References/org.umbraco.our/Reference.map +++ b/src/Umbraco.Web/Web References/org.umbraco.our/Reference.map @@ -1,7 +1,7 @@ - - + + \ No newline at end of file diff --git a/src/Umbraco.Web/Web References/org.umbraco.our/repository.disco b/src/Umbraco.Web/Web References/org.umbraco.our/repository.disco index b481db0d68..a631f28c26 100644 --- a/src/Umbraco.Web/Web References/org.umbraco.our/repository.disco +++ b/src/Umbraco.Web/Web References/org.umbraco.our/repository.disco @@ -1,6 +1,6 @@ - - - + + + \ No newline at end of file diff --git a/src/Umbraco.Web/Web References/org.umbraco.our/repository.wsdl b/src/Umbraco.Web/Web References/org.umbraco.our/repository.wsdl index 159ae2ab07..a5a772e277 100644 --- a/src/Umbraco.Web/Web References/org.umbraco.our/repository.wsdl +++ b/src/Umbraco.Web/Web References/org.umbraco.our/repository.wsdl @@ -980,16 +980,16 @@ - + - + - + - + \ No newline at end of file diff --git a/src/Umbraco.Web/app.config b/src/Umbraco.Web/app.config index 13d7964935..2ebe5abfa3 100644 --- a/src/Umbraco.Web/app.config +++ b/src/Umbraco.Web/app.config @@ -21,7 +21,7 @@ Somthing - http://our.umbraco.org/umbraco/webservices/api/repository.asmx + https://our.umbraco.org/umbraco/webservices/api/repository.asmx diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx index b66388d3a0..0770981b50 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/Packages/editPackage.aspx @@ -186,7 +186,7 @@ during installation and uninstallation.
          All actions are formed as a xml node, containing data for the action to be performed. -           Package actions documentation

          /// Functionally similar to the XPath axis 'descendant' /// Make the All Descendants LINQ queryable - /// taken from: http://our.umbraco.org/wiki/how-tos/useful-helper-extension-methods-%28linq-null-safe-access%29 + /// taken from: https://our.umbraco.org/wiki/how-tos/useful-helper-extension-methods-%28linq-null-safe-access%29 /// /// The document. /// Documents as IEnumerable @@ -179,7 +179,7 @@ namespace umbraco /// Functionally similar to the XPath axis 'child' /// Make the imediate Children LINQ queryable /// Performance optimised for just imediate children. - /// taken from: http://our.umbraco.org/wiki/how-tos/useful-helper-extension-methods-%28linq-null-safe-access%29 + /// taken from: https://our.umbraco.org/wiki/how-tos/useful-helper-extension-methods-%28linq-null-safe-access%29 /// /// The document. /// Documents as IEnumerable diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/NodeExtensions.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/NodeExtensions.cs index a3b7b93a06..f82cf7d272 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/NodeExtensions.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/NodeExtensions.cs @@ -200,7 +200,7 @@ namespace umbraco /// /// Functionally similar to the XPath axis 'descendant' /// Make the All Descendants LINQ queryable - /// taken from: http://our.umbraco.org/wiki/how-tos/useful-helper-extension-methods-%28linq-null-safe-access%29 + /// taken from: https://our.umbraco.org/wiki/how-tos/useful-helper-extension-methods-%28linq-null-safe-access%29 /// /// an umbraco.presentation.nodeFactory.Node object /// Node as IEnumerable @@ -212,7 +212,7 @@ namespace umbraco /// /// Functionally similar to the XPath axis 'descendant' /// Make the All Descendants LINQ queryable - /// taken from: http://our.umbraco.org/wiki/how-tos/useful-helper-extension-methods-%28linq-null-safe-access%29 + /// taken from: https://our.umbraco.org/wiki/how-tos/useful-helper-extension-methods-%28linq-null-safe-access%29 /// /// an umbraco.interfaces.INode object /// INode as IEnumerable @@ -293,7 +293,7 @@ namespace umbraco /// Functionally similar to the XPath axis 'child' /// Make the imediate Children LINQ queryable /// Performance optimised for just imediate children. - /// taken from: http://our.umbraco.org/wiki/how-tos/useful-helper-extension-methods-%28linq-null-safe-access%29 + /// taken from: https://our.umbraco.org/wiki/how-tos/useful-helper-extension-methods-%28linq-null-safe-access%29 /// /// an umbraco.presentation.nodeFactory.Node object /// Node as IEnumerable @@ -306,7 +306,7 @@ namespace umbraco /// Functionally similar to the XPath axis 'child' /// Make the imediate Children LINQ queryable /// Performance optimised for just imediate children. - /// taken from: http://our.umbraco.org/wiki/how-tos/useful-helper-extension-methods-%28linq-null-safe-access%29 + /// taken from: https://our.umbraco.org/wiki/how-tos/useful-helper-extension-methods-%28linq-null-safe-access%29 /// /// an umbraco.interfaces.INode object /// INode as IEnumerable diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-Nodes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-Nodes.cs index 5fbb56a5a9..5c5a3ad06a 100644 --- a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-Nodes.cs +++ b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-Nodes.cs @@ -197,7 +197,7 @@ namespace umbraco /// The URL to get the XML node from. /// Returns the node Id. /// - /// Thanks to Jonas Eriksson http://our.umbraco.org/member/4853 + /// Thanks to Jonas Eriksson https://our.umbraco.org/member/4853 /// Just runs lookups to find the document, does not follow internal redirects, 404 handlers, /// page access verification, wildcard domains -- nothing. /// diff --git a/src/umbraco.MacroEngines/RazorDataTypeModels/IntegerDataTypeModel.cs b/src/umbraco.MacroEngines/RazorDataTypeModels/IntegerDataTypeModel.cs index d998a7c3ab..3ad7101d16 100644 --- a/src/umbraco.MacroEngines/RazorDataTypeModels/IntegerDataTypeModel.cs +++ b/src/umbraco.MacroEngines/RazorDataTypeModels/IntegerDataTypeModel.cs @@ -10,7 +10,7 @@ namespace umbraco.MacroEngines.RazorDataTypeModels [RazorDataTypeModel("f231cd8a-e447-424a-94a4-bc73b11736bb", 90)] [RazorDataTypeModel(Constants.PropertyEditors.RadioButtonList, 90)] [RazorDataTypeModel(Constants.PropertyEditors.MemberPicker, 90)] - [RazorDataTypeModel("f6524852-2fb0-11e0-a9fa-6f1cdfd72085", 90)] //Extended Content Picker http://our.umbraco.org/projects/backoffice-extensions/extended-content-picker + [RazorDataTypeModel("f6524852-2fb0-11e0-a9fa-6f1cdfd72085", 90)] //Extended Content Picker https://our.umbraco.org/projects/backoffice-extensions/extended-content-picker public class IntegerDataTypeModel : IRazorDataTypeModel { public bool Init(int CurrentNodeId, string PropertyData, out object instance) From 2660b3137030fc6d913c30035285d69dd4d8a564 Mon Sep 17 00:00:00 2001 From: Imran Haider Date: Fri, 27 Jul 2018 16:41:57 +0100 Subject: [PATCH 2/2] Updated our.umbraco.org to .com --- .../UmbracoSettings/HelpElement.cs | 2 +- .../Constants-PackageRepository.cs | 2 +- .../Packaging/Models/PackageAction.cs | 2 +- .../MultipleTextStringValueConverter.cs | 2 +- src/Umbraco.Core/Sync/ApplicationUrlHelper.cs | 2 +- .../umbracoSettings.minimal.config | 36 +++++++++--------- .../SqlScripts/SqlCe-SchemaAndData-4110.sql | Bin 422888 -> 422888 bytes .../Importing/ImportResources.Designer.cs | 4 +- .../Importing/StandardMvc-Package.xml | 4 +- .../Importing/TemplateOnly-Package.xml | 2 +- .../TemplateOnly-Updated-Package.xml | 2 +- .../Services/Importing/uBlogsy-Package.xml | 2 +- .../Services/PerformanceTests.cs | 2 +- src/Umbraco.Web.UI.Client/gulpfile.js | 2 +- .../application/umbtour.directive.js | 2 +- .../html/umbbox/umbboxheader.directive.js | 2 +- .../src/common/services/help.service.js | 2 +- .../src/installer/installer.service.js | 4 +- .../installer/steps/permissionsreport.html | 2 +- .../src/installer/steps/starterkit.html | 2 +- .../src/views/common/dialogs/help.html | 4 +- .../src/views/common/drawers/help/help.html | 4 +- .../src/views/common/overlays/help/help.html | 4 +- .../dashboard/dashboard.tabs.controller.js | 6 +-- .../developer/developerdashboardintro.html | 6 +-- .../dashboard/developer/healthcheck.html | 2 +- .../members/membersdashboardintro.html | 2 +- .../settings/settingsdashboardintro.html | 6 +-- .../src/views/packager/views/repo.html | 2 +- .../Properties/Settings.Designer.cs | 2 +- .../Properties/Settings.settings | 2 +- src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml | 4 +- .../Umbraco/config/lang/zh_tw.xml | 6 +-- .../config/HealthChecks.Release.config | 4 +- src/Umbraco.Web.UI/config/HealthChecks.config | 4 +- .../config/feedProxy.Release.config | 2 +- src/Umbraco.Web.UI/config/feedProxy.config | 2 +- .../config/umbracoSettings.Release.config | 2 +- src/Umbraco.Web.UI/umbraco/config/lang/da.xml | 6 +-- src/Umbraco.Web.UI/umbraco/config/lang/de.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/en.xml | 6 +-- .../umbraco/config/lang/en_us.xml | 6 +-- src/Umbraco.Web.UI/umbraco/config/lang/es.xml | 6 +-- src/Umbraco.Web.UI/umbraco/config/lang/fr.xml | 6 +-- src/Umbraco.Web.UI/umbraco/config/lang/he.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/it.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/ja.xml | 2 +- src/Umbraco.Web.UI/umbraco/config/lang/ko.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/nl.xml | 6 +-- src/Umbraco.Web.UI/umbraco/config/lang/pl.xml | 6 +-- src/Umbraco.Web.UI/umbraco/config/lang/pt.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/ru.xml | 6 +-- src/Umbraco.Web.UI/umbraco/config/lang/sv.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/tr.xml | 4 +- src/Umbraco.Web.UI/umbraco/config/lang/zh.xml | 6 +-- .../developer/Packages/editPackage.aspx | 4 +- .../Tree/jquery.tree.contextmenu.js | 2 +- src/Umbraco.Web.UI/web.Template.config | 4 +- src/Umbraco.Web/Editors/HelpController.cs | 2 +- src/Umbraco.Web/Install/InstallHelper.cs | 2 +- .../Install/InstallSteps/UpgradeStep.cs | 2 +- .../EnsurePublishedContentRequestAttribute.cs | 2 +- src/Umbraco.Web/Properties/Settings.settings | 2 +- .../Properties/Settings1.Designer.cs | 2 +- .../Routing/PublishedContentRequest.cs | 2 +- src/Umbraco.Web/Umbraco.Web.csproj | 4 +- src/Umbraco.Web/UmbracoModule.cs | 2 +- .../org.umbraco.our/Reference.map | 4 +- .../org.umbraco.our/repository.disco | 6 +-- .../org.umbraco.our/repository.wsdl | 8 ++-- src/Umbraco.Web/app.config | 2 +- .../developer/Packages/editPackage.aspx | 2 +- .../umbraco/uQuery/DocumentExtensions.cs | 4 +- .../umbraco/uQuery/NodeExtensions.cs | 8 ++-- .../umbraco/uQuery/uQuery-Nodes.cs | 2 +- .../IntegerDataTypeModel.cs | 2 +- 76 files changed, 147 insertions(+), 147 deletions(-) diff --git a/src/Umbraco.Core/Configuration/UmbracoSettings/HelpElement.cs b/src/Umbraco.Core/Configuration/UmbracoSettings/HelpElement.cs index 6224150c51..e229c69ef5 100644 --- a/src/Umbraco.Core/Configuration/UmbracoSettings/HelpElement.cs +++ b/src/Umbraco.Core/Configuration/UmbracoSettings/HelpElement.cs @@ -9,7 +9,7 @@ namespace Umbraco.Core.Configuration.UmbracoSettings [Obsolete("This is no longer used and will be removed in future versions")] internal class HelpElement : ConfigurationElement, IHelpSection { - [ConfigurationProperty("defaultUrl", DefaultValue = "https://our.umbraco.org/wiki/umbraco-help/{0}/{1}")] + [ConfigurationProperty("defaultUrl", DefaultValue = "https://our.umbraco.com/wiki/umbraco-help/{0}/{1}")] public string DefaultUrl { get { return (string) base["defaultUrl"]; } diff --git a/src/Umbraco.Core/Constants-PackageRepository.cs b/src/Umbraco.Core/Constants-PackageRepository.cs index bdcb86932b..59005b3e2c 100644 --- a/src/Umbraco.Core/Constants-PackageRepository.cs +++ b/src/Umbraco.Core/Constants-PackageRepository.cs @@ -7,7 +7,7 @@ /// public static class PackageRepository { - public const string RestApiBaseUrl = "https://our.umbraco.org/webapi/packages/v1"; + public const string RestApiBaseUrl = "https://our.umbraco.com/webapi/packages/v1"; public const string DefaultRepositoryName = "Umbraco package Repository"; public const string DefaultRepositoryId = "65194810-1f85-11dd-bd0b-0800200c9a66"; } diff --git a/src/Umbraco.Core/Packaging/Models/PackageAction.cs b/src/Umbraco.Core/Packaging/Models/PackageAction.cs index a5fcc75220..7e442ff6d9 100644 --- a/src/Umbraco.Core/Packaging/Models/PackageAction.cs +++ b/src/Umbraco.Core/Packaging/Models/PackageAction.cs @@ -27,7 +27,7 @@ namespace Umbraco.Core.Packaging.Models set { _runAt = value; } } - public bool Undo //NOTE: Should thid default to "False"? but the documentation says default "True" (https://our.umbraco.org/wiki/reference/packaging/package-actions) + public bool Undo //NOTE: Should thid default to "False"? but the documentation says default "True" (https://our.umbraco.com/wiki/reference/packaging/package-actions) { get { return _undo ?? true; } set { _undo = value; } diff --git a/src/Umbraco.Core/PropertyEditors/ValueConverters/MultipleTextStringValueConverter.cs b/src/Umbraco.Core/PropertyEditors/ValueConverters/MultipleTextStringValueConverter.cs index e6e638a8d5..0344bc4130 100644 --- a/src/Umbraco.Core/PropertyEditors/ValueConverters/MultipleTextStringValueConverter.cs +++ b/src/Umbraco.Core/PropertyEditors/ValueConverters/MultipleTextStringValueConverter.cs @@ -40,7 +40,7 @@ namespace Umbraco.Core.PropertyEditors.ValueConverters // splitting by newline // // RS: SD/Stephan Please consider post before deciding to remove - //// https://our.umbraco.org/forum/contributing-to-umbraco-cms/76989-keep-the-xml-values-in-the-multipletextstringvalueconverter + //// https://our.umbraco.com/forum/contributing-to-umbraco-cms/76989-keep-the-xml-values-in-the-multipletextstringvalueconverter var values = new List(); var pos = sourceString.IndexOf("", StringComparison.Ordinal); while (pos >= 0) diff --git a/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs b/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs index bee4351577..156cee93e2 100644 --- a/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs +++ b/src/Umbraco.Core/Sync/ApplicationUrlHelper.cs @@ -156,7 +156,7 @@ namespace Umbraco.Core.Sync // otherwise, // if non-standard ports used, // user may need to set umbracoApplicationUrl manually per - // https://our.umbraco.org/documentation/Using-Umbraco/Config-files/umbracoSettings/#ScheduledTasks + // https://our.umbraco.com/documentation/Using-Umbraco/Config-files/umbracoSettings/#ScheduledTasks var port = (request.IsSecureConnection == false && GlobalSettings.UseSSL == false) || (request.IsSecureConnection && GlobalSettings.UseSSL) ? ":" + request.ServerVariables["SERVER_PORT"] diff --git a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config index f105e17463..9c0a3ece52 100644 --- a/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config +++ b/src/Umbraco.Tests/Configurations/UmbracoSettings/umbracoSettings.minimal.config @@ -3,27 +3,27 @@ - + - + - + - + 1 - + robot@umbraco.dk @@ -31,42 +31,42 @@ - - - + Mvc - + - + - + - + - + - + - + - + - + diff --git a/src/Umbraco.Tests/Migrations/SqlScripts/SqlCe-SchemaAndData-4110.sql b/src/Umbraco.Tests/Migrations/SqlScripts/SqlCe-SchemaAndData-4110.sql index 23a8acfd31d0ce6c35c48652dc43e4116f7bf9ed..4aeb066f54bf983c0963f09efb9a5e1f39e468b4 100644 GIT binary patch delta 652 zcmaFyT=K&>)9-XMCqU(ZR?dXU0oA#0OJ{*wENI6pI(>sRvj?UfjlImG+w~?fr!a2MaAV%( qM0=Y$>Y%Qmb@*)uhM%-Mtvz&_wSuv|A)94;LpJN8FxuO;YXtxv7PvkD delta 568 zcmaFyT=KO;GW%d!U-y)XOZgU2hU|3gh++ tH|AYVv@pA)4rD4#LS;KJRHWRg@95L46^!i-*(}=|vRM~}(Zc*)D*&nzywCsu diff --git a/src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs b/src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs index 46dada5a9b..d3e18fb8b4 100644 --- a/src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs +++ b/src/Umbraco.Tests/Services/Importing/ImportResources.Designer.cs @@ -313,7 +313,7 @@ namespace Umbraco.Tests.Services.Importing { /// <name>Template-Update</name> /// <version>0.1</version> /// <license url="http://www.opensource.org/licenses/mit-license.php">MIT license</license> - /// <url>https://our.umbraco.org/projects</url> + /// <url>https://our.umbraco.com/projects</url> /// <requirements> /// <major>3</major> /// <minor>0</minor> @@ -339,7 +339,7 @@ namespace Umbraco.Tests.Services.Importing { /// <name>Template-Update</name> /// <version>0.1</version> /// <license url="http://www.opensource.org/licenses/mit-license.php">MIT license</license> - /// <url>https://our.umbraco.org/projects</url> + /// <url>https://our.umbraco.com/projects</url> /// <requirements> /// <major>3</major> /// <minor>0</minor> diff --git a/src/Umbraco.Tests/Services/Importing/StandardMvc-Package.xml b/src/Umbraco.Tests/Services/Importing/StandardMvc-Package.xml index e6e4708a2e..6238c8fbdb 100644 --- a/src/Umbraco.Tests/Services/Importing/StandardMvc-Package.xml +++ b/src/Umbraco.Tests/Services/Importing/StandardMvc-Package.xml @@ -177,7 +177,7 @@ StandardWebsiteMVC 2.0 MIT license - https://our.umbraco.org/projects/starter-kits/standard-website-mvc + https://our.umbraco.com/projects/starter-kits/standard-website-mvc 3 0 @@ -218,7 +218,7 @@ Google Maps - A map macro that you can use within Rich Text Areas Contact Us -

          Contact Us on TwitterWe'd love to hear how this package has helped you and how it can be improved. Get in touch on the project website or via twitter

          ]]> +

          Contact Us on TwitterWe'd love to hear how this package has helped you and how it can be improved. Get in touch on the project website or via twitter

          ]]>
          Standard Website MVC, Company Address, Glasgow, Postcode
          diff --git a/src/Umbraco.Tests/Services/Importing/TemplateOnly-Package.xml b/src/Umbraco.Tests/Services/Importing/TemplateOnly-Package.xml index 675a5f8483..93f9b92750 100644 --- a/src/Umbraco.Tests/Services/Importing/TemplateOnly-Package.xml +++ b/src/Umbraco.Tests/Services/Importing/TemplateOnly-Package.xml @@ -6,7 +6,7 @@ Template-Update 0.1 MIT license - https://our.umbraco.org/projects + https://our.umbraco.com/projects 3 0 diff --git a/src/Umbraco.Tests/Services/Importing/TemplateOnly-Updated-Package.xml b/src/Umbraco.Tests/Services/Importing/TemplateOnly-Updated-Package.xml index 1cbd9bb3f3..2a13898397 100644 --- a/src/Umbraco.Tests/Services/Importing/TemplateOnly-Updated-Package.xml +++ b/src/Umbraco.Tests/Services/Importing/TemplateOnly-Updated-Package.xml @@ -6,7 +6,7 @@ Template-Update 0.1 MIT license - https://our.umbraco.org/projects + https://our.umbraco.com/projects 3 0 diff --git a/src/Umbraco.Tests/Services/Importing/uBlogsy-Package.xml b/src/Umbraco.Tests/Services/Importing/uBlogsy-Package.xml index 86addb351f..b134cbbd97 100644 --- a/src/Umbraco.Tests/Services/Importing/uBlogsy-Package.xml +++ b/src/Umbraco.Tests/Services/Importing/uBlogsy-Package.xml @@ -332,7 +332,7 @@ uBlogsy 3.0 MIT license - https://our.umbraco.org/projects/starter-kits/ublogsy + https://our.umbraco.com/projects/starter-kits/ublogsy 3 0 diff --git a/src/Umbraco.Tests/Services/PerformanceTests.cs b/src/Umbraco.Tests/Services/PerformanceTests.cs index 39a3f00bed..c91c8b031a 100644 --- a/src/Umbraco.Tests/Services/PerformanceTests.cs +++ b/src/Umbraco.Tests/Services/PerformanceTests.cs @@ -314,7 +314,7 @@ namespace Umbraco.Tests.Services Umbraco Development

          UmbracoUmbraco the the leading ASP.NET open source CMS, under pinning over 150,000 websites. Our Certified Developers are experts in developing high performance and feature rich websites.

          ]]>           Contact Us -

          Contact Us on TwitterWe'd love to hear how this package has helped you and how it can be improved. Get in touch on the project website or via twitter

          ]]>           +

          Contact Us on TwitterWe'd love to hear how this package has helped you and how it can be improved. Get in touch on the project website or via twitter

          ]]>
          Standard Website MVC, Company Address, Glasgow, Postcode
          Copyright &copy; 2012 Your Company diff --git a/src/Umbraco.Web.UI.Client/gulpfile.js b/src/Umbraco.Web.UI.Client/gulpfile.js index afaaadf050..86db319aec 100644 --- a/src/Umbraco.Web.UI.Client/gulpfile.js +++ b/src/Umbraco.Web.UI.Client/gulpfile.js @@ -351,7 +351,7 @@ gulp.task('docs', [], function (cb) { title: "Umbraco Backoffice UI API Documentation", dest: 'docs/api', styles: ['docs/umb-docs.css'], - image: "https://our.umbraco.org/assets/images/logo.svg" + image: "https://our.umbraco.com/assets/images/logo.svg" } return gulpDocs.sections({ diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js index 7e981c065d..7333d033b1 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour.directive.js @@ -8,7 +8,7 @@ Added in Umbraco 7.8. The tour component is a global component and is already added to the umbraco markup. In the Umbraco UI the tours live in the "Help drawer" which opens when you click the Help-icon in the bottom left corner of Umbraco. You can easily add you own tours to the Help-drawer or show and start tours from -anywhere in the Umbraco backoffice. To see a real world example of a custom tour implementation, install The Starter Kit in Umbraco 7.8 +anywhere in the Umbraco backoffice. To see a real world example of a custom tour implementation, install The Starter Kit in Umbraco 7.8

          Extending the help drawer with custom tours

          The easiet way to add new tours to Umbraco is through the Help-drawer. All it requires is a my-tour.json file. diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbbox/umbboxheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbbox/umbboxheader.directive.js index bb16edf761..a0fbd2c24a 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbbox/umbboxheader.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/html/umbbox/umbboxheader.directive.js @@ -27,7 +27,7 @@ Use this directive to construct a title. Recommended to use it inside an {@link -{@link https://our.umbraco.org/documentation/extending/language-files/ Here you can see more about the language files} +{@link https://our.umbraco.com/documentation/extending/language-files/ Here you can see more about the language files}

          Use in combination with:

            diff --git a/src/Umbraco.Web.UI.Client/src/common/services/help.service.js b/src/Umbraco.Web.UI.Client/src/common/services/help.service.js index bad1fa4e49..1de992d9db 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/help.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/help.service.js @@ -2,7 +2,7 @@ angular.module('umbraco.services') .factory('helpService', function ($http, $q, umbRequestHelper) { var helpTopics = {}; - var defaultUrl = "https://our.umbraco.org/rss/help"; + var defaultUrl = "https://our.umbraco.com/rss/help"; var tvUrl = "http://umbraco.tv/feeds/help"; function getCachedHelp(url){ diff --git a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js b/src/Umbraco.Web.UI.Client/src/installer/installer.service.js index efbb13fad4..a174de1271 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/installer.service.js +++ b/src/Umbraco.Web.UI.Client/src/installer/installer.service.js @@ -21,7 +21,7 @@ angular.module("umbraco.install").factory('installerService', function($rootScop "At least 2 people have named their cat 'Umbraco'", 'On an average day, more than 1000 people download Umbraco', 'umbraco.tv is the premier source of Umbraco video tutorials to get you started', - 'You can find the world\'s friendliest CMS community at our.umbraco.org', + 'You can find the world\'s friendliest CMS community at our.umbraco.com', 'You can become a certified Umbraco developer by attending one of the official courses', 'Umbraco works really well on tablets', 'You have 100% control over your markup and design when crafting a website in Umbraco', @@ -121,7 +121,7 @@ angular.module("umbraco.install").factory('installerService', function($rootScop } }, - //loads available packages from our.umbraco.org + //loads available packages from our.umbraco.com getPackages : function(){ return $http.get(Umbraco.Sys.ServerVariables.installApiBaseUrl + "GetPackages"); }, diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/permissionsreport.html b/src/Umbraco.Web.UI.Client/src/installer/steps/permissionsreport.html index 266f360394..ad9b1c9cc1 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/steps/permissionsreport.html +++ b/src/Umbraco.Web.UI.Client/src/installer/steps/permissionsreport.html @@ -3,7 +3,7 @@

            In order to run umbraco, you'll need to update your permission settings. Detailed information about the correct file & folder permissions for Umbraco can be found - here. + here.

            The following report list the permissions that are currently failing. Once the permissions are fixed press the 'Go back' button to restart the installation. diff --git a/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html b/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html index 2f76de5525..1ffbdb205b 100644 --- a/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html +++ b/src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html @@ -12,7 +12,7 @@

          • Loading... - {{pck.name}} + {{pck.name}}
          diff --git a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html index a6d3827343..036ae38695 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/dialogs/help.html @@ -22,8 +22,8 @@
          • - - go to our.umbraco.org + + go to our.umbraco.com The friendliest community
            • diff --git a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html index e387ef48b7..e8f80c7d89 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/drawers/help/help.html @@ -103,9 +103,9 @@             - + -
            Visit our.umbraco.org
            +
            Visit our.umbraco.com
            The friendliest community diff --git a/src/Umbraco.Web.UI.Client/src/views/common/overlays/help/help.html b/src/Umbraco.Web.UI.Client/src/views/common/overlays/help/help.html index 3d90d86971..8390ee4e37 100644 --- a/src/Umbraco.Web.UI.Client/src/views/common/overlays/help/help.html +++ b/src/Umbraco.Web.UI.Client/src/views/common/overlays/help/help.html @@ -15,8 +15,8 @@
            • - - go to our.umbraco.org + + go to our.umbraco.com The friendliest community diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js index 0dfdfbc3fe..e7e9ea338b 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/dashboard.tabs.controller.js @@ -44,12 +44,12 @@ function startUpDynamicContentController($timeout, $scope, dashboardResource, as { title: "Documentation", description: "Find the answers to your Umbraco questions", - url: "https://our.umbraco.org/documentation/?utm_source=core&utm_medium=dashboard&utm_content=text&utm_campaign=documentation/" + url: "https://our.umbraco.com/documentation/?utm_source=core&utm_medium=dashboard&utm_content=text&utm_campaign=documentation/" }, { title: "Community", description: "Find the answers or ask your Umbraco questions", - url: "https://our.umbraco.org/?utm_source=core&utm_medium=dashboard&utm_content=text&utm_campaign=our_forum" + url: "https://our.umbraco.com/?utm_source=core&utm_medium=dashboard&utm_content=text&utm_campaign=our_forum" }, { title: "Umbraco.tv", @@ -75,7 +75,7 @@ function startUpDynamicContentController($timeout, $scope, dashboardResource, as title: "Our Umbraco - The Friendliest Community", description: "Our Umbraco - the official community site is your one stop for everything Umbraco. Whether you need a question answered or looking for cool plugins, the world's best and friendliest community is just a click away.", img: "views/dashboard/default/ourumbraco.jpg", - url: "https://our.umbraco.org/?utm_source=core&utm_medium=dashboard&utm_content=image&utm_campaign=our", + url: "https://our.umbraco.com/?utm_source=core&utm_medium=dashboard&utm_content=image&utm_campaign=our", altText: "Our Umbraco", buttonText: "Visit Our Umbraco" } diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardintro.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardintro.html index 5f2b4e1873..d8d3d127eb 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardintro.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/developerdashboardintro.html @@ -5,9 +5,9 @@

              Find out more:

                -
              • Find the answers to your Umbraco questions on our Community Wiki
                • -
              • Ask a question in the Community Forum
                • -
              • Find an add-on package to help you get going quickly
                • +
              • Find the answers to your Umbraco questions on our Community Wiki
                • +
              • Ask a question in the Community Forum
                • +
              • Find an add-on package to help you get going quickly
              • Watch our tutorial videos (some are free, some require a subscription)
              • Find out about our productivity boosting tools and commercial support
              • Find out about real-life training and certification opportunities
                • diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/healthcheck.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/healthcheck.html index 1204af7ca4..864d1930e9 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/healthcheck.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/developer/healthcheck.html @@ -9,7 +9,7 @@

                The health checker evaluates various areas of your site for best practice settings, configuration, potential problems, etc. You can easily fix problems by pressing a button. - You can add your own health checks, have a look at the documentation for more information about custom health checks.

                + You can add your own health checks, have a look at the documentation for more information about custom health checks.

                diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardintro.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardintro.html index 8754a30837..c29b52d96e 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardintro.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/members/membersdashboardintro.html @@ -6,5 +6,5 @@

                More about members

                diff --git a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html index d59d10d393..bc3b87663d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html +++ b/src/Umbraco.Web.UI.Client/src/views/dashboard/settings/settingsdashboardintro.html @@ -5,9 +5,9 @@

                Find out more:

                  -
                • Read more about working with the Items in Settings in the Documentation section of Our Umbraco
                  • -
                • Download the Editors Manual for details on working with the Umbraco UI
                  • -
                • Ask a question in the Community Forum
                  • +
                • Read more about working with the Items in Settings in the Documentation section of Our Umbraco
                  • +
                • Download the Editors Manual for details on working with the Umbraco UI
                  • +
                • Ask a question in the Community Forum
                • Watch our tutorial videos (some are free, some require a subscription)
                • Find out about our productivity boosting tools and commercial support
                • Find out about real-life training and certification opportunities
                  • diff --git a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html index 7e352f27b0..e4cb5893ce 100644 --- a/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html +++ b/src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html @@ -168,7 +168,7 @@
                  + img-src="{{ 'https://our.umbraco.com' + vm.package.ownerInfo.ownerAvatar }}">
                  diff --git a/src/Umbraco.Web.UI/Properties/Settings.Designer.cs b/src/Umbraco.Web.UI/Properties/Settings.Designer.cs index 76e52a80c2..24b8be234b 100644 --- a/src/Umbraco.Web.UI/Properties/Settings.Designer.cs +++ b/src/Umbraco.Web.UI/Properties/Settings.Designer.cs @@ -25,7 +25,7 @@ namespace Umbraco.Web.UI.Properties { [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("https://our.umbraco.org/umbraco/webservices/api/repository.asmx")] + [global::System.Configuration.DefaultSettingValueAttribute("https://our.umbraco.com/umbraco/webservices/api/repository.asmx")] public string Umbraco_Web_UI_org_umbraco_our_Repository { get { return ((string)(this["Umbraco_Web_UI_org_umbraco_our_Repository"])); diff --git a/src/Umbraco.Web.UI/Properties/Settings.settings b/src/Umbraco.Web.UI/Properties/Settings.settings index cd6d9aa4a7..9ea781aa29 100644 --- a/src/Umbraco.Web.UI/Properties/Settings.settings +++ b/src/Umbraco.Web.UI/Properties/Settings.settings @@ -3,7 +3,7 @@ - https://our.umbraco.org/umbraco/webservices/api/repository.asmx + https://our.umbraco.com/umbraco/webservices/api/repository.asmx \ No newline at end of file diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml index f79805f9a2..bafef111d2 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files Angi domene @@ -469,7 +469,7 @@ Databasekonfigurasjon installer-knappen for å installere Umbraco %0% databasen]]> Neste for å fortsette.]]> - Databasen ble ikke funnet! Vennligst sjekk at informasjonen i "connection string" i "web.config"-filen er korrekt.

                  For å fortsette, vennligst rediger "web.config"-filen (bruk Visual Studio eller din favoritteditor), rull ned til bunnen, og legg til tilkoblingsstrengen for din database i nøkkelen "umbracoDbDSN" og lagre filen.

                  Klikk prøv på nytt når du er ferdig.
                  Mer informasjon om redigering av web.config her.

                  ]]>                   + Databasen ble ikke funnet! Vennligst sjekk at informasjonen i "connection string" i "web.config"-filen er korrekt.

                  For å fortsette, vennligst rediger "web.config"-filen (bruk Visual Studio eller din favoritteditor), rull ned til bunnen, og legg til tilkoblingsstrengen for din database i nøkkelen "umbracoDbDSN" og lagre filen.

                  Klikk prøv på nytt når du er ferdig.
                  Mer informasjon om redigering av web.config her.

                  ]]>                   Vennligst kontakt din ISP om nødvendig. Hvis du installerer på en lokal maskin eller server, må du kanskje skaffe informasjonen fra din systemadministrator.]]> Trykk på knappen oppgrader for å oppgradere databasen din til Umbraco %0%

                  Ikke vær urolig - intet innhold vil bli slettet og alt vil fortsette å virke etterpå!

                  ]]>                   Trykk Neste for å fortsette.]]> diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml index 432929c613..16387728b1 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/zh_tw.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files 管理主機名稱 @@ -171,7 +171,7 @@ 子項目 目標 預計發表的時間（伺服器端） - 這是什麼意思？]]> + 這是什麼意思？]]> 點選以便上傳 @@ -553,7 +553,7 @@

                  請編輯檔案"web.config" (例如使用Visual Studio或您喜歡的編輯器)，移動到檔案底部，並在名稱為"UmbracoDbDSN"的字串中設定資料庫連結資訊，並存檔。

                  點選重試按鈕當上述步驟完成。
                  - + 在此查詢更多編輯web.config的資訊。

                  ]]> 若需要時，請聯繫您的網路公司。如果您在本地機器或伺服器安裝的話，您也許需要聯絡系統管理者。]]> diff --git a/src/Umbraco.Web.UI/config/HealthChecks.Release.config b/src/Umbraco.Web.UI/config/HealthChecks.Release.config index 69324bf513..1eb7b0e07a 100644 --- a/src/Umbraco.Web.UI/config/HealthChecks.Release.config +++ b/src/Umbraco.Web.UI/config/HealthChecks.Release.config @@ -2,10 +2,10 @@ diff --git a/src/Umbraco.Web.UI/config/HealthChecks.config b/src/Umbraco.Web.UI/config/HealthChecks.config index 75cf3713bd..4e927e8bb6 100644 --- a/src/Umbraco.Web.UI/config/HealthChecks.config +++ b/src/Umbraco.Web.UI/config/HealthChecks.config @@ -2,10 +2,10 @@ diff --git a/src/Umbraco.Web.UI/config/feedProxy.Release.config b/src/Umbraco.Web.UI/config/feedProxy.Release.config index e76284c13f..e7984eb5d9 100644 --- a/src/Umbraco.Web.UI/config/feedProxy.Release.config +++ b/src/Umbraco.Web.UI/config/feedProxy.Release.config @@ -7,5 +7,5 @@ - + diff --git a/src/Umbraco.Web.UI/config/feedProxy.config b/src/Umbraco.Web.UI/config/feedProxy.config index e76284c13f..e7984eb5d9 100644 --- a/src/Umbraco.Web.UI/config/feedProxy.config +++ b/src/Umbraco.Web.UI/config/feedProxy.config @@ -7,5 +7,5 @@ - + diff --git a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config index 3a445574af..27f5fc97c7 100644 --- a/src/Umbraco.Web.UI/config/umbracoSettings.Release.config +++ b/src/Umbraco.Web.UI/config/umbracoSettings.Release.config @@ -3,7 +3,7 @@ diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml index b23b537c86..d5e22984df 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/da.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/da.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files Tilføj domæne @@ -236,7 +236,7 @@ Undersider Åben i vindue Dette oversætter til den følgende tid på serveren: - Hvad betyder det?]]> + Hvad betyder det?]]> Er du sikker på, at du vil slette dette element? Egenskaben %0% anvender editoren %1% som ikke er understøttet af Nested Content. Tilføj en ny tekstboks @@ -705,7 +705,7 @@ Næste for at fortsætte.]]> Databasen er ikke fundet. Kontrollér venligst at informationen i database forbindelsesstrengen i "web.config" filen er korrekt.

                  -

                  For at fortsætte bedes du venligst rette "web.config" filen (ved at bruge Visual Studio eller dit favoritprogram), scroll til bunden, tilføj forbindelsesstrengen til din database i feltet som hedder "umbracoDbDSN" og gem filen.

                  Klik på Forsøg igen knappen når du er færdig.
                  Mere information om at redigere web.config her.

                  ]]> +

                  For at fortsætte bedes du venligst rette "web.config" filen (ved at bruge Visual Studio eller dit favoritprogram), scroll til bunden, tilføj forbindelsesstrengen til din database i feltet som hedder "umbracoDbDSN" og gem filen.

                  Klik på Forsøg igen knappen når du er færdig.
                  Mere information om at redigere web.config her.

                  ]]>                   Kontakt venligst din ISP hvis det er nødvendigt. Hvis du installerer på en lokal maskine eller server kan du muligvis få informationerne fra din systemadministrator.]]> Tryk på Opgradér knappen for at opgradere din database til Umbraco %0%

                  Bare rolig - intet indhold vil blive slettet og alt vil stadig fungere bagefter!

                  ]]>                   diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml index 133f50b862..467d64897a 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/de.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/de.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files Hostnamen verwalten @@ -465,7 +465,7 @@ Die Datenbank wurde für Umbraco %0% konfiguriert. Klicken Sie auf <strong>weiter</strong>, um fortzufahren. <p>Die angegebene Datenbank ist leider nicht erreichbar. Bitte prüfen Sie die Verbindungszeichenfolge ("Connection String") in der "web.config"-Datei.</p> <p>Um fortzufahren, passen Sie bitte die "web.config"-Datei mit einem beliebigen Text-Editor an. Scrollen Sie dazu nach unten, fügen Sie die Verbindungszeichenfolge für die zuverbindende Datenbank als Eintrag "UmbracoDbDSN" hinzu und speichern Sie die Datei.</p> -<p>Klicken Sie nach erfolgter Anpassung auf <strong>Wiederholen</strong>.<br />Wenn Sie weitere technische Informationen benötigen, besuchen Sie <a href="https://our.umbraco.org/wiki" target="_blank">The Umbraco documentation wiki</a>.</p> +<p>Klicken Sie nach erfolgter Anpassung auf <strong>Wiederholen</strong>.<br />Wenn Sie weitere technische Informationen benötigen, besuchen Sie <a href="https://our.umbraco.com/wiki" target="_blank">The Umbraco documentation wiki</a>.</p> Um diesen Schritt abzuschließen, müssen Sie die notwendigen Informationen zur Datenbankverbindung angeben.<br />Bitte kontaktieren Sie Ihren Provider bzw. Server-Administrator für weitere Informationen. diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index 02e6af666a..7607535693 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files Culture and Hostnames @@ -242,7 +242,7 @@ Child items Target This translates to the following time on the server: - What does this mean?]]> + What does this mean?]]> Are you sure you want to delete this item? Property %0% uses editor %1% which is not supported by Nested Content. Add another text box @@ -757,7 +757,7 @@

                  To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "UmbracoDbDSN" and save the file.

                  Click the retry button when - done.
                  + done.
                   More information on editing web.config here.

                  ]]>                   diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml index 228d46ee05..895e1eac0b 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files Culture and Hostnames @@ -243,7 +243,7 @@ Child items Target This translates to the following time on the server: - What does this mean?]]> + What does this mean?]]> Are you sure you want to delete this item? Property %0% uses editor %1% which is not supported by Nested Content. Add another text box @@ -755,7 +755,7 @@

                  To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "UmbracoDbDSN" and save the file.

                  Click the retry button when - done.
                  + done.
                   More information on editing web.config here.

                  ]]>                   diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml index ee8356c826..fed40e2d79 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/es.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/es.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files Administrar hostnames @@ -213,7 +213,7 @@ Nodos hijo Target Esto se traduce en la siguiente hora en el servidor: - ¿Esto qué significa?]]> + ¿Esto qué significa?]]> ¿Estás seguro que quieres eliminar este elemento? Propiedad %0% utiliza editor %1% que no está soportado por Nested Content. Añadir otra caja de texto @@ -698,7 +698,7 @@ Configuración de la base de datos instalar para instalar %0% la base de datos de Umbraco]]> Próximo para continuar]]> - ¡No se ha encontrado ninguna base de datos! Mira si la información en la "connection string" del “web.config” es correcta.

                  Para continuar, edite el "web.config" (bien sea usando Visual Studio o su editor de texto preferido), vaya al final del archivo y añada la cadena de conexión para la base de datos con el nombre (key) "umbracoDbDSN" y guarde el archivo.

                  Pinche en reintentar cuando haya terminado.
                  Pinche aquí para mayor información de como editar el web.config (en inglés)

                  ]]>                   + ¡No se ha encontrado ninguna base de datos! Mira si la información en la "connection string" del “web.config” es correcta.

                  Para continuar, edite el "web.config" (bien sea usando Visual Studio o su editor de texto preferido), vaya al final del archivo y añada la cadena de conexión para la base de datos con el nombre (key) "umbracoDbDSN" y guarde el archivo.

                  Pinche en reintentar cuando haya terminado.
                  Pinche aquí para mayor información de como editar el web.config (en inglés)

                  ]]>                   Por favor, contacta con tu ISP si es necesario. Si estás realizando la instalación en una máquina o servidor local, quizás necesites información de tu administrador de sistemas.]]> Pinche en actualizar para actualizar la base de datos a Umbraco %0%

                  Ningún contenido será borrado de la base de datos y seguirá funcionando después de la actualización

                  ]]>                   Pinche en Próximo para continuar. ]]> diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml index 4e725d35b0..b3d5edf512 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/fr.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files Culture et noms d'hôte @@ -241,7 +241,7 @@ Eléments enfants Cible Ceci se traduit par l'heure suivante sur le serveur : - Qu'est-ce que cela signifie?]]> + Qu'est-ce que cela signifie?]]> Etes-vous certain(e) de vouloir supprimer cet éléménent? La propriété %0% utilise l'éditeur %1% qui n'est pas supporté par Nested Content. Ajouter un autre champ texte @@ -754,7 +754,7 @@

                  Pour poursuivre, veuillez éditer le fichier "web.config" (avec Visual Studio ou votre éditeur de texte favori), scroller jusqu'en bas, ajouter le "connection string" pour votre base de données dans la ligne avec la clé "umbracoDbDSN" et sauvegarder le fichier.

                  Cliquez sur le bouton Réessayer lorsque cela est fait. -
                  +
                  Plus d'informations sur l'édition du fichier web.config ici.

                  ]]>                   diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml index 5ceca5d2fe..1e3258976a 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/he.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/he.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files נהל שמות מתחם @@ -383,7 +383,7 @@

                  To proceed, please edit the "web.config" file (using Visual Studio or your favourite text editor), scroll to the bottom, add the connection string for your database in the key named "UmbracoDbDSN" and save the file.

                  Click the retry button when - done.
                  + done.
                   More information on editing web.config here.

                  ]]>                   Please contact your ISP if necessary. diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml index 7fdb37fc98..dba069327e 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/it.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/it.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files Gestisci hostnames @@ -381,7 +381,7 @@ Avanti per proseguire.]]> Database non trovato! Perfavore, controlla che le informazioni della stringa di connessione nel file "web.config" siano corrette.

                  -

                  Per procedere, edita il file "web.config" (utilizzando Visual Studio o l'editor di testo che preferisci), scorri in basso, aggiungi la stringa di connessione per il database chiamato "umbracoDbDSN" e salva il file.

                  Clicca il tasto riprova quando hai finito.
                  Maggiori dettagli per la modifica del file web.config qui.

                  ]]> +

                  Per procedere, edita il file "web.config" (utilizzando Visual Studio o l'editor di testo che preferisci), scorri in basso, aggiungi la stringa di connessione per il database chiamato "umbracoDbDSN" e salva il file.

                  Clicca il tasto riprova quando hai finito.
                  Maggiori dettagli per la modifica del file web.config qui.

                  ]]>                   Premi il tasto aggiorna per aggiornare il database ad Umbraco %0%

                  Non preoccuparti, il contenuto non verrà perso e tutto continuerà a funzionare dopo l'aggiornamento!

                  ]]>                   diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml index d7282c906c..2d53b99237 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ja.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files ドメインの割り当て diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml index 33be0b5e46..ab830a39a5 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ko.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files 호스트명 관리 @@ -378,7 +378,7 @@ 데이터베이스를 찾을 수 없습니다. “web.config”파일의 "connection string"이 바르게 설정되었는지 확인하세요.

                  "web.config" 파일에 맨아래에 ,키네임을 "UmbracoDbDSN"로 하여 사용하시는 데이터베이스의 connection string 정보를 입력하시고 파일을 저장하세요.

                  - 완료 후재시도버튼을 누르세요.
                  + 완료 후재시도버튼을 누르세요.
                   web.config의 더많은 정보는 여기에 있습니다.

                  ]]>                   필요하시다면 사용하시는 ISP쪽에 문의하시기 바랍니다.. diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml index 84502139c3..b6dc2cf866 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/nl.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files Beheer domeinnamen @@ -175,7 +175,7 @@ Subitems Doel Dit betekend de volgende tijd op de server: - Wat houd dit in?]]> + Wat houd dit in?]]> Ben je er zeker van dat je dit item wilt verwijderen? Eigenschap %0% gebruikt editor %1% welke niet wordt ondersteund door Nested Content. Voeg nog een tekstvak toe @@ -586,7 +586,7 @@ Database configuratie installeren om de Umbraco %0% database te installeren]]> Volgende om door te gaan.]]> - De database kon niet gevonden worden! Gelieve na te kijken of de informatie in de "connection string" van het "web.config" bestand correct is.

                  Om door te gaan, gelieve het "web.config" bestand aan te passen (met behulp van Visual Studio of je favoriete tekstverwerker), scroll in het bestand naar beneden, voeg de connection string voor je database toe in de key met naam "umbracoDbDSN" en sla het bestand op.

                  Klik op de knop opnieuw proberen als je hiermee klaar bent.
                  Meer informatie over het aanpassen van de web.config vind je hier.

                  ]]>                   + De database kon niet gevonden worden! Gelieve na te kijken of de informatie in de "connection string" van het "web.config" bestand correct is.

                  Om door te gaan, gelieve het "web.config" bestand aan te passen (met behulp van Visual Studio of je favoriete tekstverwerker), scroll in het bestand naar beneden, voeg de connection string voor je database toe in de key met naam "umbracoDbDSN" en sla het bestand op.

                  Klik op de knop opnieuw proberen als je hiermee klaar bent.
                  Meer informatie over het aanpassen van de web.config vind je hier.

                  ]]>                   Gelieve contact op te nemen met je ISP indien nodig. Wanneer je installeert op een lokale computer of server, dan heb je waarschijnlijk informatie nodig van je systeembeheerder.]]> Klik de upgrade knop om je database te upgraden naar Umbraco %0%

                  Maak je geen zorgen - er zal geen inhoud worden gewist en alles blijft gewoon werken!

                  ]]>                   Klik Volgende om verder te gaan.]]> diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml index 93c825315b..98759d5851 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/pl.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files Zarządzanie hostami @@ -214,7 +214,7 @@ Elementy dzieci Cel Oznacza to następującą godzinę na serwerze: - Co to oznacza?]]> + Co to oznacza?]]> Czy na pewno chcesz usunąć ten element? Właściwość %0% używa edytora %1%, który nie jest wspierany przez Nested Content. Dodaj kolejne pole tekstowe @@ -688,7 +688,7 @@ Naciśnij przycisk instaluj, aby zainstalować bazę danych Umb

                  Aby kontynuować, dokonaj edycji pliku "web.config" (używając Visual Studio lub dowolnego edytora tekstu), przemieść kursor na koniec pliku, dodaj parametry połączenia do Twojej bazy danych w kluczu o nazwie "umbracoDbDSN" i zapisz plik.

                  Kliknij ponów próbę kiedy - skończysz.
                  + skończysz.
                   Tu znajdziesz więcej informacji na temat edycji pliku "web.config".

                  ]]>                   Skontaktuj się z Twoim dostawą usług internetowych jeśli zajdzie taka potrzeba. diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml index 0bc6748cd8..bcbd609b5f 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/pt.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files Gerenciar hostnames @@ -374,7 +374,7 @@ Próximo para prosseguir.]]> Banco de dados não encontrado! Favor checar se a informação no "connection string" do "web.config" esteja correta.

                  Para prosseguir, favor editar o arquivo "web.config" (usando Visual Studio ou seu editor de texto favorito), role até embaixo, adicione a connection string para seu banco de dados com a chave de nome "UmbracoDbDSN" e salve o arquivo

                  -

                  Clique o botão tentar novamente quando terminar.
                  +

                  Clique o botão tentar novamente quando terminar.
                  Mais informações em como editar o web.config aqui.

                  ]]>                   Favor contatar seu provedor de internet ou hospedagem web se necessário. Se você estiver instalando em uma máquina ou servidor local é possível que você precise dessas informações por um administrador de sistema.]]> diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml index d6cb71cd97..8ebe8c0ef7 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/ru.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files Языки и домены @@ -269,7 +269,7 @@ Очистить дату ВНИМАНИЕ: этот документ опубликован, но его URL вступает в противоречие с документом %0% Это время будет соответствовать следующему времени на сервере: - Что это означает?]]> + Что это означает?]]> Задать дату Порядок сортировки обновлен Для сортировки узлов просто перетаскивайте узлы или нажмите на заголовке столбца. Вы можете выбрать несколько узлов, удерживая клавиши "shift" или "ctrl" при пометке @@ -897,7 +897,7 @@

                  Для настройки откройте файл "web.config" с помощью любого текстового редактора и добавьте нужную информацию в строку подключения (параметр "UmbracoDbDSN"), затем сохраните файл.

                  Нажмите кнопку "Повторить" когда все будет готово
                  - Более подробно о внесении изменений в файл "web.config" рассказано здесь.

                  ]]>                   diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml index 2a414c1303..0795752fad 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/sv.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files Hantera domännamn @@ -456,7 +456,7 @@ Databaskonfiguration installera]]> Nästa för att fortsätta.]]> - Databasen kunde inte hittas! Kontrollera att informationen i databasanslutnings-inställningarna i filen "web.config" är rätt.

                  För att fortsätta måste du redigera filen "web.config" (du kan använda Visual Studio eller din favorit text-redigerare), bläddra till slutet, lägg till databasanslutnings-inställningarna för din databas i fältet som heter "umbracoDbDSN" och spara filen.

                  Klicka på Försök igen knappen när du är klar.
                  > Mer information om att redigera web.config hittar du här.

                  ]]>                   + Databasen kunde inte hittas! Kontrollera att informationen i databasanslutnings-inställningarna i filen "web.config" är rätt.

                  För att fortsätta måste du redigera filen "web.config" (du kan använda Visual Studio eller din favorit text-redigerare), bläddra till slutet, lägg till databasanslutnings-inställningarna för din databas i fältet som heter "umbracoDbDSN" och spara filen.

                  Klicka på Försök igen knappen när du är klar.
                  > Mer information om att redigera web.config hittar du här.

                  ]]>                   Eventuellt kan du behöva kontakta ditt webb-hotell. Om du installerar på en lokal maskin eller server kan du få informationen från din systemadministratör.]]> Tryck Uppgradera knappen för att uppgradera din databas till Umbraco %0%

                  Du behöver inte vara orolig. Inget innehåll kommer att raderas och efteråt kommer allt att fungera som vanligt!

                  ]]>                   Tryck Nästa för att fortsätta.]]> diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/tr.xml b/src/Umbraco.Web.UI/umbraco/config/lang/tr.xml index 6c461c909d..d2431e8802 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/tr.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/tr.xml @@ -2,7 +2,7 @@ The Umbraco community - https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files Kültür ve Hostnames @@ -456,7 +456,7 @@

                  Tekrar dene.
                  - + Burada düzenleme web.config Hakkında Daha Fazla Bilgi.

                  ]]>                   diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml index 9f21e04b9a..c2189ca928 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/zh.xml @@ -2,7 +2,7 @@ 黄仁祥(wanddy@163.com) - https://our.umbraco.org/documentation/Extending-Umbraco/Language-Files + https://our.umbraco.com/documentation/Extending-Umbraco/Language-Files 管理主机名 @@ -176,7 +176,7 @@ 子项 目标 这将转换到服务器上的以下时间: - 这是什么意思？]]> + 这是什么意思？]]> 添加其他文本框 删除此文本框 @@ -613,7 +613,7 @@ 数据库未找到！请检查数据库连接串设置。

                  您可以自行编辑“web.config”文件，键名为 “UmbracoDbDSN”

                  - 当自行编辑后，单击重试按钮
                  。 + 当自行编辑后，单击重试按钮
                  。 如何编辑web.config

                  ]]>                   diff --git a/src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx b/src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx index 3ada3db523..aaaf149110 100644 --- a/src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx +++ b/src/Umbraco.Web.UI/umbraco/developer/Packages/editPackage.aspx @@ -189,7 +189,7 @@ - + @@ -204,7 +204,7 @@ during installation and uninstallation.
                  All actions are formed as a xml node, containing data for the action to be performed. - Package actions documentation

                  '; - // updated from patch by Matt Brailsford (https://our.umbraco.org/forum/using/ui-questions/6225-Custom-icon-in-Context-menu#comment39514) + // updated from patch by Matt Brailsford (https://our.umbraco.com/forum/using/ui-questions/6225-Custom-icon-in-Context-menu#comment39514) str += " "; str += ""; if (opts.items[i].icon && opts.items[i].icon.indexOf("/") >= 0) { str += "
                  " + opts.items[i].label + "
                  "; diff --git a/src/Umbraco.Web.UI/web.Template.config b/src/Umbraco.Web.UI/web.Template.config index 7343934292..b4f046b277 100644 --- a/src/Umbraco.Web.UI/web.Template.config +++ b/src/Umbraco.Web.UI/web.Template.config @@ -39,7 +39,7 @@ @@ -339,7 +339,7 @@