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

Merge remote-tracking branch 'origin/dev-v7' into temp-u4-10026

Browse Source
This commit is contained in:
Stephan
2017-06-20 08:41:04 +02:00
parent 464711d3c8 2654f9189f
commit de348a9946
6 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/Umbraco.Web.UI.Client/src/assets/img/installer.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 273 KiB

After

Width:  |  Height:  |  Size: 310 KiB

4
src/Umbraco.Web.UI.Client/src/common/resources/log.resource.js
View File

@@ -67,7 +67,7 @@ function logResource($q, $http, umbRequestHelper) {
umbRequestHelper.getApiUrl(
"logApiBaseUrl",
"GetCurrentUserLog",
[{ logtype: type, sinceDate: since }])),
[{ logtype: type}, {sinceDate: since }])),
'Failed to retrieve log data for current user of type ' + type + ' since ' + since);
},
@@ -98,7 +98,7 @@ function logResource($q, $http, umbRequestHelper) {
umbRequestHelper.getApiUrl(
"logApiBaseUrl",
"GetLog",
[{ logtype: type, sinceDate: since }])),
[{ logtype: type}, {sinceDate: since }])),
'Failed to retrieve log data of type ' + type + ' since ' + since);
}
};

6
src/Umbraco.Web.UI.Client/src/installer/installer.service.js
View File

@@ -20,8 +20,8 @@ angular.module("umbraco.install").factory('installerService', function($rootScop
'Over 420 000 websites are currently powered by Umbraco',
"At least 2 people have named their cat 'Umbraco'",
'On an average day, more than 1000 people download Umbraco',
'<a target="_blank" href="http://umbraco.tv">umbraco.tv</a> is the premier source of Umbraco video tutorials to get you started',
'You can find the world\'s friendliest CMS community at <a target="_blank" href="http://our.umbraco.org">our.umbraco.org</a>',
'<a target="_blank" href="https://umbraco.tv">umbraco.tv</a> is the premier source of Umbraco video tutorials to get you started',
'You can find the world\'s friendliest CMS community at <a target="_blank" href="https://our.umbraco.org">our.umbraco.org</a>',
'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',
@@ -31,7 +31,7 @@ angular.module("umbraco.install").factory('installerService', function($rootScop
"At least 4 people have the Umbraco logo tattooed on them",
"'Umbraco' is the danish name for an allen key",
"Umbraco has been around since 2005, that's a looong time in IT",
"More than 550 people from all over the world meet each year in Denmark in June for our annual conference <a target='_blank' href='http://codegarden17.com'>CodeGarden</a>",
"More than 550 people from all over the world meet each year in Denmark in June for our annual conference <a target='_blank' href='https://umbra.co/codegarden'>CodeGarden</a>",
"While you are installing Umbraco someone else on the other side of the planet is probably doing it too",
"You can extend Umbraco without modifying the source code using either JavaScript or C#",
"Umbraco was installed in more than 165 countries in 2015"

4
src/Umbraco.Web.UI.Client/src/installer/steps/starterkit.html
View File

@@ -1,7 +1,7 @@
<div ng-controller="Umbraco.Installer.PackagesController" id="starterKits">
<h1>Would you like to learn or demo Umbraco?</h1>
<img ng-src="http://our.umbraco.org{{packages[0].thumbnail}}?width=350" style="float: left; padding: 0 15px 50px 0" alt="{{pck.name}}">
<span style="float: left; margin: 0 15px 50px 0; background-color: #efefef; width: 350px; height: 167px;"><img ng-src="http://our.umbraco.org{{packages[0].thumbnail}}?width=350" style="width: 350px;" alt="{{pck.name}}" /></span>
<p>The Starter Kit is a great way to experience some of the ways you can use Umbraco. It's a complete website with textpages, landing pages, blog, product listings and more that's easy to get started with Umbraco.
</p>
<p>
@@ -13,4 +13,4 @@
<a href ng-click="setPackageAndContinue('00000000-0000-0000-0000-000000000000')" class="btn btn-link btn-link-reverse">
No thanks
</a>
</div>
</div>

6
src/Umbraco.Web.UI/umbraco/config/lang/ru.xml
View File

@@ -511,7 +511,7 @@
<key alias="layout">Макет</key>
<key alias="loading">Загрузка</key>
<key alias="locked">БЛОКИРОВКА</key>
<key alias="login">Логин</key>
<key alias="login">Войти</key>
<key alias="logoff">Выйти</key>
<key alias="logout">Выход</key>
<key alias="macro">Макрос</key>
@@ -799,7 +799,7 @@
<key alias="runwayFromScratchText"><![CDATA[
В настоящий момент Ваш сайт абсолютно пустой, что является наилучшим вариантом для старта
"с чистого листа", чтобы начать создавать свои собственные типы документов и шаблоны.
(<a href="http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">Здесь можно узнать об этом подробнее</a>) Вы также можете отложить установку "Runway" на более позднее время. Перейдите к разделу "Для разработчиков" и выберите пункт "Пакеты".
(<a href="http://Umbraco.tv/documentation/videos/for-site-builders/foundation/document-types">Здесь можно узнать об этом подробнее</a>) Вы также можете отложить установку "Runway" на более позднее время. Перейдите к разделу "Разработка" и выберите пункт "Пакеты".
]]></key>
<key alias="runwayHeader">Вы только что установили чистую платформу Umbraco. Какой шаг будет следующим?</key>
<key alias="runwayInstalled">"Runway" установлен</key>
@@ -1119,7 +1119,7 @@
<key alias="concierge">Смотритель</key>
<key alias="content">Содержимое</key>
<key alias="courier">Курьер</key>
<key alias="developer">Для Разработчиков</key>
<key alias="developer">Разработка</key>
<key alias="forms">Формы</key>
<key alias="help" version="7.0">Помощь</key>
<key alias="installer">Мастер конфигурирования Umbraco</key>

2
src/Umbraco.Web/Security/Identity/ExternalSignInAutoLinkOptions.cs
View File

@@ -10,7 +10,7 @@ namespace Umbraco.Web.Security.Identity
/// <summary>
/// Options used to configure auto-linking external OAuth providers
/// </summary>
public sealed class ExternalSignInAutoLinkOptions
public class ExternalSignInAutoLinkOptions
{
public ExternalSignInAutoLinkOptions(
bool autoLinkExternalAccount = false,