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

Merge branch 'temp8' into temp8-remove-legacy-controls

Browse Source 
# Conflicts:
#	src/Umbraco.Web/Editors/DashboardController.cs
This commit is contained in:
Shannon
2019-01-29 22:02:37 +11:00
parent e7181915ff 19686496e6
commit cf1bf123da
131 changed files with 1444 additions and 2357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
View File

@@ -105,7 +105,7 @@
<PackageReference Include="MiniProfiler" Version="3.2.0.157" />
<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="Umbraco.ModelsBuilder.Ui">
<Version>8.0.0-alpha.33</Version>
<Version>8.0.0-alpha.34</Version>
</PackageReference>
<PackageReference Include="Umbraco.SqlServerCE" Version="4.0.0.1" />
</ItemGroup>
@@ -212,6 +212,8 @@
<None Include="Config\Dashboard.Release.config">
<DependentUpon>Dashboard.config</DependentUpon>
<SubType>Designer</SubType>
<None Include="Config\feedProxy.Release.config">
<DependentUpon>feedProxy.config</DependentUpon>
</None>
<Content Include="Umbraco\Install\Views\Index.cshtml" />
<Content Include="Media\Web.config" />
@@ -308,6 +310,7 @@
<Content Include="Config\Dashboard.config">
<SubType>Designer</SubType>
</Content>
<Content Include="Config\404handlers.config" />
<Content Include="Config\tinyMceConfig.config">
<SubType>Designer</SubType>
</Content>

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

@@ -2016,4 +2016,16 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="tabRelationType">Relation Type</key>
<key alias="tabRelations">Relations</key>
</area>
<area alias="dashboardTabs">
<key alias="contentIntro">Getting Started</key>
<key alias="contentRedirectManager">Redirect URL Management</key>
<key alias="mediaFolderBrowser">Content</key>
<key alias="settingsWelcome">Welcome</key>
<key alias="settingsExamine">Examine Management</key>
<key alias="settingsPublishedStatus">Published Status</key>
<key alias="settingsModelsBuilder">Models Builder</key>
<key alias="settingsHealthCheck">Health Check</key>
<key alias="memberIntro">Getting Started</key>
<key alias="formsInstall">Install Umbraco Forms</key>
</area>>
</language>

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

@@ -2049,4 +2049,16 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="tabRelationType">Relation Type</key>
<key alias="tabRelations">Relations</key>
</area>
<area alias="dashboardTabs">
<key alias="contentIntro">Getting Started</key>
<key alias="contentRedirectManager">Redirect URL Management</key>
<key alias="mediaFolderBrowser">Content</key>
<key alias="settingsWelcome">Welcome</key>
<key alias="settingsExamine">Examine Management</key>
<key alias="settingsPublishedStatus">Published Status</key>
<key alias="settingsModelsBuilder">Models Builder</key>
<key alias="settingsHealthCheck">Health Check</key>
<key alias="memberIntro">Getting Started</key>
<key alias="formsInstall">Install Umbraco Forms</key>
</area>
</language>

107
src/Umbraco.Web.UI/config/Dashboard.Release.config
View File

@@ -1,107 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<dashBoard>
<section alias="StartupSettingsDashboardSection">
<areas>
<area>settings</area>
</areas>
<tab caption="Welcome">
<control panelCaption="">
views/dashboard/settings/settingsdashboardintro.html
</control>
</tab>
<tab caption="Examine Management">
<control>
views/dashboard/settings/examinemanagement.html
</control>
</tab>
<tab caption="Published Status">
<control>
views/dashboard/settings/publishedstatus.html
</control>
</tab>
</section>
<section alias="StartupFormsDashboardSection">
<areas>
<area>forms</area>
</areas>
<tab caption="Install Umbraco Forms">
<control panelCaption="">
views/dashboard/forms/formsdashboardintro.html
</control>
</tab>
</section>
<section alias="StartupMediaDashboardSection">
<areas>
<area>media</area>
</areas>
<tab caption="Content">
<control panelCaption="">
views/dashboard/media/mediafolderbrowser.html
</control>
</tab>
</section>
<section alias="StartupDashboardSection">
<access>
<deny>translator</deny>
</access>
<areas>
<area>content</area>
</areas>
<tab caption="Get Started">
<access>
<grant>admin</grant>
</access>
<control panelCaption="">
views/dashboard/default/startupdashboardintro.html
</control>
</tab>
</section>
<section alias="StartupMemberDashboardSection">
<areas>
<area>member</area>
</areas>
<tab caption="Get Started">
<control panelCaption="">
views/dashboard/members/membersdashboardvideos.html
</control>
</tab>
</section>
<section alias="UmbracoModelsBuilder">
<areas>
<area>settings</area>
</areas>
<tab caption="Models Builder">
<control>
/App_Plugins/ModelsBuilder/modelsbuilder.htm
</control>
</tab>
</section>
<section alias="UmbracoHealthCheck">
<areas>
<area>settings</area>
</areas>
<tab caption="Health Check">
<control>
views/dashboard/settings/healthcheck.html
</control>
</tab>
</section>
<section alias="RedirectUrlManagement">
<areas>
<area>content</area>
</areas>
<tab caption="Redirect URL Management">
<control>
views/dashboard/content/redirecturls.html
</control>
</tab>
</section>
</dashBoard>

