Merge branch 'r7-office' of https://github.com/ONLYOFFICE/helpcenter into r7-office

This commit is contained in:
Ilya Sobolev 2020-01-29 17:00:48 +03:00
commit 18bd8a7977
4 changed files with 46 additions and 1 deletions

View File

@ -0,0 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is used by the publish/package process of your Web project. You can customize the behavior of this process
by editing this MSBuild file. In order to learn more about this please visit http://go.microsoft.com/fwlink/?LinkID=208121.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<WebPublishMethod>MSDeploy</WebPublishMethod>
<LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<SiteUrlToLaunchAfterPublish />
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<ExcludeApp_Data>True</ExcludeApp_Data>
<MSDeployServiceURL>helpcenter.r7-office.ru</MSDeployServiceURL>
<DeployIisAppPath>test-helpcenter.r7-office.ru</DeployIisAppPath>
<RemoteSitePhysicalPath />
<SkipExtraFilesOnServer>False</SkipExtraFilesOnServer>
<MSDeployPublishMethod>WMSVC</MSDeployPublishMethod>
<EnableMSDeployBackup>True</EnableMSDeployBackup>
<UserName>Administrator</UserName>
<_SavePWD>False</_SavePWD>
<PrecompileBeforePublish>True</PrecompileBeforePublish>
<EnableUpdateable>True</EnableUpdateable>
<DebugSymbols>False</DebugSymbols>
<WDPMergeOption>MergeAllPagesAndControlToASingleAssembly</WDPMergeOption>
<UseMerge>True</UseMerge>
<ContentAssemblyName>ASC.Merge.dll</ContentAssemblyName>
</PropertyGroup>
<Target Name="CustomCollectFiles">
<ItemGroup>
<_XMLFiles Include="Bin\*.xml" />
<_ConfigFiles Include="web.autofac.config" />
<FilesForPackagingFromProject Include="%(_XMLFiles.Identity)">
<DestinationRelativePath>Bin\%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
</FilesForPackagingFromProject>
<FilesForPackagingFromProject Include="%(_ConfigFiles.Identity)">
<DestinationRelativePath>%(RecursiveDir)%(Filename)%(Extension)</DestinationRelativePath>
</FilesForPackagingFromProject>
</ItemGroup>
</Target>
<PropertyGroup>
<CopyAllFilesToSingleFolderForMsdeployDependsOn>CustomCollectFiles;
;</CopyAllFilesToSingleFolderForMsdeployDependsOn>
</PropertyGroup>
</Project>

View File

@ -62,7 +62,7 @@
<li> <li>
<h3><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/VariousControls/LocalizeControls/Toolsandsettings/Toolsandsettings.ascx" /></h3> <h3><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/VariousControls/LocalizeControls/Toolsandsettings/Toolsandsettings.ascx" /></h3>
<ul> <ul>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/MobileApps/4222_mobile_spreadsheet_editor_view_spreadsheet_information/4222_mobile_spreadsheet_editor_view_spreadsheet_information.ascx" /></li> <li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/MobileApps/4222_mobile_spreadsheet_editor_view_spreadsheet_info/4222_mobile_spreadsheet_editor_view_spreadsheet_info.ascx" /></li>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/MobileApps/4223_mobile_spreadsheet_editor_change_app_settings/4223_mobile_spreadsheet_editor_change_app_settings.ascx" /></li> <li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/MobileApps/4223_mobile_spreadsheet_editor_change_app_settings/4223_mobile_spreadsheet_editor_change_app_settings.ascx" /></li>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/MobileApps/4224_mobile_spreadsheet_editor_find_replace/4224_mobile_spreadsheet_editor_find_replace.ascx" /></li> <li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/MobileApps/4224_mobile_spreadsheet_editor_find_replace/4224_mobile_spreadsheet_editor_find_replace.ascx" /></li>
<li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/MobileApps/4225_mobile_spreadsheet_editor_save_export_print/4225_mobile_spreadsheet_editor_save_export_print.ascx" /></li> <li><cc:LocalizeContent runat="Server" ControlName="~/Controls/Help/ArticlesCompleteList/MobileApps/4225_mobile_spreadsheet_editor_save_export_print/4225_mobile_spreadsheet_editor_save_export_print.ascx" /></li>