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

Merge remote-tracking branch 'origin/netcore/netcore' into netcore/task/6973-migrating-authenticationcontroller

Browse Source 
# Conflicts:
#	src/Umbraco.Infrastructure/PropertyEditors/PropertyEditorsComposer.cs
This commit is contained in:
Shannon
2020-11-18 16:02:51 +11:00
parent 7e36bf55b5 dd5f400cf3
commit 99247d7fbe
153 changed files with 1147 additions and 1111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web.UI.Client/src/installer/steps/database.html
View File

@@ -17,11 +17,11 @@
</div>
</div>
<div class="controls" ng-if="installer.current.model.dbType == 0 || installer.current.model.dbType =='SqlCe' ">
<div class="controls" ng-if="installer.current.model.dbType == 'SqlCe' ">
<p>Great! No need to configure anything, you can simply click the <strong>continue</strong> button below to continue to the next step</p>
</div>
<div ng-if="installer.current.model.dbType < 0 || installer.current.model.dbType == 3 || installer.current.model.dbType == 'Custom' ">
<div ng-if="installer.current.model.dbType == 'Custom' ">
<legend>What is the exact connection string we should use?</legend>
<div class="control-group">
<label class="control-label" for="server">Connection string</label>
@@ -32,7 +32,7 @@
</div>
</div>
<div ng-if="installer.current.model.dbType > 0 || installer.current.model.dbType != 'Custom' ">
<div ng-if="installer.current.model.dbType == 'SqlAzure' || installer.current.model.dbType == 'SqlServer' ">
<div class="row">
<legend>Where do we find your database?</legend>
<div class="span6">
@@ -40,7 +40,7 @@
<label class="control-label" for="server">Server</label>
<div class="controls">
<input type="text" id="server" name="server"
placeholder="{{ (installer.current.model.dbType == 2 || installer.current.model.dbType =='SqlAzure') ? 'umbraco-database.database.windows.net' : '127.0.0.1\\SQLEXPRESS'}}"
placeholder="{{ (installer.current.model.dbType == 'SqlAzure') ? 'umbraco-database.database.windows.net' : '127.0.0.1\\SQLEXPRESS'}}"
required ng-model="installer.current.model.server" />
<small class="inline-help">Enter server domain or IP</small>
</div>
@@ -86,7 +86,7 @@
</div>
</div>
<div class="span12 control-group" ng-if="installer.current.model.dbType == 1 || installer.current.model.dbType =='SqlServer' ">
<div class="span12 control-group" ng-if="installer.current.model.dbType =='SqlServer' ">
<div class="controls">
<label class="checkbox">
<input type="checkbox" id="integratedAuth" name="integratedAuth"