107
src/Umbraco.Web.UI/config/Dashboard.config
View File

@@ -1,107 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<dashBoard>
<section alias="StartupSettingsDashboardSection">
<areas>
<area>settings</area>
</areas>
<tab caption="Welcome">
<control panelCaption="">
views/dashboard/settings/settingsdashboardintro.html
</control>
</tab>
<tab caption="Examine Management">
<control>
views/dashboard/settings/examinemanagement.html
</control>
</tab>
<tab caption="Published Status">
<control>
views/dashboard/settings/publishedstatus.html
</control>
</tab>
</section>
<section alias="StartupFormsDashboardSection">
<areas>
<area>forms</area>
</areas>
<tab caption="Install Umbraco Forms">
<control panelCaption="">
views/dashboard/forms/formsdashboardintro.html
</control>
</tab>
</section>
<section alias="StartupMediaDashboardSection">
<areas>
<area>media</area>
</areas>
<tab caption="Content">
<control panelCaption="">
views/dashboard/media/mediafolderbrowser.html
</control>
</tab>
</section>
<section alias="StartupDashboardSection">
<access>
<deny>translator</deny>
</access>
<areas>
<area>content</area>
</areas>
<tab caption="Get Started">
<access>
<grant>admin</grant>
</access>
<control panelCaption="">
views/dashboard/default/startupdashboardintro.html
</control>
</tab>
</section>
<section alias="StartupMemberDashboardSection">
<areas>
<area>member</area>
</areas>
<tab caption="Get Started">
<control panelCaption="">
views/dashboard/members/membersdashboardvideos.html
</control>
</tab>
</section>
<section alias="UmbracoModelsBuilder">
<areas>
<area>settings</area>
</areas>
<tab caption="Models Builder">
<control>
/App_Plugins/ModelsBuilder/modelsbuilder.htm
</control>
</tab>
</section>
<section alias="UmbracoHealthCheck">
<areas>
<area>settings</area>
</areas>
<tab caption="Health Check">
<control>
views/dashboard/settings/healthcheck.html
</control>
</tab>
</section>
<section alias="RedirectUrlManagement">
<areas>
<area>content</area>
</areas>
<tab caption="Redirect URL Management">
<control>
views/dashboard/content/redirecturls.html
</control>
</tab>
</section>
</dashBoard>

2
src/Umbraco.Web.UI/web.Template.config
View File

@@ -14,7 +14,6 @@
<sectionGroup name="umbracoConfiguration">
<section name="settings" type="Umbraco.Core.Configuration.UmbracoSettings.UmbracoSettingsSection, Umbraco.Core" requirePermission="false" />
<section name="FileSystemProviders" type="Umbraco.Core.Configuration.FileSystemProvidersSection, Umbraco.Core" requirePermission="false" />
<section name="dashBoard" type="Umbraco.Core.Configuration.Dashboard.DashboardSection, Umbraco.Core" requirePermission="false" />
<section name="HealthChecks" type="Umbraco.Core.Configuration.HealthChecks.HealthChecksSection, Umbraco.Core" requirePermission="false" />
</sectionGroup>
@@ -28,7 +27,6 @@
<umbracoConfiguration>
<settings configSource="config\umbracoSettings.config" />
<FileSystemProviders configSource="config\FileSystemProviders.config" />
<dashBoard configSource="config\Dashboard.config" />
<HealthChecks configSource="config\HealthChecks.config" />
</umbracoConfiguration>