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

Merge remote-tracking branch 'origin/v8/dev' into netcore/feature/AB3594_move_exsiting_configuration_to_own_project

Browse Source 
# Conflicts:
#	src/Umbraco.Abstractions/Constants-Conventions.cs
This commit is contained in:
Bjarke Berg
2019-11-13 08:39:13 +01:00
parent 424260ac2b a2551521e4
commit 6b0f7ce038
15 changed files with 120 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/RegisterMember.cshtml
View File

@@ -85,7 +85,7 @@ else
easily change it. For example, if you wanted to render a custom editor for this field called "MyEditor" you would
create a file at ~/Views/Shared/EditorTemplates/MyEditor.cshtml", then you will change the next line of code to
render your specific editor template like:
@Html.EditorFor(m => profileModel.MemberProperties[i].Value, "MyEditor")
@Html.EditorFor(m => registerModel.MemberProperties[i].Value, "MyEditor")
*@
@Html.EditorFor(m => registerModel.MemberProperties[i].Value)
@Html.HiddenFor(m => registerModel.MemberProperties[i].Alias)

30
src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
View File

@@ -2303,4 +2303,34 @@ To manage your website, simply open the Umbraco back office and start adding con
</key>
<key alias="getStarted">To get you started</key>
</area>
<area alias="settingsDashboard">
<key alias="start">Start here</key>
<key alias="startDescription">This section contains the building blocks for your Umbraco site. Follow the below links to find out more about working with the items in the Settings section</key>
<key alias="more">Find out more</key>
<key alias="bulletPointOne">
<![CDATA[
Read more about working with the items in Settings <a class="btn-link -underline" href="https://our.umbraco.com/documentation/Getting-Started/Backoffice/Sections/" target="_blank">in the Documentation section</a> of Our Umbraco
]]>
</key>
<key alias="bulletPointTwo">
<![CDATA[
Ask a question in the <a class="btn-link -underline" href="https://our.umbraco.com/forum" target="_blank">Community Forum</a>
]]>
</key>
<key alias="bulletPointThree">
<![CDATA[
Watch our <a class="btn-link -underline" href="https://umbraco.tv" target="_blank">tutorial videos</a> (some are free, some require a subscription)
]]>
</key>
<key alias="bulletPointFour">
<![CDATA[
Find out about our <a class="btn-link -underline" href="https://umbraco.com/products/" target="_blank">productivity boosting tools and commercial support</a>
]]>
</key>
<key alias="bulletPointFive">
<![CDATA[
Find out about real-life <a class="btn-link -underline" href="https://umbraco.com/training/" target="_blank">training and certification</a> opportunities
]]>
</key>
</area>
</language>

30
src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
View File

@@ -2319,4 +2319,34 @@ To manage your website, simply open the Umbraco back office and start adding con
</key>
<key alias="getStarted">To get you started</key>
</area>
<area alias="settingsDashboard">
<key alias="start">Start here</key>
<key alias="startDescription">This section contains the building blocks for your Umbraco site. Follow the below links to find out more about working with the items in the Settings section</key>
<key alias="more">Find out more</key>
<key alias="bulletPointOne">
<![CDATA[
Read more about working with the items in Settings <a class="btn-link -underline" href="https://our.umbraco.com/documentation/Getting-Started/Backoffice/Sections/" target="_blank">in the Documentation section</a> of Our Umbraco
]]>
</key>
<key alias="bulletPointTwo">
<![CDATA[
Ask a question in the <a class="btn-link -underline" href="https://our.umbraco.com/forum" target="_blank">Community Forum</a>
]]>
</key>
<key alias="bulletPointThree">
<![CDATA[
Watch our <a class="btn-link -underline" href="https://umbraco.tv" target="_blank">tutorial videos</a> (some are free, some require a subscription)
]]>
</key>
<key alias="bulletPointFour">
<![CDATA[
Find out about our <a class="btn-link -underline" href="https://umbraco.com/products/" target="_blank">productivity boosting tools and commercial support</a>
]]>
</key>
<key alias="bulletPointFive">
<![CDATA[
Find out about real-life <a class="btn-link -underline" href="https://umbraco.com/training/" target="_blank">training and certification</a> opportunities
]]>
</key>
</area>
</language>