Merge branch 'master' of github.com:ONLYOFFICE/CommunityServer-AspNetCore

This commit is contained in:
Alexey Safronov 2019-08-14 14:34:09 +03:00
commit c38e5f6a86
7 changed files with 8726 additions and 1515 deletions

View File

@ -31,11 +31,6 @@
<AutoGen>True</AutoGen>
<DependentUpon>Resource.resx</DependentUpon>
</Compile>
<Compile Update="PublicResources\WebstudioNotifyPatternResource.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>WebstudioNotifyPatternResource.resx</DependentUpon>
</Compile>
<Compile Update="PublicResources\WebPatternResource.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
@ -48,10 +43,6 @@
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>WebPatternResource.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="PublicResources\WebstudioNotifyPatternResource.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>WebstudioNotifyPatternResource.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
@ -144,6 +135,36 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Compile Update="PublicResources\WebstudioNotifyPatternResource.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>WebstudioNotifyPatternResource.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Update="PublicResources\WebstudioNotifyPatternResource.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>WebstudioNotifyPatternResource.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Update="PublicResources\WebstudioNotifyPatternResource.ru.resx">
<DependentUpon>WebstudioNotifyPatternResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="PublicResources\WebstudioNotifyPatternResource.de.resx">
<DependentUpon>WebstudioNotifyPatternResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="PublicResources\WebstudioNotifyPatternResource.es.resx">
<DependentUpon>WebstudioNotifyPatternResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="PublicResources\WebstudioNotifyPatternResource.fr.resx">
<DependentUpon>WebstudioNotifyPatternResource.resx</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Update="PublicResources\WebstudioNotifyPatternResource.it.resx">
<DependentUpon>WebstudioNotifyPatternResource.resx</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Protobuf Include="protos\SmsKeyCacheKey.proto" />
<Protobuf Include="protos\TenantLogoCacheItem.proto" />

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff