diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..d4e9cb1535 --- /dev/null +++ b/.gitignore @@ -0,0 +1,401 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +# but not Directory.Build.rsp, as it configures directory-level build defaults +!Directory.Build.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.tlog +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio 6 auto-generated project file (contains which files were open etc.) +*.vbp + +# Visual Studio 6 workspace and project file (working project files containing files to include in project) +*.dsw +*.dsp + +# Visual Studio 6 technical files +*.ncb +*.aps + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# Visual Studio History (VSHistory) files +.vshistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +# VS Code files for those working on multiple tools +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ + +# Windows Installer files from build outputs +*.cab +*.msi +*.msix +*.msm +*.msp + +# JetBrains Rider +*.sln.iml \ No newline at end of file diff --git a/Studio.sln b/Studio.sln index fe49403654..e6efc87dab 100644 --- a/Studio.sln +++ b/Studio.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29920.165 +# Visual Studio Version 17 +VisualStudioVersion = 17.13.35931.197 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASC.ActiveDirectory", "common\ASC.ActiveDirectory\ASC.ActiveDirectory.csproj", "{E588E818-F163-470C-802C-3A6E45B36080}" EndProject @@ -121,11 +121,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASC.Files.ThumbnailBuilder" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASC.SsoAuth.Svc", "module\ASC.SsoAuth.Svc\ASC.SsoAuth.Svc.csproj", "{531C54F5-D6F3-4047-8C35-685C6CD94EC7}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9AF8FFC6-4D0C-4A97-A2E0-A2B8B1AB3225}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - EndProjectSection -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASC.Files.AutoCleanUp", "module\ASC.Files.AutoCleanUp\ASC.Files.AutoCleanUp.csproj", "{F120112A-92BB-4F9F-AE3F-3F0459192C9E}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASC.Migration", "module\ASC.Migration\ASC.Migration.csproj", "{72D10CCA-CCF1-4E2F-A17D-443917B154CB}" @@ -134,6 +129,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASC.Api.Migration", "module EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ASC.WebDav.Svc", "module\ASC.WebDav.Svc\ASC.WebDav.Svc.csproj", "{B84EC090-06B6-4960-A847-51017D3B0743}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Элементы решения", "Элементы решения", "{754FC069-D67B-A9D7-50A1-8D1CA196D8F1}" + ProjectSection(SolutionItems) = preProject + .gitignore = .gitignore + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/build/msbuild/build.proj b/build/msbuild/build.proj index 2a0d3f6a8d..69374ac28c 100644 --- a/build/msbuild/build.proj +++ b/build/msbuild/build.proj @@ -1,74 +1,74 @@ - - - - - - - - ..\..\ - Debug - Debug - Restore;Build - Restore;ReBuild - 0 - 0 - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + ..\..\ + Debug + Debug + Restore;Build + Restore;ReBuild + 0 + 0 + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/common/ASC.ActiveDirectory/ASC.ActiveDirectory.csproj b/common/ASC.ActiveDirectory/ASC.ActiveDirectory.csproj index ad6a221d54..65f0e2255e 100644 --- a/common/ASC.ActiveDirectory/ASC.ActiveDirectory.csproj +++ b/common/ASC.ActiveDirectory/ASC.ActiveDirectory.csproj @@ -1,90 +1,23 @@ - - + + - Debug - AnyCPU - {E588E818-F163-470C-802C-3A6E45B36080} + net48 Library - Properties - ASC.ActiveDirectory - ASC.ActiveDirectory - v4.8 - - - 512 ..\..\web\studio\ASC.Web.Studio\bin\ + false + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 ..\..\web\studio\ASC.Web.Studio\bin\ASC.ActiveDirectory.xml CS1591 none - true - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {02C40A64-FE22-41D0-9037-69F0D6F787A9} - ASC.Web.Core - - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - - + + + @@ -101,7 +34,12 @@ - + + + + + + + - \ No newline at end of file diff --git a/common/ASC.Common/ASC.Common.csproj b/common/ASC.Common/ASC.Common.csproj index 42bf18732a..abf97e461d 100644 --- a/common/ASC.Common/ASC.Common.csproj +++ b/common/ASC.Common/ASC.Common.csproj @@ -1,243 +1,52 @@ - - + + - Debug - AnyCPU - 9.0.30729 - 2.0 - {76DE7717-3D4B-4A5B-B740-15B8913DF0CB} Library - ASC.Common - ASC.Common - v4.8 - - - - - 3.5 - ..\..\web\studio\ASC.Web.Studio\bin\ + Debug;MvcOnly;Release - true - full - false - TRACE;DEBUG - prompt - 4 - false - AnyCPU ..\..\web\studio\ASC.Web.Studio\bin\ASC.Common.xml CS1591 none - true - TRACE - prompt - 4 - false + + net48 + false + 1.0.0.0 + Ascensio System SIA + ASC.Common + ASC.Common + + (c) Ascensio System SIA. All rights reserved + en + Apache-2.0 + + + + <_Parameter1> + + + - - - - - - - - + Component - + Component - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -248,9 +57,6 @@ - - - 2.2.9 @@ -262,7 +68,7 @@ 1.6.0.1 - 2.0.9 + 3.1.0 3.1.4 @@ -303,16 +109,16 @@ 4.5.4 + - - - - - + + + + \ No newline at end of file diff --git a/common/ASC.Common/Logging/SpecialFolderPathConverter.cs b/common/ASC.Common/Logging/SpecialFolderPathConverter.cs index d8e37f4ddc..eb8797a26f 100644 --- a/common/ASC.Common/Logging/SpecialFolderPathConverter.cs +++ b/common/ASC.Common/Logging/SpecialFolderPathConverter.cs @@ -24,7 +24,7 @@ namespace ASC.Common.Logging { public class SpecialFolderPathConverter : PatternConverter { - protected override void Convert(TextWriter writer, object state) + public override void Convert(TextWriter writer, object state) { if (string.IsNullOrEmpty(Option)) { diff --git a/common/ASC.Common/Properties/AssemblyInfo.cs b/common/ASC.Common/Properties/AssemblyInfo.cs deleted file mode 100644 index 33a4ea35b3..0000000000 --- a/common/ASC.Common/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("ASC.Common")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Ascensio System SIA")] -[assembly: AssemblyProduct("ASC.Common")] -[assembly: AssemblyCopyright("(c) Ascensio System SIA. All rights reserved")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] -[assembly: ComVisible(false)] -[assembly: Guid("dfaa902e-d55c-477a-b101-8b8a37d7df30")] -[assembly: AssemblyVersion("1.0.0.0")] diff --git a/common/ASC.Core.Common/ASC.Core.Common.csproj b/common/ASC.Core.Common/ASC.Core.Common.csproj index 8579600f60..48884684f6 100644 --- a/common/ASC.Core.Common/ASC.Core.Common.csproj +++ b/common/ASC.Core.Common/ASC.Core.Common.csproj @@ -1,220 +1,48 @@ - - + + - Debug - AnyCPU - 9.0.30729 - 2.0 - {A51D0454-4AFA-46DE-89D4-B03D37E1816C} Library - ASC.Core.Common - ASC.Core.Common - v4.8 - - - - - 3.5 - ..\..\web\studio\ASC.Web.Studio\bin\ + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 - false ..\..\web\studio\ASC.Web.Studio\bin\ASC.Core.Common.xml CS1591 none - true - TRACE - prompt - 4 - false + + net48 + false + 1.0.0.0 + Ascensio System SIA + ASC.Core.Common + ASC.Core.Common + + (c) Ascensio System SIA. All rights reserved + en + Apache-2.0 + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - + - - - 6.2.0 @@ -246,17 +74,17 @@ 13.0.1 + 4.3.2 - - - - + + + \ No newline at end of file diff --git a/common/ASC.Core.Common/Properties/AssemblyInfo.cs b/common/ASC.Core.Common/Properties/AssemblyInfo.cs deleted file mode 100644 index 588e0b771f..0000000000 --- a/common/ASC.Core.Common/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -[assembly: AssemblyTitle("ASC.Core.Common")] -[assembly: AssemblyCompany("Ascensio System SIA")] -[assembly: AssemblyProduct("ASC.Core.Common")] -[assembly: AssemblyCopyright("(c) Ascensio System SIA. All rights reserved")] -[assembly: ComVisible(false)] -[assembly: Guid("3ff04204-4b22-4899-bcde-07edfcbb5355")] -[assembly: AssemblyVersion("1.0.0.0")] diff --git a/common/ASC.Data.Backup/ASC.Data.Backup.csproj b/common/ASC.Data.Backup/ASC.Data.Backup.csproj index 7730dcfc5a..bf93281b0a 100644 --- a/common/ASC.Data.Backup/ASC.Data.Backup.csproj +++ b/common/ASC.Data.Backup/ASC.Data.Backup.csproj @@ -1,23 +1,8 @@ - - + + - Debug - AnyCPU - 9.0.30729 - 2.0 - {FE7E290C-9F36-41EF-A58D-5504C24CCD16} + net48 Library - Properties - ASC.Data.Backup - ASC.Data.Backup - v4.8 - 512 - - - - - 3.5 - publish\ true Disk @@ -34,104 +19,24 @@ false true ..\..\web\studio\ASC.Web.Studio\bin\ + false + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 - false ..\..\web\studio\ASC.Web.Studio\bin\ASC.Data.Backup.xml CS1591 none - true - TRACE - prompt - 4 false - false - - - + True True BackupResource.resx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Code - - - Code - - - Code - - - - - - - - - - - - - - Code - - - - - - - - - @@ -166,29 +71,11 @@ - - {e7be6ce8-f6b0-4b9b-831b-ba0c85c8d130} - ASC.Web.Studio - - - {8c534af7-5696-4e68-9ff4-ffc311893c10} - ASC.Web.Files - - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {3f6b420f-abd3-4b5a-9f4c-5d61ffbb01de} - ASC.Data.Storage - - - - + + + + + @@ -205,11 +92,9 @@ - + ResXFileCodeGenerator BackupResource.Designer.cs - - \ No newline at end of file diff --git a/common/ASC.Data.Encryption/ASC.Data.Encryption.csproj b/common/ASC.Data.Encryption/ASC.Data.Encryption.csproj index 60cd3da273..1d646cb82e 100644 --- a/common/ASC.Data.Encryption/ASC.Data.Encryption.csproj +++ b/common/ASC.Data.Encryption/ASC.Data.Encryption.csproj @@ -1,61 +1,45 @@ - - - + + - Debug - AnyCPU - {448851D4-E525-4ACC-9AE4-7AEC289445BC} Library - Properties - ASC.Data.Encryption - ASC.Data.Encryption - v4.8 - 512 - true ..\..\web\studio\ASC.Web.Studio\bin\ + Debug;MvcOnly;Release + net48 + false + 1.0.0.0 + Ascensio System SIA + ASC.Data.Encryption + ASC.Data.Encryption + + (c) Ascensio System SIA. All rights reserved + en + Apache-2.0 + + + <_Parameter1> + + + <_Parameter1> + + + + <_Parameter1>false + + + <_Parameter1>448851d4-e525-4acc-9ae4-7aec289445bc + + - true - full - false ..\..\web\studio\ASC.Web.Studio\bin\ - DEBUG;TRACE - prompt - 4 ..\..\web\studio\ASC.Web.Studio\bin\ASC.Data.Encryption.xml CS1591 - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - + + - \ No newline at end of file diff --git a/common/ASC.Data.Encryption/Properties/AssemblyInfo.cs b/common/ASC.Data.Encryption/Properties/AssemblyInfo.cs deleted file mode 100644 index cc066a973a..0000000000 --- a/common/ASC.Data.Encryption/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("ASC.Data.Encryption")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Ascensio System SIA")] -[assembly: AssemblyProduct("ASC.Data.Encryption")] -[assembly: AssemblyCopyright("(c) Ascensio System SIA. All rights reserved")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("448851d4-e525-4acc-9ae4-7aec289445bc")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/common/ASC.Data.Storage.Encryption/ASC.Data.Storage.Encryption.csproj b/common/ASC.Data.Storage.Encryption/ASC.Data.Storage.Encryption.csproj index 3d40c22102..74a75fe4da 100644 --- a/common/ASC.Data.Storage.Encryption/ASC.Data.Storage.Encryption.csproj +++ b/common/ASC.Data.Storage.Encryption/ASC.Data.Storage.Encryption.csproj @@ -1,68 +1,27 @@ - - - + + - Debug - AnyCPU - {D7EAC337-B897-44EA-870A-E8B33E780351} + net48 Library - Properties - ASC.Data.Storage.Encryption - ASC.Data.Storage.Encryption - v4.8 - 512 ..\..\web\studio\ASC.Web.Studio\bin\ + false + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 ..\..\web\studio\ASC.Web.Studio\bin\ASC.Data.Storage.Encryption.xml CS1591 none - true - TRACE - prompt - 4 - - - - - - + + + + - - {e7be6ce8-f6b0-4b9b-831b-ba0c85c8d130} - ASC.Web.Studio - - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {3f6b420f-abd3-4b5a-9f4c-5d61ffbb01de} - ASC.Data.Storage - - - - - - - - @@ -70,5 +29,4 @@ 5.1.2 - \ No newline at end of file diff --git a/common/ASC.Data.Storage.Migration/ASC.Data.Storage.Migration.csproj b/common/ASC.Data.Storage.Migration/ASC.Data.Storage.Migration.csproj index 8c459a9246..222adf4b6d 100644 --- a/common/ASC.Data.Storage.Migration/ASC.Data.Storage.Migration.csproj +++ b/common/ASC.Data.Storage.Migration/ASC.Data.Storage.Migration.csproj @@ -1,67 +1,25 @@ - - - + + - Debug - AnyCPU - {43B9FADB-AB2B-4810-9353-E23C6E45C6A3} + net48 Library - Properties - ASC.Data.Storage.Migration - ASC.Data.Storage.Migration - v4.8 - 512 ..\..\web\studio\ASC.Web.Studio\bin\ + false + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 ..\..\web\studio\ASC.Web.Studio\bin\ASC.Data.Storage.Migration.xml CS1591 none - true - TRACE - prompt - 4 - - - + + + - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {3f6b420f-abd3-4b5a-9f4c-5d61ffbb01de} - ASC.Data.Storage - - - - - - - - - \ No newline at end of file diff --git a/common/ASC.Data.Storage/ASC.Data.Storage.csproj b/common/ASC.Data.Storage/ASC.Data.Storage.csproj index e57305c64e..ff0cdbcbcd 100644 --- a/common/ASC.Data.Storage/ASC.Data.Storage.csproj +++ b/common/ASC.Data.Storage/ASC.Data.Storage.csproj @@ -1,24 +1,8 @@ - - + + - Debug - AnyCPU - 9.0.30729 - 2.0 - {3F6B420F-ABD3-4B5A-9F4C-5D61FFBB01DE} Library - Properties - ASC.Data.Storage - ASC.Data.Storage - v4.8 - 512 OnBuildSuccess - - - - - 3.5 - publish\ true Disk @@ -35,84 +19,19 @@ false true ..\..\web\studio\ASC.Web.Studio\bin\ + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 - false ..\..\web\studio\ASC.Web.Studio\bin\ASC.Data.Storage.xml CS1591 none - true - TRACE - prompt - 4 - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + net48 + false + False @@ -126,25 +45,13 @@ - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {448851d4-e525-4acc-9ae4-7aec289445bc} - ASC.Data.Encryption - + + + - - - 2.0.3 @@ -172,9 +79,7 @@ - - \ No newline at end of file diff --git a/common/ASC.IPSecurity/ASC.IPSecurity.csproj b/common/ASC.IPSecurity/ASC.IPSecurity.csproj index d683d03f38..91b0c7969a 100644 --- a/common/ASC.IPSecurity/ASC.IPSecurity.csproj +++ b/common/ASC.IPSecurity/ASC.IPSecurity.csproj @@ -1,68 +1,56 @@ - - - + + - Debug - AnyCPU - {2FF2177F-2D1A-4396-84EB-51F14FD99385} Library - Properties - ASC.IPSecurity - ASC.IPSecurity - v4.8 - 512 ..\..\web\studio\ASC.Web.Studio\bin\ + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 ..\..\web\studio\ASC.Web.Studio\bin\ASC.IPSecurity.xml CS1591 none - true - TRACE - prompt - 4 + + + net48 + false + 1.0.0.0 + Ascensio System SIA + ASC.IpSecurity + ASC.IpSecurity + + (c) Ascensio System SIA. All rights reserved + en + Apache-2.0 - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - - - - - - - - + + <_Parameter1> + + + <_Parameter1> + + + + <_Parameter1>false + + + <_Parameter1>23937894-101b-4415-9090-0824bee14466 + - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - + + - + - - - \ No newline at end of file diff --git a/common/ASC.IPSecurity/Properties/AssemblyInfo.cs b/common/ASC.IPSecurity/Properties/AssemblyInfo.cs deleted file mode 100644 index decfe981f3..0000000000 --- a/common/ASC.IPSecurity/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("ASC.IpSecurity")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Ascensio System SIA")] -[assembly: AssemblyProduct("ASC.IpSecurity")] -[assembly: AssemblyCopyright("(c) Ascensio System SIA. All rights reserved")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("23937894-101b-4415-9090-0824bee14466")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/common/ASC.Notify.Textile/ASC.Notify.Textile.csproj b/common/ASC.Notify.Textile/ASC.Notify.Textile.csproj index cd3b831615..83090ff838 100644 --- a/common/ASC.Notify.Textile/ASC.Notify.Textile.csproj +++ b/common/ASC.Notify.Textile/ASC.Notify.Textile.csproj @@ -1,23 +1,7 @@ - - + + - Debug - AnyCPU - 9.0.30729 - 2.0 - {659C514B-DD2C-41E3-A40E-4701216B1EA2} Library - Properties - ASC.Notify.Textile - ASC.Notify.Textile - v4.8 - 512 - - - - - 3.5 - publish\ true Disk @@ -34,33 +18,19 @@ false true ..\..\web\studio\ASC.Web.Studio\bin\ + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 - false ..\..\web\studio\ASC.Web.Studio\bin\ASC.Notify.Textile.xml CS1591 none - true - TRACE - prompt - 4 - false - - - - - - - + + net48 + false + @@ -99,7 +69,7 @@ NotifyTemplateResource.resx - + Designer PublicResXFileCodeGenerator NotifyTemplateResource.Designer.cs @@ -122,7 +92,7 @@ NotifyTemplateResource.resx - + True True NotifyTemplateResource.resx @@ -147,21 +117,9 @@ - - {02c40a64-fe22-41d0-9037-69f0d6f787a9} - ASC.Web.Core - - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - - + + + @@ -171,5 +129,26 @@ - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/common/TMResourceManager/ASC.Resource.Data/ASC.Resource.Data.csproj b/common/TMResourceManager/ASC.Resource.Data/ASC.Resource.Data.csproj index f62dc6e306..15c81bb2b0 100644 --- a/common/TMResourceManager/ASC.Resource.Data/ASC.Resource.Data.csproj +++ b/common/TMResourceManager/ASC.Resource.Data/ASC.Resource.Data.csproj @@ -1,73 +1,25 @@ - - + + - Debug - AnyCPU - 9.0.30729 - 2.0 - {826533D1-AE21-4D14-87BA-67EB9D81D03E} + net48 Library - Properties - ASC.Resource.Data - ASC.Resource.Data - v4.8 - 512 - - - - - 3.5 - ..\..\..\web\studio\ASC.Web.Studio\bin\ + false + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 - false ..\..\..\web\studio\ASC.Web.Studio\bin\ASC.Resource.Data.xml CS1591 none - true - TRACE - prompt - 4 - false - - - - - - - - - - - - - - - - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - - + + + 13.0.1 @@ -75,11 +27,4 @@ 1.4.2 - - - - - - - \ No newline at end of file diff --git a/module/ASC.Api/ASC.Api.CRM/ASC.Api.CRM.csproj b/module/ASC.Api/ASC.Api.CRM/ASC.Api.CRM.csproj index 0a946a756d..7243e4f966 100644 --- a/module/ASC.Api/ASC.Api.CRM/ASC.Api.CRM.csproj +++ b/module/ASC.Api/ASC.Api.CRM/ASC.Api.CRM.csproj @@ -1,23 +1,8 @@ - - + + - Debug - AnyCPU - 9.0.30729 - 2.0 - {CAC3DDF1-BFBE-4309-80BA-726E504381C2} + net48 Library - Properties - ASC.Api.CRM - ASC.Api.CRM - v4.8 - 512 - - - - - 3.5 - publish\ true Disk @@ -35,64 +20,16 @@ true ..\..\..\web\studio\ASC.Web.Studio\bin\ $(OutputPath)\ASC.Api.CRM.XML + false + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 1591 - false none - true - TRACE - prompt - 4 - false 1591 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False @@ -106,73 +43,22 @@ - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {3f6b420f-abd3-4b5a-9f4c-5d61ffbb01de} - ASC.Data.Storage - - - {02c40a64-fe22-41d0-9037-69f0d6f787a9} - ASC.Web.Core - - - {e7be6ce8-f6b0-4b9b-831b-ba0c85c8d130} - ASC.Web.Studio - - - {48efb880-3d76-4b21-b31e-1007c0062b5c} - ASC.Web.CRM - - - {8c534af7-5696-4e68-9ff4-ffc311893c10} - ASC.Web.Files - - - {11acb4ca-a305-4caa-8546-392c6dafc7c4} - ASC.Web.Projects - - - {ae1a0e06-6cd4-4e1d-8209-22bbbd6d5652} - ASC.ElasticSearch - - - {bd8a18a5-60c5-4411-9719-0aa11b4be0e9} - ASC.MessagingSystem - - - {481B0D9C-B2F8-4DE9-8597-BA8D24585099} - ASC.FederatedLogin - - - {988536c1-4b89-4649-8f77-5c16f55d95d1} - ASC.VoipService - - - {991f00f2-71cb-4694-bb6a-4696071bd94d} - ASC.Api.Documents - - - {49f07fff-98a5-47d2-a9e9-a46b98c41245} - ASC.Api.Core - - - {32adbd01-6262-48d7-a69b-0515b03db90e} - ASC.Api.Employee - - - {42d9ee99-8fcc-4bdc-b1e2-692fec48ad20} - ASC.Specific - - - - + + + + + + + + + + + + + + + + @@ -182,5 +68,4 @@ 13.0.1 - \ No newline at end of file diff --git a/module/ASC.Api/ASC.Api.Calendar/ASC.Api.Calendar.csproj b/module/ASC.Api/ASC.Api.Calendar/ASC.Api.Calendar.csproj index c45b01b13b..ffdb2b5640 100644 --- a/module/ASC.Api/ASC.Api.Calendar/ASC.Api.Calendar.csproj +++ b/module/ASC.Api/ASC.Api.Calendar/ASC.Api.Calendar.csproj @@ -1,23 +1,7 @@ - - + + - Debug - AnyCPU - 9.0.30729 - 2.0 - {5F7DC7BD-D831-449A-908D-5A419E4DFE71} Library - Properties - ASC.Api.Calendar - ASC.Api.Calendar - v4.8 - 512 - - - - - 3.5 - publish\ true Disk @@ -35,60 +19,25 @@ true ..\..\..\web\studio\ASC.Web.Studio\bin\ ..\..\..\web\studio\ASC.Web.Studio\bin\ASC.Api.Calendar.XML + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 1591 - false none - true - TRACE - prompt - 4 1591 - false + + + net48 + false - - - - - - - - - - - - - - - - - - - - - - - - - - - - + CalendarPatterns.resx True True - CalendarApiResource.resx @@ -137,7 +86,7 @@ CalendarApiResource.resx - + Designer PublicResXFileCodeGenerator CalendarApiResource.Designer.cs @@ -163,22 +112,11 @@ CalendarApiResource.resx - + True True CalendarApiResource.resx - - - - - - - - - - - CalendarApiResource.resx @@ -247,7 +185,7 @@ CalendarPatternResource.resx - + Designer PublicResXFileCodeGenerator CalendarPatternResource.Designer.cs @@ -273,12 +211,12 @@ CalendarPatternResource.resx - + True True CalendarPatternResource.resx - + PublicResXFileCodeGenerator CalendarPatterns.Designer.cs @@ -306,41 +244,17 @@ - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {02c40a64-fe22-41d0-9037-69f0d6f787a9} - ASC.Web.Core - - - {E7BE6CE8-F6B0-4B9B-831B-BA0C85C8D130} - ASC.Web.Studio - - - {8c534af7-5696-4e68-9ff4-ffc311893c10} - ASC.Web.Files - - - {49f07fff-98a5-47d2-a9e9-a46b98c41245} - ASC.Api.Core - - - {42d9ee99-8fcc-4bdc-b1e2-692fec48ad20} - ASC.Specific - + + + + + + + - - - 4.2.0 @@ -355,5 +269,61 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/module/ASC.Api/ASC.Api.Client/ASC.Api.Client.csproj b/module/ASC.Api/ASC.Api.Client/ASC.Api.Client.csproj index d78a522361..4ed8483aae 100644 --- a/module/ASC.Api/ASC.Api.Client/ASC.Api.Client.csproj +++ b/module/ASC.Api/ASC.Api.Client/ASC.Api.Client.csproj @@ -1,51 +1,48 @@ - - - + + - Debug - AnyCPU - {012B11CA-B298-404A-8923-978903CDFC25} Library - Properties - ASC.Api.Client - ASC.Api.Client - v4.8 - 512 - ..\..\..\web\studio\ASC.Web.Studio\bin\ + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 - false 1591 ..\..\..\web\studio\ASC.Web.Studio\bin\ASC.Api.Client.xml CS1591 none - true - TRACE - prompt - 4 - false 1591 + + net48 + false + 1.0.0.0 + Ascensio System SIA + ASC.Api.Client + ASC.Api.Client + + (c) Ascensio System SIA. All rights reserved + en + Apache-2.0 + - - - - - - - - - - + + <_Parameter1> + + + <_Parameter1> + + + + <_Parameter1>false + + + <_Parameter1>9da4dd68-a0d3-4c44-bdd6-aa3a79b6e822 + @@ -53,17 +50,10 @@ - - - - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - + - \ No newline at end of file diff --git a/module/ASC.Api/ASC.Api.Client/Properties/AssemblyInfo.cs b/module/ASC.Api/ASC.Api.Client/Properties/AssemblyInfo.cs deleted file mode 100644 index 5f369a508e..0000000000 --- a/module/ASC.Api/ASC.Api.Client/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("ASC.Api.Client")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Ascensio System SIA")] -[assembly: AssemblyProduct("ASC.Api.Client")] -[assembly: AssemblyCopyright("(c) Ascensio System SIA. All rights reserved")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("9da4dd68-a0d3-4c44-bdd6-aa3a79b6e822")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/module/ASC.Api/ASC.Api.Community/ASC.Api.Community.csproj b/module/ASC.Api/ASC.Api.Community/ASC.Api.Community.csproj index 3ff9394120..fbbbd2f3ab 100644 --- a/module/ASC.Api/ASC.Api.Community/ASC.Api.Community.csproj +++ b/module/ASC.Api/ASC.Api.Community/ASC.Api.Community.csproj @@ -1,23 +1,8 @@ - - + + + - Debug - AnyCPU - 9.0.30729 - 2.0 - {F112A4A5-556F-4680-A7D5-8726803FD507} Library - Properties - ASC.Api.Community - ASC.Api.Community - v4.8 - 512 - - - - - 3.5 - publish\ true Disk @@ -35,60 +20,20 @@ true ..\..\..\web\studio\ASC.Web.Studio\bin\ ..\..\..\web\studio\ASC.Web.Studio\bin\ASC.Api.Community.XML + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 1591 - false none - true - TRACE - prompt - 4 1591 - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + net48 + false + false + False @@ -102,41 +47,14 @@ - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {02c40a64-fe22-41d0-9037-69f0d6f787a9} - ASC.Web.Core - - - {e7be6ce8-f6b0-4b9b-831b-ba0c85c8d130} - ASC.Web.Studio - - - {11ba9805-752f-4f6f-a876-6ba56f0eb9de} - ASC.Web.Community - - - {49f07fff-98a5-47d2-a9e9-a46b98c41245} - ASC.Api.Core - - - {32adbd01-6262-48d7-a69b-0515b03db90e} - ASC.Api.Employee - - - {42d9ee99-8fcc-4bdc-b1e2-692fec48ad20} - ASC.Specific - - - - + + + + + + + + @@ -144,9 +62,6 @@ - - - \ No newline at end of file diff --git a/module/ASC.Api/ASC.Api.Community/Events/EventApi.cs b/module/ASC.Api/ASC.Api.Community/Events/EventApi.cs index 3e9d3a5dc5..1a0e0dc186 100644 --- a/module/ASC.Api/ASC.Api.Community/Events/EventApi.cs +++ b/module/ASC.Api/ASC.Api.Community/Events/EventApi.cs @@ -99,7 +99,7 @@ public EventWrapperFull CreateEvent(string content, string title, FeedType type) if (type != FeedType.News && type != FeedType.Order && type != FeedType.Advert && type != FeedType.Poll) throw new ArgumentOutOfRangeException(string.Format("Unknown feed type: {0}.", type)); - var feed = new Feed + var feed = new ASC.Web.Community.News.Code.Feed { Caption = title, Text = content, diff --git a/module/ASC.Api/ASC.Api.Documents/ASC.Api.Documents.csproj b/module/ASC.Api/ASC.Api.Documents/ASC.Api.Documents.csproj index cac65b8b19..0cdbafccd3 100644 --- a/module/ASC.Api/ASC.Api.Documents/ASC.Api.Documents.csproj +++ b/module/ASC.Api/ASC.Api.Documents/ASC.Api.Documents.csproj @@ -1,106 +1,30 @@ - - + + - Debug - AnyCPU - 9.0.30729 - 2.0 - {991F00F2-71CB-4694-BB6A-4696071BD94D} + net48 Library - Properties - ASC.Api.Documents - ASC.Api.Documents - v4.8 - 512 - - - - - - - 3.5 - + ..\..\..\web\studio\ASC.Web.Studio\bin\ $(OutputPath)\ASC.Api.Documents.XML 1591;1572;1573 - - - true - full - false - DEBUG;TRACE - prompt - 4 - false + false + Debug;MvcOnly;Release none - true - TRACE - prompt - 4 - false - - - - - - - - - - - - - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {3f6b420f-abd3-4b5a-9f4c-5d61ffbb01de} - ASC.Data.Storage - - - {02c40a64-fe22-41d0-9037-69f0d6f787a9} - ASC.Web.Core - - - {e7be6ce8-f6b0-4b9b-831b-ba0c85c8d130} - ASC.Web.Studio - - - {8c534af7-5696-4e68-9ff4-ffc311893c10} - ASC.Web.Files - - - {BD8A18A5-60C5-4411-9719-0AA11B4BE0E9} - ASC.MessagingSystem - - - {481b0d9c-b2f8-4de9-8597-ba8d24585099} - ASC.FederatedLogin - - - {49f07fff-98a5-47d2-a9e9-a46b98c41245} - ASC.Api.Core - - - {32adbd01-6262-48d7-a69b-0515b03db90e} - ASC.Api.Employee - - - {42d9ee99-8fcc-4bdc-b1e2-692fec48ad20} - ASC.Specific - - - - + + + + + + + + + + + @@ -110,5 +34,4 @@ - \ No newline at end of file diff --git a/module/ASC.Api/ASC.Api.Feed/ASC.Api.Feed.csproj b/module/ASC.Api/ASC.Api.Feed/ASC.Api.Feed.csproj index 284ca66e9f..bb89bed5ad 100644 --- a/module/ASC.Api/ASC.Api.Feed/ASC.Api.Feed.csproj +++ b/module/ASC.Api/ASC.Api.Feed/ASC.Api.Feed.csproj @@ -1,23 +1,8 @@ - - + + - Debug - AnyCPU - 9.0.30729 - 2.0 - {3D4B5ED7-49B9-45F5-9DAF-19D30520C877} + net48 Library - Properties - ASC.Api.Feed - ASC.Api.Feed - v4.8 - 512 - - - - - 3.5 - publish\ true Disk @@ -35,31 +20,16 @@ true ..\..\..\web\studio\ASC.Web.Studio\bin\ ..\..\..\web\studio\ASC.Web.Studio\bin\ASC.Api.Feed.XML + false + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 1591 - false none - true - TRACE - prompt - 4 - false 1591 - - - - - False @@ -73,32 +43,10 @@ - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {b0431ec9-21d8-4d96-b333-6dd430031c82} - ASC.Feed - - - {49f07fff-98a5-47d2-a9e9-a46b98c41245} - ASC.Api.Core - - - {42d9ee99-8fcc-4bdc-b1e2-692fec48ad20} - ASC.Specific - - - - - - - + + + + + - \ No newline at end of file diff --git a/module/ASC.Api/ASC.Api.Mail/ASC.Api.Mail.csproj b/module/ASC.Api/ASC.Api.Mail/ASC.Api.Mail.csproj index 63f938d850..a2da1db975 100644 --- a/module/ASC.Api/ASC.Api.Mail/ASC.Api.Mail.csproj +++ b/module/ASC.Api/ASC.Api.Mail/ASC.Api.Mail.csproj @@ -1,23 +1,8 @@ - - + + - Debug - AnyCPU - 9.0.30729 - 2.0 - {5EEC68A0-657C-45F3-8079-EBDB5CB9597A} + net48 Library - Properties - ASC.Api.Mail - ASC.Api.Mail - v4.8 - 512 - - - - - 3.5 - publish\ true Disk @@ -35,50 +20,16 @@ true ..\..\..\web\studio\ASC.Web.Studio\bin\ ..\..\..\web\studio\ASC.Web.Studio\bin\ASC.Api.Mail.XML + false + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 1591 - false none - true - TRACE - prompt - 4 - false 1591 - - - - - - - Code - - - - - - - - - - - - - - - - - False @@ -92,63 +43,22 @@ - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {3f6b420f-abd3-4b5a-9f4c-5d61ffbb01de} - ASC.Data.Storage - - - {02c40a64-fe22-41d0-9037-69f0d6f787a9} - ASC.Web.Core - - - {1ef9c7d8-f92e-48b3-9a86-78e431abc306} - ASC.Web.Mail - - - {e7be6ce8-f6b0-4b9b-831b-ba0c85c8d130} - ASC.Web.Studio - - - {8c534af7-5696-4e68-9ff4-ffc311893c10} - ASC.Web.Files - - - {7080343d-fbe7-423a-9405-4f883f6e235b} - ASC.Mail - - - {bd8a18a5-60c5-4411-9719-0aa11b4be0e9} - ASC.MessagingSystem - - - {481b0d9c-b2f8-4de9-8597-ba8d24585099} - ASC.FederatedLogin - False - - - {49f07fff-98a5-47d2-a9e9-a46b98c41245} - ASC.Api.Core - - - {42d9ee99-8fcc-4bdc-b1e2-692fec48ad20} - ASC.Specific - - - - + + + + + + + + + + + + 4.2.0 - \ No newline at end of file diff --git a/module/ASC.Api/ASC.Api.MailServer/ASC.Api.MailServer.csproj b/module/ASC.Api/ASC.Api.MailServer/ASC.Api.MailServer.csproj index 0ea4459318..1e2631d242 100644 --- a/module/ASC.Api/ASC.Api.MailServer/ASC.Api.MailServer.csproj +++ b/module/ASC.Api/ASC.Api.MailServer/ASC.Api.MailServer.csproj @@ -1,80 +1,30 @@ - - - + + - Debug - AnyCPU - {9F815B60-7918-440E-83A2-22CB200AD6F5} + net48 Library - Properties - ASC.Api.MailServer - ASC.Api.MailServer - v4.8 - 512 ..\..\..\web\studio\ASC.Web.Studio\bin\ ..\..\..\web\studio\ASC.Web.Studio\bin\ASC.Api.MailServer.XML + false + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 1591 - false none - true - TRACE - prompt - 4 - false 1591 - - - - - - - - + + + + + + + - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {02c40a64-fe22-41d0-9037-69f0d6f787a9} - ASC.Web.Core - - - {e7be6ce8-f6b0-4b9b-831b-ba0c85c8d130} - ASC.Web.Studio - - - {DED03705-E8C4-46D2-B634-55062850BE83} - ASC.Mail.Server - - - {7080343d-fbe7-423a-9405-4f883f6e235b} - ASC.Mail - - - {49f07fff-98a5-47d2-a9e9-a46b98c41245} - ASC.Api.Core - + - - - - \ No newline at end of file diff --git a/module/ASC.Api/ASC.Api.Migration/ASC.Api.Migration.csproj b/module/ASC.Api/ASC.Api.Migration/ASC.Api.Migration.csproj index 2e01acdb06..0fe1661669 100644 --- a/module/ASC.Api/ASC.Api.Migration/ASC.Api.Migration.csproj +++ b/module/ASC.Api/ASC.Api.Migration/ASC.Api.Migration.csproj @@ -1,76 +1,29 @@ - - - + + - Debug - AnyCPU - {2DA19D11-DC5A-48BB-B0CC-D070A5A2C363} Library - Properties - ASC.Api.Migration - ASC.Api.Migration - v4.8 - 512 - true ..\..\..\web\studio\ASC.Web.Studio\bin\ ..\..\..\web\studio\ASC.Web.Studio\bin\ASC.Api.Migration.xml + Debug;MvcOnly;Release - - true - full - false - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - TRACE - prompt - 4 + + net48 + false - - - - - - - - - - - - - - + + + + + - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {A51D0454-4AFA-46DE-89D4-B03D37E1816C} - ASC.Core.Common - - - {e7be6ce8-f6b0-4b9b-831b-ba0c85c8d130} - ASC.Web.Studio - - - {72d10cca-ccf1-4e2f-a17d-443917b154cb} - ASC.Migration - - - {49f07fff-98a5-47d2-a9e9-a46b98c41245} - ASC.Api.Core - + + + - \ No newline at end of file diff --git a/module/ASC.Api/ASC.Api.Portal/ASC.Api.Portal.csproj b/module/ASC.Api/ASC.Api.Portal/ASC.Api.Portal.csproj index 43c38a58ac..903bf42f26 100644 --- a/module/ASC.Api/ASC.Api.Portal/ASC.Api.Portal.csproj +++ b/module/ASC.Api/ASC.Api.Portal/ASC.Api.Portal.csproj @@ -1,23 +1,7 @@ - - + + - Debug - AnyCPU - 9.0.30729 - 2.0 - {F44E3466-0489-4EB2-9E28-B526D61A9F5D} Library - Properties - ASC.Api.Portal - ASC.Api.Portal - v4.8 - 512 - - - - - 3.5 - publish\ true Disk @@ -35,30 +19,19 @@ true ..\..\..\web\studio\ASC.Web.Studio\bin\ ..\..\..\web\studio\ASC.Web.Studio\bin\ASC.Api.Portal.XML + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 1591 - false none - true - TRACE - prompt - 4 1591 - false - - - - + + net48 + false + False @@ -72,46 +45,16 @@ - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {02c40a64-fe22-41d0-9037-69f0d6f787a9} - ASC.Web.Core - - - {ae1a0e06-6cd4-4e1d-8209-22bbbd6d5652} - ASC.ElasticSearch - - - {bd8a18a5-60c5-4411-9719-0aa11b4be0e9} - ASC.MessagingSystem - - - {481B0D9C-B2F8-4DE9-8597-BA8D24585099} - ASC.FederatedLogin - - - {49f07fff-98a5-47d2-a9e9-a46b98c41245} - ASC.Api.Core - - - {e7be6ce8-f6b0-4b9b-831b-ba0c85c8d130} - ASC.Web.Studio - - - - + + + + + + + + - - - \ No newline at end of file diff --git a/module/ASC.Api/ASC.Api.Projects/ASC.Api.Projects.csproj b/module/ASC.Api/ASC.Api.Projects/ASC.Api.Projects.csproj index 806cc7d7a1..314cc95036 100644 --- a/module/ASC.Api/ASC.Api.Projects/ASC.Api.Projects.csproj +++ b/module/ASC.Api/ASC.Api.Projects/ASC.Api.Projects.csproj @@ -1,136 +1,35 @@ - - + + - Debug - AnyCPU - 9.0.30729 - 2.0 - {2D26FA73-F6A7-4154-B620-3E9D0433E3A6} + net48 + false + false Library - Properties - ASC.Api.Projects - ASC.Api.Projects - v4.8 - 512 - - - - - 3.5 - ..\..\..\web\studio\ASC.Web.Studio\bin\ $(OutputPath)\ASC.Api.Projects.XML + false + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 1591 - false none - true - TRACE - prompt - 4 1591 - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {02c40a64-fe22-41d0-9037-69f0d6f787a9} - ASC.Web.Core - - - {e7be6ce8-f6b0-4b9b-831b-ba0c85c8d130} - ASC.Web.Studio - - - {48efb880-3d76-4b21-b31e-1007c0062b5c} - ASC.Web.CRM - - - {8c534af7-5696-4e68-9ff4-ffc311893c10} - ASC.Web.Files - - - {11acb4ca-a305-4caa-8546-392c6dafc7c4} - ASC.Web.Projects - - - {bd8a18a5-60c5-4411-9719-0aa11b4be0e9} - ASC.MessagingSystem - - - {991f00f2-71cb-4694-bb6a-4696071bd94d} - ASC.Api.Documents - - - {49f07fff-98a5-47d2-a9e9-a46b98c41245} - ASC.Api.Core - - - {32adbd01-6262-48d7-a69b-0515b03db90e} - ASC.Api.Employee - - - {42d9ee99-8fcc-4bdc-b1e2-692fec48ad20} - ASC.Specific - - - - + + + + + + + + + + + + @@ -140,5 +39,4 @@ 13.0.1 - \ No newline at end of file diff --git a/module/ASC.Api/ASC.Api.Sample/ASC.Api.Sample.csproj b/module/ASC.Api/ASC.Api.Sample/ASC.Api.Sample.csproj index be3f78e6ba..3d1f9b316a 100644 --- a/module/ASC.Api/ASC.Api.Sample/ASC.Api.Sample.csproj +++ b/module/ASC.Api/ASC.Api.Sample/ASC.Api.Sample.csproj @@ -1,23 +1,8 @@ - - + + - Debug - AnyCPU - 9.0.30729 - 2.0 - {323DCA76-71A6-4543-A037-94F3FE6C7B3D} + net48 Library - Properties - ASC.Api.Sample - ASC.Api.Sample - v4.8 - 512 - - - - - 3.5 - publish\ true Disk @@ -35,45 +20,18 @@ true ..\..\..\web\studio\ASC.Web.Studio\bin\ ..\..\..\web\studio\ASC.Web.Studio\bin\ASC.Api.Sample.XML + false + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 1591 - false none - true - TRACE - prompt - 4 1591 - false - - + + - - - {1ae21bb5-267c-443e-852e-1753ac1bd04d} - ASC.Web.Sample - - - {49f07fff-98a5-47d2-a9e9-a46b98c41245} - ASC.Api.Core - - - - - - - - - \ No newline at end of file diff --git a/module/ASC.Api/ASC.Api.Security/ASC.Api.Security.csproj b/module/ASC.Api/ASC.Api.Security/ASC.Api.Security.csproj index f13351bf31..0a9dca5b07 100644 --- a/module/ASC.Api/ASC.Api.Security/ASC.Api.Security.csproj +++ b/module/ASC.Api/ASC.Api.Security/ASC.Api.Security.csproj @@ -1,95 +1,41 @@ - - - + + - Debug - AnyCPU - {98286B12-AC86-4A1C-A539-AAF1A7A5C24D} Library - Properties - ASC.Api.Security - ASC.Api.Security - v4.8 - 512 ..\..\..\web\studio\ASC.Web.Studio\bin\ + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 1591 ..\..\..\web\studio\ASC.Web.Studio\bin\ASC.Api.Security.xml CS1591 none - true - TRACE - prompt - 4 1591 + + net48 + false + - - - - - - - - - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {02C40A64-FE22-41D0-9037-69F0D6F787A9} - ASC.Web.Core - - - {e7be6ce8-f6b0-4b9b-831b-ba0c85c8d130} - ASC.Web.Studio - - - {8c534af7-5696-4e68-9ff4-ffc311893c10} - ASC.Web.Files - - - {2c111161-b7c5-4869-9f52-ea725e64ba40} - ASC.AuditTrail - - - {bd8a18a5-60c5-4411-9719-0aa11b4be0e9} - ASC.MessagingSystem - - - {49f07fff-98a5-47d2-a9e9-a46b98c41245} - ASC.Api.Core - - - {42d9ee99-8fcc-4bdc-b1e2-692fec48ad20} - ASC.Specific - - - - + + + + + + + + + - - 27.1.1 + - \ No newline at end of file diff --git a/module/ASC.Api/ASC.Api.Settings/ASC.Api.Settings.csproj b/module/ASC.Api/ASC.Api.Settings/ASC.Api.Settings.csproj index 5e2ba21513..d302870c43 100644 --- a/module/ASC.Api/ASC.Api.Settings/ASC.Api.Settings.csproj +++ b/module/ASC.Api/ASC.Api.Settings/ASC.Api.Settings.csproj @@ -1,23 +1,8 @@ - - + + - Debug - AnyCPU - 9.0.30729 - 2.0 - {64368BDC-06CB-43D3-8537-3BA8705BCD25} + net48 Library - Properties - ASC.Api.Settings - ASC.Api.Settings - v4.8 - 512 - - - - - 3.5 - publish\ true Disk @@ -35,49 +20,19 @@ true ..\..\..\web\studio\ASC.Web.Studio\bin\ ..\..\..\web\studio\ASC.Web.Studio\bin\ASC.Api.Settings.XML - false + false + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 1591 - false none - true - TRACE - prompt - 4 1591 - false bin\MvcOnly\ - false - - - - - - - - - - - - - - - - - - False @@ -91,61 +46,19 @@ - - {e588e818-f163-470c-802c-3a6e45b36080} - ASC.ActiveDirectory - - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {3f6b420f-abd3-4b5a-9f4c-5d61ffbb01de} - ASC.Data.Storage - - - {2ff2177f-2d1a-4396-84eb-51f14fd99385} - ASC.IPSecurity - - - {02c40a64-fe22-41d0-9037-69f0d6f787a9} - ASC.Web.Core - - - {e7be6ce8-f6b0-4b9b-831b-ba0c85c8d130} - ASC.Web.Studio - - - {8c534af7-5696-4e68-9ff4-ffc311893c10} - ASC.Web.Files - - - {7080343d-fbe7-423a-9405-4f883f6e235b} - ASC.Mail - - - {bd8a18a5-60c5-4411-9719-0aa11b4be0e9} - ASC.MessagingSystem - - - {49f07fff-98a5-47d2-a9e9-a46b98c41245} - ASC.Api.Core - - - {32adbd01-6262-48d7-a69b-0515b03db90e} - ASC.Api.Employee - - - {42d9ee99-8fcc-4bdc-b1e2-692fec48ad20} - ASC.Specific - - - - + + + + + + + + + + + + + @@ -156,8 +69,6 @@ - - \ No newline at end of file diff --git a/module/ASC.Api/ASC.Api/ASC.Api.Core.csproj b/module/ASC.Api/ASC.Api/ASC.Api.Core.csproj index 8c79a75301..f18320e0aa 100644 --- a/module/ASC.Api/ASC.Api/ASC.Api.Core.csproj +++ b/module/ASC.Api/ASC.Api/ASC.Api.Core.csproj @@ -1,23 +1,10 @@ - - + + - Debug - AnyCPU - {49F07FFF-98A5-47D2-A9E9-A46B98C41245} - 9.0.21022 - 2.0 Library false ASC.Api - v4.8 - 512 ASC.Api - - - - - 3.5 - publish\ true Disk @@ -34,132 +21,29 @@ false true ..\..\..\web\studio\ASC.Web.Studio\bin\ + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 true 1591 - false ..\..\..\web\studio\ASC.Web.Studio\bin\ASC.Api.xml CS1591 none - true - TRACE - prompt - 4 1591 - false bin\MvcOnly\ - false + + + net48 + false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {02C40A64-FE22-41D0-9037-69F0D6F787A9} - ASC.Web.Core - + + + @@ -173,9 +57,6 @@ true - - - 6.2.0 @@ -185,12 +66,10 @@ - - - - - - + + + + \ No newline at end of file diff --git a/module/ASC.Api/ASC.Employee/ASC.Api.Employee.csproj b/module/ASC.Api/ASC.Employee/ASC.Api.Employee.csproj index c2bd673041..62005cb8c9 100644 --- a/module/ASC.Api/ASC.Employee/ASC.Api.Employee.csproj +++ b/module/ASC.Api/ASC.Employee/ASC.Api.Employee.csproj @@ -1,23 +1,7 @@ - - + + - Debug - AnyCPU - 9.0.30729 - 2.0 - {32ADBD01-6262-48D7-A69B-0515B03DB90E} Library - Properties - ASC.Api.Employee - ASC.Api.Employee - v4.8 - 512 - - - - - 3.5 - publish\ true Disk @@ -35,38 +19,19 @@ true ..\..\..\web\studio\ASC.Web.Studio\bin\ ..\..\..\web\studio\ASC.Web.Studio\bin\ASC.Api.Employee.XML + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 - false 1591 - false none - true - TRACE - prompt - 4 1591 - false - - - - - - - - - - - + + net48 + false + False @@ -80,54 +45,18 @@ - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {02c40a64-fe22-41d0-9037-69f0d6f787a9} - ASC.Web.Core - - - {e7be6ce8-f6b0-4b9b-831b-ba0c85c8d130} - ASC.Web.Studio - - - {7ea1e14f-fc71-48a7-9786-1fb0cd9ec1cd} - ASC.Web.People - - - {104d045a-f9cc-4dd7-b04d-8da7543435dd} - ASC.Data.Reassigns - - - {bd8a18a5-60c5-4411-9719-0aa11b4be0e9} - ASC.MessagingSystem - - - {481b0d9c-b2f8-4de9-8597-ba8d24585099} - ASC.FederatedLogin - - - {49f07fff-98a5-47d2-a9e9-a46b98c41245} - ASC.Api.Core - - - {42d9ee99-8fcc-4bdc-b1e2-692fec48ad20} - ASC.Specific - - - - + + + + + + + + + + - - - \ No newline at end of file diff --git a/module/ASC.Api/ASC.Specific/ASC.Specific.csproj b/module/ASC.Api/ASC.Specific/ASC.Specific.csproj index 73b26d4922..2bfcf8591c 100644 --- a/module/ASC.Api/ASC.Specific/ASC.Specific.csproj +++ b/module/ASC.Api/ASC.Specific/ASC.Specific.csproj @@ -1,109 +1,33 @@ - - + + - Debug - AnyCPU - 9.0.30729 - 2.0 - {42D9EE99-8FCC-4BDC-B1E2-692FEC48AD20} Library - Properties - ASC.Specific - ASC.Specific - v4.8 - 512 - - - - - 3.5 - ..\..\..\web\studio\ASC.Web.Studio\bin\ ..\..\..\web\studio\ASC.Web.Studio\bin\ASC.Specific.XML + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 1591 - false none - true - TRACE - prompt - 4 1591 - false + + + net48 + false + false - - - - - - - - - - - - - - - - - - - {e588e818-f163-470c-802c-3a6e45b36080} - ASC.ActiveDirectory - - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - False - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - False - - - {2FF2177F-2D1A-4396-84EB-51F14FD99385} - ASC.IPSecurity - - - {02c40a64-fe22-41d0-9037-69f0d6f787a9} - ASC.Web.Core - False - - - {e7be6ce8-f6b0-4b9b-831b-ba0c85c8d130} - ASC.Web.Studio - False - - - {bd8a18a5-60c5-4411-9719-0aa11b4be0e9} - ASC.MessagingSystem - False - - - {481B0D9C-B2F8-4DE9-8597-BA8D24585099} - ASC.FederatedLogin - False - - - {49f07fff-98a5-47d2-a9e9-a46b98c41245} - ASC.Api.Core - False - - - - + + + + + + + + + @@ -117,8 +41,6 @@ - - \ No newline at end of file diff --git a/module/ASC.AuditTrail/ASC.AuditTrail.csproj b/module/ASC.AuditTrail/ASC.AuditTrail.csproj index 9bab10afa1..ebd9e0b9b5 100644 --- a/module/ASC.AuditTrail/ASC.AuditTrail.csproj +++ b/module/ASC.AuditTrail/ASC.AuditTrail.csproj @@ -1,57 +1,19 @@ - - - + + - Debug - AnyCPU - {2C111161-B7C5-4869-9F52-EA725E64BA40} + net48 Library - Properties - ASC.AuditTrail - ASC.AuditTrail - v4.8 - 512 ..\..\web\studio\ASC.Web.Studio\bin\ + false + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 ..\..\web\studio\ASC.Web.Studio\bin\ASC.AuditTrail.xml CS1591 none - true - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - AuditReportResource.resx @@ -95,7 +57,7 @@ AuditReportResource.resx - + Designer PublicResXFileCodeGenerator AuditReportResource.Designer.cs @@ -121,7 +83,7 @@ AuditReportResource.resx - + True True AuditReportResource.resx @@ -143,27 +105,10 @@ - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - False - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - False - - - {02C40A64-FE22-41D0-9037-69F0D6F787A9} - ASC.Web.Core - - - {bd8a18a5-60c5-4411-9719-0aa11b4be0e9} - ASC.MessagingSystem - - - - + + + + @@ -173,5 +118,32 @@ 13.0.1 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/module/ASC.Data.Reassigns/ASC.Data.Reassigns.csproj b/module/ASC.Data.Reassigns/ASC.Data.Reassigns.csproj index 24f9ff7653..2d06937db8 100644 --- a/module/ASC.Data.Reassigns/ASC.Data.Reassigns.csproj +++ b/module/ASC.Data.Reassigns/ASC.Data.Reassigns.csproj @@ -1,102 +1,36 @@ - - - + + - Debug - AnyCPU - {104D045A-F9CC-4DD7-B04D-8DA7543435DD} + net48 + false + false Library - Properties - ASC.Data.Reassigns - ASC.Data.Reassigns - v4.8 - 512 - + false + Debug;MvcOnly;Release - true - full - false ..\..\web\studio\ASC.Web.Studio\bin\ - DEBUG;TRACE - prompt - 4 - false ..\..\web\studio\ASC.Web.Studio\bin\ASC.Data.Reassigns.xml CS1591 none - true - bin\Release\ - TRACE - prompt - 4 - false - - - - - - - - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {3f6b420f-abd3-4b5a-9f4c-5d61ffbb01de} - ASC.Data.Storage - - - {02c40a64-fe22-41d0-9037-69f0d6f787a9} - ASC.Web.Core - - - {e7be6ce8-f6b0-4b9b-831b-ba0c85c8d130} - ASC.Web.Studio - - - {48efb880-3d76-4b21-b31e-1007c0062b5c} - ASC.Web.CRM - - - {8c534af7-5696-4e68-9ff4-ffc311893c10} - ASC.Web.Files - - - {11acb4ca-a305-4caa-8546-392c6dafc7c4} - ASC.Web.Projects - - - {7080343d-fbe7-423a-9405-4f883f6e235b} - ASC.Mail - - - {bd8a18a5-60c5-4411-9719-0aa11b4be0e9} - ASC.MessagingSystem - - - - + + + + + + + + + + 6.2.0 - - \ No newline at end of file diff --git a/module/ASC.ElasticSearch/ASC.ElasticSearch.csproj b/module/ASC.ElasticSearch/ASC.ElasticSearch.csproj index 13712d56b2..715f6679ba 100644 --- a/module/ASC.ElasticSearch/ASC.ElasticSearch.csproj +++ b/module/ASC.ElasticSearch/ASC.ElasticSearch.csproj @@ -1,68 +1,49 @@ - - - + + - Debug - AnyCPU - {AE1A0E06-6CD4-4E1D-8209-22BBBD6D5652} Library - Properties - ASC.ElasticSearch - ASC.ElasticSearch - v4.8 - 512 ..\..\web\studio\ASC.Web.Studio\bin\ + Debug;MvcOnly;Release + net48 + false + 1.0.0.0 + Ascensio System SIA + ASC.ElasticSearch + ASC.ElasticSearch + + (c) Ascensio System SIA. All rights reserved + en + Apache-2.0 + + + <_Parameter1> + + + <_Parameter1> + + + + <_Parameter1>false + + + <_Parameter1>47042728-2b3e-4888-94c2-5e0d57f9a5ea + + + - true - full - false - DEBUG;TRACE - prompt - 4 ..\..\web\studio\ASC.Web.Studio\bin\ASC.ElasticSearch.xml CS1591 none - true - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - - + + @@ -76,15 +57,6 @@ - - - \ No newline at end of file diff --git a/module/ASC.ElasticSearch/Properties/AssemblyInfo.cs b/module/ASC.ElasticSearch/Properties/AssemblyInfo.cs deleted file mode 100644 index 7218480027..0000000000 --- a/module/ASC.ElasticSearch/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("ASC.ElasticSearch")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Ascensio System SIA")] -[assembly: AssemblyProduct("ASC.ElasticSearch")] -[assembly: AssemblyCopyright("(c) Ascensio System SIA. All rights reserved")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("47042728-2b3e-4888-94c2-5e0d57f9a5ea")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/module/ASC.Feed.Aggregator/ASC.Feed.Aggregator.csproj b/module/ASC.Feed.Aggregator/ASC.Feed.Aggregator.csproj index 96316512a6..d42f984f66 100644 --- a/module/ASC.Feed.Aggregator/ASC.Feed.Aggregator.csproj +++ b/module/ASC.Feed.Aggregator/ASC.Feed.Aggregator.csproj @@ -1,23 +1,8 @@ - - + + - Debug - AnyCPU - 9.0.30729 - 2.0 - {D88D20AA-55B4-480B-A320-29A69FB6B150} + net48 Library - Properties - ASC.Feed.Aggregator - ASC.Feed.Aggregator - v4.8 - 512 - - - - - 3.5 - publish\ true Disk @@ -34,59 +19,16 @@ false true ..\..\web\studio\ASC.Web.Studio\bin\ + false + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 - false ..\..\web\studio\ASC.Web.Studio\bin\ASC.Feed.Aggregator.xml CS1591 none - true - TRACE - prompt - 4 - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False @@ -100,42 +42,15 @@ - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {02c40a64-fe22-41d0-9037-69f0d6f787a9} - ASC.Web.Core - - - {e7be6ce8-f6b0-4b9b-831b-ba0c85c8d130} - ASC.Web.Studio - - - {11ba9805-752f-4f6f-a876-6ba56f0eb9de} - ASC.Web.Community - - - {48efb880-3d76-4b21-b31e-1007c0062b5c} - ASC.Web.CRM - - - {8c534af7-5696-4e68-9ff4-ffc311893c10} - ASC.Web.Files - - - {11acb4ca-a305-4caa-8546-392c6dafc7c4} - ASC.Web.Projects - - - {b0431ec9-21d8-4d96-b333-6dd430031c82} - ASC.Feed - + + + + + + + + + @@ -145,5 +60,4 @@ - \ No newline at end of file diff --git a/module/ASC.Feed/ASC.Feed.csproj b/module/ASC.Feed/ASC.Feed.csproj index 17cffd3679..4f607e5da3 100644 --- a/module/ASC.Feed/ASC.Feed.csproj +++ b/module/ASC.Feed/ASC.Feed.csproj @@ -1,23 +1,8 @@ - - + + - Debug - AnyCPU - 9.0.30729 - 2.0 - {B0431EC9-21D8-4D96-B333-6DD430031C82} + net48 Library - Properties - ASC.Feed - ASC.Feed - v4.8 - 512 - - - - - 3.5 - publish\ true Disk @@ -34,40 +19,16 @@ false true ..\..\web\studio\ASC.Web.Studio\bin\ + false + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 - false ..\..\web\studio\ASC.Web.Studio\bin\ASC.Feed.xml CS1591 none - true - TRACE - prompt - 4 - false - - - - - - - - - - - - - - False @@ -81,17 +42,8 @@ - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - - + + @@ -99,7 +51,7 @@ - + + - \ No newline at end of file diff --git a/module/ASC.Files.AutoCleanUp/ASC.Files.AutoCleanUp.csproj b/module/ASC.Files.AutoCleanUp/ASC.Files.AutoCleanUp.csproj index 7b1acbdc67..2cbc7440e7 100644 --- a/module/ASC.Files.AutoCleanUp/ASC.Files.AutoCleanUp.csproj +++ b/module/ASC.Files.AutoCleanUp/ASC.Files.AutoCleanUp.csproj @@ -1,69 +1,24 @@ - - - + + - Debug - AnyCPU - {F120112A-92BB-4F9F-AE3F-3F0459192C9E} + net48 Library - Properties - ASC.Files.AutoCleanUp - ASC.Files.AutoCleanUp - v4.8 - 512 - true + false + Debug;MvcOnly;Release - true - full - false ..\..\web\studio\ASC.Web.Studio\bin\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - {76DE7717-3D4B-4A5B-B740-15B8913DF0CB} - ASC.Common - - - {A51D0454-4AFA-46DE-89D4-B03D37E1816C} - ASC.Core.Common - - - {02C40A64-FE22-41D0-9037-69F0D6F787A9} - ASC.Web.Core - - - {8c534af7-5696-4e68-9ff4-ffc311893c10} - ASC.Web.Files - - - - + + + + - - \ No newline at end of file diff --git a/module/ASC.Files.Thirdparty/ASC.Files.Thirdparty.csproj b/module/ASC.Files.Thirdparty/ASC.Files.Thirdparty.csproj index 963893afe5..8a6eddfe8d 100644 --- a/module/ASC.Files.Thirdparty/ASC.Files.Thirdparty.csproj +++ b/module/ASC.Files.Thirdparty/ASC.Files.Thirdparty.csproj @@ -1,134 +1,27 @@ - - - + + - Debug - AnyCPU - {D51D3E43-6047-45DD-A0FA-321CE7C3885B} + net48 Library - Properties - ASC.Files.Thirdparty - ASC.Files.Thirdparty - v4.8 - 512 ..\..\web\studio\ASC.Web.Studio\bin\ - - + false + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 ..\..\web\studio\ASC.Web.Studio\bin\ASC.Files.Thirdparty.xml CS1591 none - true - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - Code - - - Code - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {3f6b420f-abd3-4b5a-9f4c-5d61ffbb01de} - ASC.Data.Storage - - - {02c40a64-fe22-41d0-9037-69f0d6f787a9} - ASC.Web.Core - - - {e7be6ce8-f6b0-4b9b-831b-ba0c85c8d130} - ASC.Web.Studio - - - {8c534af7-5696-4e68-9ff4-ffc311893c10} - ASC.Web.Files - - - {481b0d9c-b2f8-4de9-8597-ba8d24585099} - ASC.FederatedLogin - - - - + + + + + + + @@ -157,5 +50,4 @@ 4.3.4 - \ No newline at end of file diff --git a/module/ASC.Files.ThumbnailBuilder/ASC.Files.ThumbnailBuilder.csproj b/module/ASC.Files.ThumbnailBuilder/ASC.Files.ThumbnailBuilder.csproj index 1e18d3be12..6b63f78820 100644 --- a/module/ASC.Files.ThumbnailBuilder/ASC.Files.ThumbnailBuilder.csproj +++ b/module/ASC.Files.ThumbnailBuilder/ASC.Files.ThumbnailBuilder.csproj @@ -1,79 +1,25 @@ - - - + + - Debug - AnyCPU - {B1834872-9BA4-4DF5-9670-45E54D1B80EA} Library - Properties - ASC.Files.ThumbnailBuilder - ASC.Files.ThumbnailBuilder - v4.8 - 512 - + Debug;MvcOnly;Release - true - full - false ..\..\web\studio\ASC.Web.Studio\bin\ - DEBUG;TRACE - prompt - 4 - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + + net48 + false - - - - - - - - - - - - - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {02c40a64-fe22-41d0-9037-69f0d6f787a9} - ASC.Web.Core - - - {8c534af7-5696-4e68-9ff4-ffc311893c10} - ASC.Web.Files - - - - + + + + - - \ No newline at end of file diff --git a/module/ASC.Mail.Server/ASC.Mail.Server/ASC.Mail.Server.csproj b/module/ASC.Mail.Server/ASC.Mail.Server/ASC.Mail.Server.csproj index 80bfc76ff5..bf2d054da8 100644 --- a/module/ASC.Mail.Server/ASC.Mail.Server/ASC.Mail.Server.csproj +++ b/module/ASC.Mail.Server/ASC.Mail.Server/ASC.Mail.Server.csproj @@ -1,77 +1,47 @@ - - - + + - Debug - AnyCPU - {DED03705-E8C4-46D2-B634-55062850BE83} + net48 Library - Properties - ASC.Mail.Server - ASC.Mail.Server - v4.8 - 512 + Debug;MvcOnly;Release + false + 1.0.0.0 + Ascensio System SIA + ASC.Mail.Server + ASC.Mail.Server + + (c) Ascensio System SIA. All rights reserved + en + Apache-2.0 + + + <_Parameter1> + + + <_Parameter1> + + + + <_Parameter1>false + + + <_Parameter1>9493543d-7a3d-4295-81ae-0f0fe878e31c + + + - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 bin\Debug\ASC.Mail.Server.xml CS1591 none - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - - + @@ -81,12 +51,4 @@ 106.12.0 - - \ No newline at end of file diff --git a/module/ASC.Mail.Server/ASC.Mail.Server/Properties/AssemblyInfo.cs b/module/ASC.Mail.Server/ASC.Mail.Server/Properties/AssemblyInfo.cs deleted file mode 100644 index 04e145e134..0000000000 --- a/module/ASC.Mail.Server/ASC.Mail.Server/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("ASC.Mail.Server")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Ascensio System SIA")] -[assembly: AssemblyProduct("ASC.Mail.Server")] -[assembly: AssemblyCopyright("(c) Ascensio System SIA. All rights reserved")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("9493543d-7a3d-4295-81ae-0f0fe878e31c")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/module/ASC.Mail/ASC.Mail/ASC.Mail.csproj b/module/ASC.Mail/ASC.Mail/ASC.Mail.csproj index 077dd312c2..ced29350d0 100644 --- a/module/ASC.Mail/ASC.Mail/ASC.Mail.csproj +++ b/module/ASC.Mail/ASC.Mail/ASC.Mail.csproj @@ -1,24 +1,13 @@ - - + + - Debug - AnyCPU - 9.0.30729 - 2.0 - {7080343D-FBE7-423A-9405-4F883F6E235B} + net48 + false + false + false + false Library - Properties - ASC.Mail - ASC.Mail - v4.8 - 512 ..\..\..\ - - - - - 3.5 - publish\ true Disk @@ -36,404 +25,19 @@ true $(TrunkDir)\web\studio\ASC.Web.Studio\bin\ 0168 + false + Debug;MvcOnly;Release - true - full - false TRACE;DEBUG;MESSAGES_CHAINS - prompt - 4 - false - false ..\..\..\web\studio\ASC.Web.Studio\bin\ASC.Mail.xml CS1591 none - true TRACE;MESSAGES_CHAINS - prompt - 4 - false false - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - False @@ -447,54 +51,18 @@ - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {3f6b420f-abd3-4b5a-9f4c-5d61ffbb01de} - ASC.Data.Storage - - - {02c40a64-fe22-41d0-9037-69f0d6f787a9} - ASC.Web.Core - - - {E7BE6CE8-F6B0-4B9B-831B-BA0C85C8D130} - ASC.Web.Studio - - - {48efb880-3d76-4b21-b31e-1007c0062b5c} - ASC.Web.CRM - - - {8c534af7-5696-4e68-9ff4-ffc311893c10} - ASC.Web.Files - - - {49f07fff-98a5-47d2-a9e9-a46b98c41245} - ASC.Api.Core - - - {42d9ee99-8fcc-4bdc-b1e2-692fec48ad20} - ASC.Specific - - - {ae1a0e06-6cd4-4e1d-8209-22bbbd6d5652} - ASC.ElasticSearch - - - {ded03705-e8c4-46d2-b634-55062850be83} - ASC.Mail.Server - - - {481b0d9c-b2f8-4de9-8597-ba8d24585099} - ASC.FederatedLogin - + + + + + + + + + + + + @@ -521,7 +89,7 @@ MailCoreResource.resx - + Designer PublicResXFileCodeGenerator MailCoreResource.Designer.cs @@ -529,7 +97,7 @@ MailCoreResource.resx - + True True MailCoreResource.resx @@ -544,9 +112,6 @@ MailCoreResource.resx - - - 21.12.22.2 @@ -575,6 +140,7 @@ 106.12.0 + 4.3.0 @@ -583,12 +149,18 @@ - - + + + + + + + + + + + + - - - - - + \ No newline at end of file diff --git a/module/ASC.MessagingSystem/ASC.MessagingSystem.csproj b/module/ASC.MessagingSystem/ASC.MessagingSystem.csproj index e5da1a92cb..a16c5b6ac7 100644 --- a/module/ASC.MessagingSystem/ASC.MessagingSystem.csproj +++ b/module/ASC.MessagingSystem/ASC.MessagingSystem.csproj @@ -1,64 +1,27 @@ - - - + + - Debug - AnyCPU - {BD8A18A5-60C5-4411-9719-0AA11B4BE0E9} Library - Properties - ASC.MessagingSystem - ASC.MessagingSystem - v4.8 - 512 ..\..\web\studio\ASC.Web.Studio\bin\ - - + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 ..\..\web\studio\ASC.Web.Studio\bin\ASC.MessagingSystem.xml CS1591 none - true - TRACE - prompt - 4 + + + net48 + false - - - - - - - - - - - - - - - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - + + @@ -68,5 +31,4 @@ 3.1.47 - \ No newline at end of file diff --git a/module/ASC.Migration/ASC.Migration.csproj b/module/ASC.Migration/ASC.Migration.csproj index 7650716538..f81584b7d0 100644 --- a/module/ASC.Migration/ASC.Migration.csproj +++ b/module/ASC.Migration/ASC.Migration.csproj @@ -1,159 +1,30 @@ - - - + + - Debug - AnyCPU - {72D10CCA-CCF1-4E2F-A17D-443917B154CB} + net48 Library ..\..\web\studio\ASC.Web.Studio\bin\ - ASC.Migration - ASC.Migration - v4.8 - 512 - true - true - - - AnyCPU - true - full - false - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - TRACE - prompt - 4 + false + Debug;MvcOnly;Release - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + True True MigrationResource.resx - - - - - {76DE7717-3D4B-4A5B-B740-15B8913DF0CB} - ASC.Common - - - {A51D0454-4AFA-46DE-89D4-B03D37E1816C} - ASC.Core.Common - - - {02C40A64-FE22-41D0-9037-69F0D6F787A9} - ASC.Web.Core - - - {8c534af7-5696-4e68-9ff4-ffc311893c10} - ASC.Web.Files - - - {5f7dc7bd-d831-449a-908d-5a419e4dfe71} - ASC.Api.Calendar - - - {49F07FFF-98A5-47D2-A9E9-A46B98C41245} - ASC.Api.Core - - - {7080343D-FBE7-423A-9405-4F883F6E235B} - ASC.Mail - + + + + + + + @@ -162,12 +33,13 @@ 1.6.0.1 + + - + ResXFileCodeGenerator MigrationResource.Designer.cs - \ No newline at end of file diff --git a/module/ASC.Notify/ASC.Notify/ASC.Notify.csproj b/module/ASC.Notify/ASC.Notify/ASC.Notify.csproj index af2e5412e8..b80e6e3c8e 100644 --- a/module/ASC.Notify/ASC.Notify/ASC.Notify.csproj +++ b/module/ASC.Notify/ASC.Notify/ASC.Notify.csproj @@ -1,23 +1,8 @@ - - + + - Debug - AnyCPU - 9.0.30729 - 2.0 - {8484A675-1C93-4D87-8FF2-7530A5711208} + net48 Library - Properties - ASC.Notify - ASC.Notify - v4.8 - 512 - - - - - 3.5 - publish\ true Disk @@ -34,42 +19,16 @@ false true ..\..\..\web\studio\ASC.Web.Studio\bin\ + false + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 - false ..\..\..\web\studio\ASC.Web.Studio\bin\ASC.Notify.xml CS1591 none - true - TRACE - prompt - 4 - false - - - - - - - - - - - - - - - - False @@ -83,25 +42,10 @@ - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {02c40a64-fe22-41d0-9037-69f0d6f787a9} - ASC.Web.Core - - - {e7be6ce8-f6b0-4b9b-831b-ba0c85c8d130} - ASC.Web.Studio - - - - + + + + @@ -117,5 +61,9 @@ - + + + + + \ No newline at end of file diff --git a/module/ASC.Radicale/ASC.Radicale.csproj b/module/ASC.Radicale/ASC.Radicale.csproj index 2f233f22f3..b734632c22 100644 --- a/module/ASC.Radicale/ASC.Radicale.csproj +++ b/module/ASC.Radicale/ASC.Radicale.csproj @@ -1,69 +1,37 @@ - - - + + - Debug - AnyCPU - {2570461D-81AB-4D75-9C7B-E8B0A8826386} + net48 Library - Properties - ASC.Radicale - ASC.Radicale - v4.8 - 512 - + false + Debug;MvcOnly;Release - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 bin\Debug\ASC.Radicale.xml CS1591 none - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - + + - - + Always - + Always - + Always - @@ -71,5 +39,4 @@ 5.1.2 - \ No newline at end of file diff --git a/module/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj b/module/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj index 2622bbaae9..d9b541902a 100644 --- a/module/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj +++ b/module/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj @@ -1,65 +1,25 @@ - - - + + - Debug - AnyCPU - {2DADEAD3-0FE9-4199-9817-41A32E6BF450} + net48 Library - Properties - ASC.Socket.IO.Svc - ASC.Socket.IO.Svc - v4.8 - 512 + false + Debug;MvcOnly;Release - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 bin\Debug\ASC.Socket.IO.Svc.xml CS1591 none - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - - + + 1.0.3-rc11 - - \ No newline at end of file diff --git a/module/ASC.SsoAuth.Svc/ASC.SsoAuth.Svc.csproj b/module/ASC.SsoAuth.Svc/ASC.SsoAuth.Svc.csproj index 2d51ee3303..9b1896c738 100644 --- a/module/ASC.SsoAuth.Svc/ASC.SsoAuth.Svc.csproj +++ b/module/ASC.SsoAuth.Svc/ASC.SsoAuth.Svc.csproj @@ -1,54 +1,19 @@ - - - + + - Debug - AnyCPU - {531C54F5-D6F3-4047-8C35-685C6CD94EC7} + net48 Library - Properties - ASC.SsoAuth.Svc - ASC.SsoAuth.Svc - v4.8 - 512 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 + false + Debug;MvcOnly;Release none - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {A51D0454-4AFA-46DE-89D4-B03D37E1816C} - ASC.Core.Common - - - - + + - @@ -56,12 +21,4 @@ 5.1.2 - - \ No newline at end of file diff --git a/module/ASC.TeamLabSvc/ASC.TeamLabSvc/ASC.TeamLabSvc.csproj b/module/ASC.TeamLabSvc/ASC.TeamLabSvc/ASC.TeamLabSvc.csproj index 6c1a281158..f043307947 100644 --- a/module/ASC.TeamLabSvc/ASC.TeamLabSvc/ASC.TeamLabSvc.csproj +++ b/module/ASC.TeamLabSvc/ASC.TeamLabSvc/ASC.TeamLabSvc.csproj @@ -1,24 +1,10 @@ - - + + - Debug - AnyCPU - 9.0.30729 - 2.0 - {211CB6E3-C353-4229-88B4-051FC2900A61} + net48 Exe - Properties - ASC.TeamLabSvc TeamLabSvc - v4.8 - 512 app.manifest - - - - - 3.5 - publish\ true Disk @@ -34,51 +20,26 @@ false false true + false + Debug;MvcOnly;Release - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - true bin\Debug\TeamLabSvc.xml CS1591 none - true - bin\Release\ - TRACE - prompt - 4 true false - true - - - - - - + Component - - - - - - Designer - - @@ -93,14 +54,7 @@ - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - + + - \ No newline at end of file diff --git a/module/ASC.TelegramService/ASC.TelegramService.csproj b/module/ASC.TelegramService/ASC.TelegramService.csproj index 43ba8b296c..cc85921a31 100644 --- a/module/ASC.TelegramService/ASC.TelegramService.csproj +++ b/module/ASC.TelegramService/ASC.TelegramService.csproj @@ -1,68 +1,28 @@ - - + + - Debug - AnyCPU - {F2213ED8-54DC-4360-BD7C-633B9DA1A124} + net48 Library - Properties - ASC.TelegramService - ASC.TelegramService - v4.8 - 512 - + false + Debug;MvcOnly;Release - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 bin\Debug\ASC.TelegramService.xml CS1591 none - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {481b0d9c-b2f8-4de9-8597-ba8d24585099} - ASC.FederatedLogin - - - - + + + 13.0.1 + 17.0.0 @@ -71,8 +31,6 @@ - - \ No newline at end of file diff --git a/module/ASC.Thrdparty/ASC.FederatedLogin/ASC.FederatedLogin.csproj b/module/ASC.Thrdparty/ASC.FederatedLogin/ASC.FederatedLogin.csproj index 7fb522874a..ec8abf3fa6 100644 --- a/module/ASC.Thrdparty/ASC.FederatedLogin/ASC.FederatedLogin.csproj +++ b/module/ASC.Thrdparty/ASC.FederatedLogin/ASC.FederatedLogin.csproj @@ -1,23 +1,7 @@ - - + + - Debug - AnyCPU - 9.0.30729 - 2.0 - {481B0D9C-B2F8-4DE9-8597-BA8D24585099} Library - Properties - ASC.FederatedLogin - ASC.FederatedLogin - v4.8 - 512 - - - - - 3.5 - publish\ true Disk @@ -34,84 +18,32 @@ false true ..\..\..\web\studio\ASC.Web.Studio\bin\ + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 - false ..\..\..\web\studio\ASC.Web.Studio\bin\ASC.FederatedLogin.xml CS1591 none - true - TRACE - prompt - 4 - false + + + net48 + false - - + 3.5 - 3.5 - + 3.5 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -131,28 +63,18 @@ - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - - + + 8.2.3 - 6.12.2 + 6.34.0 5.0.4 - \ No newline at end of file diff --git a/module/ASC.Thumbnails.Svc/ASC.Thumbnails.Svc.csproj b/module/ASC.Thumbnails.Svc/ASC.Thumbnails.Svc.csproj index 375e052464..50fbc5c192 100644 --- a/module/ASC.Thumbnails.Svc/ASC.Thumbnails.Svc.csproj +++ b/module/ASC.Thumbnails.Svc/ASC.Thumbnails.Svc.csproj @@ -1,56 +1,23 @@ - - - + + - Debug - AnyCPU - {8D1B4425-4CC1-46BE-90FA-8F1C49A24D24} + net48 Library - Properties - ASC.Thumbnails.Svc - ASC.Thumbnails.Svc - v4.8 - 512 + false + Debug;MvcOnly;Release - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 bin\Debug\ASC.Thumbnails.Svc.xml CS1591 none - true - bin\Release\ - TRACE - prompt - 4 - - - + + - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {A51D0454-4AFA-46DE-89D4-B03D37E1816C} - ASC.Core.Common - - - - - - - @@ -58,12 +25,4 @@ 5.1.2 - - \ No newline at end of file diff --git a/module/ASC.UrlShortener.Svc/ASC.UrlShortener.Svc.csproj b/module/ASC.UrlShortener.Svc/ASC.UrlShortener.Svc.csproj index 0e33909afc..4b7c34ce60 100644 --- a/module/ASC.UrlShortener.Svc/ASC.UrlShortener.Svc.csproj +++ b/module/ASC.UrlShortener.Svc/ASC.UrlShortener.Svc.csproj @@ -1,56 +1,23 @@ - - - + + - Debug - AnyCPU - {A3BC6CB9-842F-4D00-97F3-F5B458B18726} + net48 Library - Properties - ASC.UrlShortener.Svc - ASC.UrlShortener.Svc - v4.8 - 512 + false + Debug;MvcOnly;Release - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 bin\Debug\ASC.UrlShortener.Svc.xml CS1591 none - true - bin\Release\ - TRACE - prompt - 4 - - - + + - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {A51D0454-4AFA-46DE-89D4-B03D37E1816C} - ASC.Core.Common - - - - - - - @@ -58,5 +25,4 @@ 5.1.2 - \ No newline at end of file diff --git a/module/ASC.VoipService/ASC.VoipService.csproj b/module/ASC.VoipService/ASC.VoipService.csproj index 9e8e75c9eb..b3a2df12ff 100644 --- a/module/ASC.VoipService/ASC.VoipService.csproj +++ b/module/ASC.VoipService/ASC.VoipService.csproj @@ -1,65 +1,24 @@ - - - + + - Debug - AnyCPU - {988536C1-4B89-4649-8F77-5C16F55D95D1} Library - Properties - ASC.VoipService - ASC.VoipService - v4.8 - 512 - 10.0.0 - 2.0 ..\..\web\studio\ASC.Web.Studio\bin\ + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 ..\..\web\studio\ASC.Web.Studio\bin\ASC.VoipService.xml CS1591 none - true - TRACE - prompt - 4 + + + net48 + false - - - - - - - - - - - - - - - - - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - - + + @@ -72,5 +31,4 @@ - \ No newline at end of file diff --git a/module/ASC.WebDav.Svc/ASC.WebDav.Svc.csproj b/module/ASC.WebDav.Svc/ASC.WebDav.Svc.csproj index 3d0a995085..b88a4410ec 100644 --- a/module/ASC.WebDav.Svc/ASC.WebDav.Svc.csproj +++ b/module/ASC.WebDav.Svc/ASC.WebDav.Svc.csproj @@ -1,56 +1,16 @@ - - - + + - Debug - AnyCPU - {B84EC090-06B6-4960-A847-51017D3B0743} + net48 Library - Properties - ASC.WebDav.Svc - ASC.WebDav.Svc - v4.8 - 512 - true - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + false + Debug;MvcOnly;Release - - - - - - - - - - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - + + - \ No newline at end of file diff --git a/web/core/ASC.Web.Core/ASC.Web.Core.csproj b/web/core/ASC.Web.Core/ASC.Web.Core.csproj index 8da14aa2ac..038fffd5aa 100644 --- a/web/core/ASC.Web.Core/ASC.Web.Core.csproj +++ b/web/core/ASC.Web.Core/ASC.Web.Core.csproj @@ -1,25 +1,8 @@ - - + + - Debug - AnyCPU - 9.0.30729 - 2.0 - {02C40A64-FE22-41D0-9037-69F0D6F787A9} Library - Properties - ASC.Web.Core - ASC.Web.Core - v4.8 - 512 - false ..\..\..\ - - - - - 3.5 - publish\ true Disk @@ -37,172 +20,32 @@ true ..\..\..\packages\WebGrease.1.5.2\lib $(TrunkDir)web\studio\ASC.Web.Studio\bin\ + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 Auto - false ..\..\studio\ASC.Web.Studio\bin\ASC.Web.Core.xml CS1591 none - true - TRACE - prompt - 4 - false + + + net48 + false - - - - + ASPXCodeBehind - - - - - - - - - - - - - - - - - - - - - - - - + ASPXCodeBehind - - - - - - - - - - - - - - - - - - - - - - - - - - + ASPXCodeBehind - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Code - - - Code - - - Code - - - - - - - - - - - - - - - - - - - - - - - @@ -217,33 +60,12 @@ - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {3f6b420f-abd3-4b5a-9f4c-5d61ffbb01de} - ASC.Data.Storage - - - {BD8A18A5-60C5-4411-9719-0AA11B4BE0E9} - ASC.MessagingSystem - - - {481b0d9c-b2f8-4de9-8597-ba8d24585099} - ASC.FederatedLogin - - - {988536c1-4b89-4649-8f77-5c16f55d95d1} - ASC.VoipService - - - - + + + + + + @@ -271,7 +93,9 @@ 5.69.0 - + + + diff --git a/web/studio/ASC.Web.Studio/ASC.Web.Studio.csproj b/web/studio/ASC.Web.Studio/ASC.Web.Studio.csproj index 8eccb17210..69ae4bd21e 100644 --- a/web/studio/ASC.Web.Studio/ASC.Web.Studio.csproj +++ b/web/studio/ASC.Web.Studio/ASC.Web.Studio.csproj @@ -1,1115 +1,951 @@ - - + + - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) True - - + Debug;MvcOnly;Release + + net48 + false + false + - Debug - AnyCPU - 9.0.30729 - 2.0 - {E7BE6CE8-F6B0-4B9B-831B-BA0C85C8D130} - {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} Library - Properties - ASC.Web.Studio - ASC.Web.Studio - v4.8 - false ..\..\..\ - - - - - 4.0 - bin\ - true - full - false TRACE;DEBUG;$(Constants) - prompt - 4 - false bin\ASC.Web.Studio.xml CS1591 none - true TRACE;$(Constants) - prompt - 4 - false - - - - - - True - + - - - + AppInstall.aspx ASPXCodeBehind - + AppInstall.aspx - - - - - - - - - - - - - + DeepLink.aspx ASPXCodeBehind - + DeepLink.aspx - + BaseTemplate.master ASPXCodeBehind - + BaseTemplate.master - + FirstScripts.ascx ASPXCodeBehind - + PortalEncryption.aspx ASPXCodeBehind - + PortalEncryption.aspx - - - - - + PersonalResource.resx True True - + MediaPlayer.ascx ASPXCodeBehind - - - - - - - - - - + MigrationPortal.aspx ASPXCodeBehind - + MigrationPortal.aspx - + PaymentRequired.aspx ASPXCodeBehind - + PaymentRequired.aspx - - - - - - - - - - - - - - - - - - + CommonBodyScripts.ascx ASPXCodeBehind - + CommonStyles.ascx ASPXCodeBehind - + HeadScripts.ascx ASPXCodeBehind - + PreparationPortal.aspx ASPXCodeBehind - + PreparationPortal.aspx - - - - - - - - - - - - - - - - - - - - - - - + Terms.aspx ASPXCodeBehind - + Terms.aspx - + ImportLogin.Master ASPXCodeBehind - + ImportLogin.Master - + Login.Master ASPXCodeBehind - + Login.Master - + DocuSign.aspx ASPXCodeBehind - + DocuSign.aspx - + Box.aspx ASPXCodeBehind - + Box.aspx - + Google.aspx ASPXCodeBehind - + Google.aspx - + Dropbox.aspx ASPXCodeBehind - + Dropbox.aspx - - + Import.aspx ASPXCodeBehind - + Import.aspx - + Google.aspx ASPXCodeBehind - + Google.aspx - + OneDrive.aspx ASPXCodeBehind - + OneDrive.aspx - + Wordpress.aspx ASPXCodeBehind - + Wordpress.aspx - + AuthorizeDocs.ascx ASPXCodeBehind - + AuthorizeDocs.ascx - + Authorize.ascx ASPXCodeBehind - + Authorize.ascx - + ChooseTimePeriod.ascx ASPXCodeBehind - + ChooseTimePeriod.ascx - - - + PortalEncryption.ascx ASPXCodeBehind - + PortalEncryption.ascx - + MigrationPortal.ascx ASPXCodeBehind - + MigrationPortal.ascx - + SupportChat.ascx ASPXCodeBehind - + SupportChat.ascx - + InviteLink.ascx ASPXCodeBehind - + InviteLink.ascx - + LoaderPage.ascx ASPXCodeBehind - + LoaderPage.ascx - + PersonalFooter.ascx ASPXCodeBehind - + PersonalFooter.ascx - - - + PreparationPortal.ascx ASPXCodeBehind - + PreparationPortal.ascx - + SmallChat.ascx ASPXCodeBehind - + SmallChat.ascx - + VoipPhoneControl.ascx ASPXCodeBehind - + VoipPhoneControl.ascx - + UserForum.ascx ASPXCodeBehind - + UserForum.ascx - + VideoGuides.ascx ASPXCodeBehind - + VideoGuides.ascx - - - - - + StartScriptsStyles.aspx ASPXCodeBehind - + StartScriptsStyles.aspx - - - - + DeepLinking.ascx ASPXCodeBehind - + DeepLinking.ascx - + CommunityDashboardEmptyScreen.ascx ASPXCodeBehind - + CommunityDashboardEmptyScreen.ascx - + WelcomeDashboard.ascx ASPXCodeBehind - + WelcomeDashboard.ascx - + FilesDashboardEmptyScreen.ascx ASPXCodeBehind - + FilesDashboardEmptyScreen.ascx - + CRMDashboardEmptyScreen.ascx ASPXCodeBehind - + CRMDashboardEmptyScreen.ascx - + ManagerDashboardEmptyScreen.ascx ASPXCodeBehind - + ManagerDashboardEmptyScreen.ascx - + AdminHelperSettings.ascx ASPXCodeBehind - + AdminHelperSettings.ascx - + AuditTrail.ascx ASPXCodeBehind - + AuditTrail.ascx - + AuthorizationKeys.ascx ASPXCodeBehind - + AuthorizationKeys.ascx - - + Backup.ascx ASPXCodeBehind - + Backup.ascx - + ShareLinkPassword.ascx ASPXCodeBehind - + ShareLinkPassword.ascx - + CookieSettings.ascx ASPXCodeBehind - + CookieSettings.ascx - + CustomNavigation.ascx ASPXCodeBehind - + CustomNavigation.ascx - - + ImpersonateSettings.ascx ASPXCodeBehind - + ImpersonateSettings.ascx - + ImpersonateUserConfirmationPanel.ascx ASPXCodeBehind - + ImpersonateUserConfirmationPanel.ascx - + LoginSettings.ascx ASPXCodeBehind - + LoginSettings.ascx - + PricingPageSettings.ascx ASPXCodeBehind - + PricingPageSettings.ascx - + MailService.ascx ASPXCodeBehind - + MailService.ascx - + DnsSettings.ascx ASPXCodeBehind - + DnsSettings.ascx - + PortalRename.ascx ASPXCodeBehind - + PortalRename.ascx - + PrivacyRoom.ascx ASPXCodeBehind - + PrivacyRoom.ascx - + ProfileOperation.ascx ASPXCodeBehind - + ProfileOperation.ascx - - - + StorageSettings.ascx ASPXCodeBehind - + StorageSettings.ascx - + TariffCustom.ascx ASPXCodeBehind - + TariffCustom.ascx - + TariffDesktop.ascx ASPXCodeBehind - + TariffDesktop.ascx - + TariffNotify.ascx ASPXCodeBehind - + TariffNotify.ascx - + TariffStandalone.ascx ASPXCodeBehind - + TariffStandalone.ascx - + TariffSaas.ascx ASPXCodeBehind - + TariffSaas.ascx - + ResetAppDialog.ascx ASPXCodeBehind - + ResetAppDialog.ascx - + ShowBackupCodesDialog.ascx ASPXCodeBehind - + ShowBackupCodesDialog.ascx - + ConfirmTfa.ascx ASPXCodeBehind - + ConfirmTfa.ascx - + WhiteLabel.ascx ASPXCodeBehind - + WhiteLabel.ascx - - + ColorThemes.ascx ASPXCodeBehind - + ColorThemes.ascx - + FullTextSearch.ascx ASPXCodeBehind - + FullTextSearch.ascx - + DocService.ascx ASPXCodeBehind - + DocService.ascx - + GreetingLogoSettings.ascx ASPXCodeBehind - + GreetingLogoSettings.ascx - - + PortalAccessSettings.ascx ASPXCodeBehind - + PortalAccessSettings.ascx - + DeactivatePortal.ascx ASPXCodeBehind - + DeactivatePortal.ascx - + IpSecurity.ascx ASPXCodeBehind - + IpSecurity.ascx - + LdapSettings.ascx ASPXCodeBehind - + LdapSettings.ascx - + LoginHistory.ascx ASPXCodeBehind - + LoginHistory.ascx - + LogHelper.ascx ASPXCodeBehind - + LogHelper.ascx - + PortsChecker.ascx ASPXCodeBehind - + PortsChecker.ascx - + ServiceHealthChecker.ascx ASPXCodeBehind - + ServiceHealthChecker.ascx - + PromoCode.ascx ASPXCodeBehind - + PromoCode.ascx - + SingleSignOnSettings.ascx ASPXCodeBehind - + SingleSignOnSettings.ascx - + Restore.ascx ASPXCodeBehind - + Restore.ascx - + SmtpSettings.ascx ASPXCodeBehind - + SmtpSettings.ascx - - - + TipsSettings.ascx ASPXCodeBehind - + TipsSettings.ascx - + UserConnections.ascx ASPXCodeBehind - + UserConnections.ascx - + LoadPhotoControl.ascx ASPXCodeBehind - + LoadPhotoControl.ascx - - - - - - - - - - - - - - - - - - - - - - - + feed.ashx - + Attachments.ascx ASPXCodeBehind - + Attachments.ascx - + EmailAndPassword.ascx ASPXCodeBehind - + EmailAndPassword.ascx - + StepContainer.ascx ASPXCodeBehind - + StepContainer.ascx - + SearchResults.ascx ASPXCodeBehind - + SearchResults.ascx - + SharingSettings.ascx ASPXCodeBehind - + SharingSettings.ascx - + AccessRights.ascx ASPXCodeBehind - + AccessRights.ascx - + AdminMessageSettings.ascx ASPXCodeBehind - + AdminMessageSettings.ascx - + ConfirmPortalOwner.ascx ASPXCodeBehind - + ConfirmPortalOwner.ascx - + ConfirmActivation.ascx ASPXCodeBehind - + ConfirmActivation.ascx - + ConfirmInviteActivation.ascx ASPXCodeBehind - + ConfirmInviteActivation.ascx - + InvitePanel.ascx ASPXCodeBehind - + InvitePanel.ascx - + MailDomainSettings.ascx ASPXCodeBehind - + MailDomainSettings.ascx - + GreetingSettings.ascx ASPXCodeBehind - + GreetingSettings.ascx - + NamingPeopleSettings.ascx ASPXCodeBehind - + NamingPeopleSettings.ascx - + NamingPeopleSettingsContent.ascx ASPXCodeBehind - + NamingPeopleSettingsContent.ascx - + PasswordSettings.ascx ASPXCodeBehind - + PasswordSettings.ascx - + TariffHistory.ascx ASPXCodeBehind - + TariffHistory.ascx - + TimeAndLanguage.ascx ASPXCodeBehind - + TimeAndLanguage.ascx - + VersionSettings.ascx ASPXCodeBehind - + VersionSettings.ascx - + AuthCommunications.ascx ASPXCodeBehind - + AuthCommunications.ascx - - - + ResendInvitesControl.ascx ASPXCodeBehind - + ResendInvitesControl.ascx - + AccountLinkControl.ascx ASPXCodeBehind - + AccountLinkControl.ascx - + UserEmailControl.ascx ASPXCodeBehind - + UserEmailControl.ascx - + UserSubscriptions.ascx ASPXCodeBehind - + UserSubscriptions.ascx - + confirm.aspx ASPXCodeBehind - + confirm.aspx - - - - - - - - + WebPatternResource.resx True True - - - - - - - - - - - - - + My.aspx ASPXCodeBehind - + My.aspx - + Search.aspx ASPXCodeBehind - + Search.aspx - + ServerError.aspx ASPXCodeBehind - + ServerError.aspx - + Default.aspx ASPXCodeBehind - + Default.aspx - + ASPXCodeBehind - + Auth.aspx ASPXCodeBehind - + Auth.aspx - + Global.asax - + Management.aspx ASPXCodeBehind - + Management.aspx - - + Confirm.ascx ASPXCodeBehind - + Confirm.ascx - + ConfirmPortalActivity.ascx ASPXCodeBehind - + ConfirmPortalActivity.ascx - + PwdTool.ascx ASPXCodeBehind - + PwdTool.ascx - + StudioSettings.ascx ASPXCodeBehind - + StudioSettings.ascx - + ProductQuotes.ascx ASPXCodeBehind - + ProductQuotes.ascx - + VisitorsChart.ascx ASPXCodeBehind - + VisitorsChart.ascx - + UserProfileControl.ascx ASPXCodeBehind - + UserProfileControl.ascx - - - - + VoipClient.aspx ASPXCodeBehind - + VoipClient.aspx - + Warmup.aspx ASPXCodeBehind - + Warmup.aspx - + Wizard.aspx ASPXCodeBehind - + Wizard.aspx @@ -1185,7 +1021,6 @@ - @@ -1751,7 +1586,6 @@ - @@ -1760,30 +1594,11 @@ - - - - - - - - - - - - - - - - - - - @@ -2761,7 +2576,7 @@ - + Designer @@ -2770,12 +2585,10 @@ - + Designer - - @@ -2830,7 +2643,7 @@ AuditResource.resx - + Designer PublicResXFileCodeGenerator AuditResource.Designer.cs @@ -2856,7 +2669,7 @@ AuditResource.resx - + True True AuditResource.resx @@ -2900,7 +2713,7 @@ ChatResource.resx - + Designer PublicResXFileCodeGenerator ChatResource.Designer.cs @@ -2926,7 +2739,7 @@ ChatResource.resx - + True True ChatResource.resx @@ -2955,7 +2768,7 @@ CustomModeResource.resx - + Designer PublicResXFileCodeGenerator CustomModeResource.Designer.cs @@ -2966,7 +2779,7 @@ CustomModeResource.resx - + True True CustomModeResource.resx @@ -3022,7 +2835,7 @@ PersonalResource.resx - + PublicResXFileCodeGenerator PersonalResource.Designer.cs Designer @@ -3096,7 +2909,7 @@ StudioCountriesResource.resx - + Designer PublicResXFileCodeGenerator StudioCountriesResource.Designer.cs @@ -3119,7 +2932,7 @@ StudioCountriesResource.resx - + True True StudioCountriesResource.resx @@ -3169,7 +2982,7 @@ FeedResource.resx - + Designer PublicResXFileCodeGenerator FeedResource.Designer.cs @@ -3195,7 +3008,7 @@ FeedResource.resx - + True True FeedResource.resx @@ -3239,7 +3052,7 @@ MonitoringResource.resx - + Designer PublicResXFileCodeGenerator MonitoringResource.Designer.cs @@ -3265,7 +3078,7 @@ MonitoringResource.resx - + True True MonitoringResource.resx @@ -3318,7 +3131,7 @@ Resource.resx - + Designer PublicResXFileCodeGenerator Resource.Designer.cs @@ -3344,7 +3157,7 @@ Resource.resx - + True True Resource.resx @@ -3391,7 +3204,7 @@ ResourceJS.resx - + Designer PublicResXFileCodeGenerator ResourceJS.Designer.cs @@ -3417,7 +3230,7 @@ ResourceJS.resx - + True True ResourceJS.resx @@ -3470,7 +3283,7 @@ UserControlsCommonResource.resx - + Designer PublicResXFileCodeGenerator UserControlsCommonResource.Designer.cs @@ -3496,12 +3309,12 @@ UserControlsCommonResource.resx - + True True UserControlsCommonResource.resx - + PublicResXFileCodeGenerator WebPatternResource.Designer.cs Designer @@ -3545,7 +3358,7 @@ WebstudioNotifyPatternResource.resx - + Designer PublicResXFileCodeGenerator WebstudioNotifyPatternResource.Designer.cs @@ -3568,7 +3381,7 @@ WebstudioNotifyPatternResource.resx - + True True WebstudioNotifyPatternResource.resx @@ -3624,7 +3437,7 @@ NamingPeopleResource.resx - + Designer PublicResXFileCodeGenerator NamingPeopleResource.Designer.cs @@ -3650,7 +3463,7 @@ NamingPeopleResource.resx - + True True NamingPeopleResource.resx @@ -3694,7 +3507,7 @@ WhiteLabelResource.resx - + Designer PublicResXFileCodeGenerator WhiteLabelResource.Designer.cs @@ -3717,12 +3530,11 @@ WhiteLabelResource.resx - + True True WhiteLabelResource.resx - @@ -3749,7 +3561,7 @@ - + Designer @@ -3771,20 +3583,20 @@ - + Designer - + Designer - + Designer - + Designer - + Designer @@ -4251,167 +4063,153 @@ - - - - - - - + Feed.aspx ASPXCodeBehind - + Feed.aspx - - - - - - - + Tariffs.aspx ASPXCodeBehind - + Tariffs.aspx - + ActivateEmailPanel.ascx ASPXCodeBehind - + ActivateEmailPanel.ascx - + HelpCenter.ascx ASPXCodeBehind - + HelpCenter.ascx - + LoginWithThirdParty.ascx ASPXCodeBehind - + LoginWithThirdParty.ascx - + Support.ascx ASPXCodeBehind - + Support.ascx - + TopStudioPanel.ascx ASPXCodeBehind - + TopStudioPanel.ascx - + FeedList.ascx ASPXCodeBehind - + FeedList.ascx - + NewNavigationPanel.ascx ASPXCodeBehind - + NewNavigationPanel.ascx - + DefaultPageSettings.ascx ASPXCodeBehind - + DefaultPageSettings.ascx - + ProductsAndInstruments.ascx ASPXCodeBehind - + ProductsAndInstruments.ascx - + ConfirmMobileActivation.ascx ASPXCodeBehind - + ConfirmMobileActivation.ascx - + SmsValidationSettings.ascx ASPXCodeBehind - + SmsValidationSettings.ascx - + ChangeMobileNumber.ascx ASPXCodeBehind - + ChangeMobileNumber.ascx - + TariffLimitExceed.ascx ASPXCodeBehind - + TariffLimitExceed.ascx - + TransferPortal.ascx ASPXCodeBehind - + TransferPortal.ascx - + ConfirmationDeleteUser.ascx ASPXCodeBehind - + ConfirmationDeleteUser.ascx - + UserEmailChange.ascx ASPXCodeBehind - + UserEmailChange.ascx - + UserLanguage.ascx ASPXCodeBehind - + UserLanguage.ascx - + UserProfileActions.ascx ASPXCodeBehind - + UserProfileActions.ascx - + UserProfileEditControl.ascx ASPXCodeBehind - + UserProfileEditControl.ascx - - @@ -4434,62 +4232,20 @@ - - {e588e818-f163-470c-802c-3a6e45b36080} - ASC.ActiveDirectory - - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {43B9FADB-AB2B-4810-9353-E23C6E45C6A3} - ASC.Data.Storage.Migration - - - {3f6b420f-abd3-4b5a-9f4c-5d61ffbb01de} - ASC.Data.Storage - - - {2ff2177f-2d1a-4396-84eb-51f14fd99385} - ASC.IPSecurity - - - {659c514b-dd2c-41e3-a40e-4701216b1ea2} - ASC.Notify.Textile - - - {2c111161-b7c5-4869-9f52-ea725e64ba40} - ASC.AuditTrail - - - {ae1a0e06-6cd4-4e1d-8209-22bbbd6d5652} - ASC.ElasticSearch - - - {b0431ec9-21d8-4d96-b333-6dd430031c82} - ASC.Feed - - - {bd8a18a5-60c5-4411-9719-0aa11b4be0e9} - ASC.MessagingSystem - - - {481b0d9c-b2f8-4de9-8597-ba8d24585099} - ASC.FederatedLogin - - - {988536c1-4b89-4649-8f77-5c16f55d95d1} - ASC.VoipService - - - {02c40a64-fe22-41d0-9037-69f0d6f787a9} - ASC.Web.Core - + + + + + + + + + + + + + + @@ -4526,7 +4282,7 @@ 3.1.13 - 1.12.1 + 1.14.1 8.12.30 @@ -4553,6 +4309,3853 @@ 5.4.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -4560,7 +8163,6 @@ - @@ -4568,18 +8170,6 @@ - - - - - True - - - - - - - - - + + \ No newline at end of file diff --git a/web/studio/ASC.Web.Studio/ASC.Web.Studio.csproj.user b/web/studio/ASC.Web.Studio/ASC.Web.Studio.csproj.user new file mode 100644 index 0000000000..112c7751c6 --- /dev/null +++ b/web/studio/ASC.Web.Studio/ASC.Web.Studio.csproj.user @@ -0,0 +1,47 @@ + + + + true + Debug|Any CPU + + + + + + + + + + + + + + CurrentPage + True + False + False + False + + + + + + + + + True + False + True + True + 0 + / + http://localhost:64221/ + False + False + + + + + + + \ No newline at end of file diff --git a/web/studio/ASC.Web.Studio/AppInstall.aspx.cs b/web/studio/ASC.Web.Studio/AppInstall.aspx.cs index 2def42f03d..b76d4b7446 100644 --- a/web/studio/ASC.Web.Studio/AppInstall.aspx.cs +++ b/web/studio/ASC.Web.Studio/AppInstall.aspx.cs @@ -17,10 +17,11 @@ using System; using System.Collections.Generic; -using System.Web; using ASC.Core; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/Auth.aspx.cs b/web/studio/ASC.Web.Studio/Auth.aspx.cs index 196117f78e..63fa7d1b64 100644 --- a/web/studio/ASC.Web.Studio/Auth.aspx.cs +++ b/web/studio/ASC.Web.Studio/Auth.aspx.cs @@ -28,6 +28,7 @@ using ASC.Web.Core.Utility.Skins; using ASC.Web.Core.WhiteLabel; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls; using ASC.Web.Studio.UserControls.Common; diff --git a/web/studio/ASC.Web.Studio/Controls/Common/PageNavigator.cs b/web/studio/ASC.Web.Studio/Controls/Common/PageNavigator.cs index 2c251e45ac..986fa46ab9 100644 --- a/web/studio/ASC.Web.Studio/Controls/Common/PageNavigator.cs +++ b/web/studio/ASC.Web.Studio/Controls/Common/PageNavigator.cs @@ -20,7 +20,7 @@ using System.Web; using System.Web.UI; using System.Web.UI.WebControls; - +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; namespace ASC.Web.Studio.Controls.Common diff --git a/web/studio/ASC.Web.Studio/Core/DateTimeExtension.cs b/web/studio/ASC.Web.Studio/Core/DateTimeExtension.cs index c180af8988..9313bc72dc 100644 --- a/web/studio/ASC.Web.Studio/Core/DateTimeExtension.cs +++ b/web/studio/ASC.Web.Studio/Core/DateTimeExtension.cs @@ -15,6 +15,7 @@ */ +using System; using System.Globalization; using System.Text; @@ -53,7 +54,7 @@ public static string GetGrammaticalCase(int number, string nominative, string ge public static string Yet(this DateTime target) { - return Yet(target, TenantUtil.DateTimeNow()); + return target.Yet(TenantUtil.DateTimeNow()); } public static string Yet(int days) @@ -79,7 +80,7 @@ public static string Yet(this DateTime target, DateTime from) { var temp = target.Date; temp = temp.AddYears(from.Date.Year - temp.Year); - var diff = (temp - from.Date); + var diff = temp - from.Date; return Yet(diff.Days); @@ -88,7 +89,7 @@ public static string Yet(this DateTime target, DateTime from) public static string Ago(this DateTime target) { var result = new StringBuilder(); - var diff = (TenantUtil.DateTimeNow().Date - target.Date); + var diff = TenantUtil.DateTimeNow().Date - target.Date; result.AppendFormat("{0} ", target.ToShortTimeString()); switch (diff.Days) @@ -111,9 +112,9 @@ public static string Ago(this DateTime from, DateTime to) { var result = new StringBuilder(""); TimeSpan diffFrom, diffTo; - if ((from.Ticks != 0) && (to.Ticks == 0)) + if (from.Ticks != 0 && to.Ticks == 0) { - diffFrom = (TenantUtil.DateTimeNow().Date - from.Date); + diffFrom = TenantUtil.DateTimeNow().Date - from.Date; switch (diffFrom.Days) { case 0: @@ -130,9 +131,9 @@ public static string Ago(this DateTime from, DateTime to) result.AppendFormat(" " + Resource.AtTime + " {0} ", from.ToShortTimeString()); } - if ((from.Ticks == 0) && (to.Ticks != 0)) + if (from.Ticks == 0 && to.Ticks != 0) { - diffTo = (TenantUtil.DateTimeNow().Date - to.Date); + diffTo = TenantUtil.DateTimeNow().Date - to.Date; result.AppendFormat(Resource.ToTime); result.AppendFormat(" {0} ", to.ToShortTimeString()); switch (diffTo.Days) @@ -150,10 +151,10 @@ public static string Ago(this DateTime from, DateTime to) } - if ((from.Ticks != 0) && (to.Ticks != 0)) + if (from.Ticks != 0 && to.Ticks != 0) { - diffFrom = (TenantUtil.DateTimeNow().Date - from.Date); - diffTo = (TenantUtil.DateTimeNow().Date - to.Date); + diffFrom = TenantUtil.DateTimeNow().Date - from.Date; + diffTo = TenantUtil.DateTimeNow().Date - to.Date; if (diffFrom == diffTo) { @@ -206,7 +207,7 @@ public static string Ago(this DateTime from, DateTime to) public static string ToShortString(this DateTime targetDateTime) { - return String.Format("{0} {1}", targetDateTime.ToShortDateString(), targetDateTime.ToShortTimeString()); + return string.Format("{0} {1}", targetDateTime.ToShortDateString(), targetDateTime.ToShortTimeString()); } public static string AgoSentence(this DateTime target) @@ -216,7 +217,7 @@ public static string AgoSentence(this DateTime target) var isYesterdayOrDayBefore = false; var result = new StringBuilder(); - var diff = (TenantUtil.DateTimeNow() - target); + var diff = TenantUtil.DateTimeNow() - target; var years = diff.Days / yearDuration; var months = diff.Days / monthDuration; @@ -250,7 +251,7 @@ public static string AgoSentence(this DateTime target) if (result.Length == 0) return Resource.DrnAgoFewMoments; else if (!isYesterdayOrDayBefore) - return String.Format(Resource.DrnAgo, result.ToString()); + return string.Format(Resource.DrnAgo, result.ToString()); return result.ToString(); } diff --git a/web/studio/ASC.Web.Studio/Core/Notify/StudioWhatsNewNotify.cs b/web/studio/ASC.Web.Studio/Core/Notify/StudioWhatsNewNotify.cs index 72c8a3f356..946daa69ab 100644 --- a/web/studio/ASC.Web.Studio/Core/Notify/StudioWhatsNewNotify.cs +++ b/web/studio/ASC.Web.Studio/Core/Notify/StudioWhatsNewNotify.cs @@ -33,6 +33,7 @@ using ASC.Notify; using ASC.Notify.Patterns; using ASC.Web.Core; +using ASC.Web.Studio.Core.Users; using ASC.Web.Studio.Utility; using Constants = ASC.Feed.Constants; diff --git a/web/studio/ASC.Web.Studio/Core/Users/UserInfoExtension.cs b/web/studio/ASC.Web.Studio/Core/Users/UserInfoExtension.cs index 8b37360b84..51453e8606 100644 --- a/web/studio/ASC.Web.Studio/Core/Users/UserInfoExtension.cs +++ b/web/studio/ASC.Web.Studio/Core/Users/UserInfoExtension.cs @@ -58,7 +58,7 @@ public static string RenderProfileLink(this UserInfo userInfo, Guid productID) return sb.ToString(); } - public static string RenderCustomProfileLink(this UserInfo userInfo, String containerCssClass, String linkCssClass) + public static string RenderCustomProfileLink(this UserInfo userInfo, string containerCssClass, string linkCssClass) { var containerCss = string.IsNullOrEmpty(containerCssClass) ? "userLink" : "userLink " + containerCssClass; var linkCss = string.IsNullOrEmpty(linkCssClass) ? "" : linkCssClass; diff --git a/web/studio/ASC.Web.Studio/DeepLink.aspx.cs b/web/studio/ASC.Web.Studio/DeepLink.aspx.cs index edf1852c33..a9bb9176b3 100644 --- a/web/studio/ASC.Web.Studio/DeepLink.aspx.cs +++ b/web/studio/ASC.Web.Studio/DeepLink.aspx.cs @@ -20,6 +20,7 @@ using System.Web; using ASC.Web.Core.Mobile; +using ASC.Web.Studio.Masters; using ASC.Web.Studio.UserControls; namespace ASC.Web.Studio diff --git a/web/studio/ASC.Web.Studio/Default.aspx.cs b/web/studio/ASC.Web.Studio/Default.aspx.cs index 3b54ff694e..7413f079f2 100644 --- a/web/studio/ASC.Web.Studio/Default.aspx.cs +++ b/web/studio/ASC.Web.Studio/Default.aspx.cs @@ -28,6 +28,8 @@ using ASC.Web.Core.Utility; using ASC.Web.Core.Utility.Skins; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls.EmptyScreens; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/Feed.aspx.cs b/web/studio/ASC.Web.Studio/Feed.aspx.cs index f56e4d4fd8..a4965341b0 100644 --- a/web/studio/ASC.Web.Studio/Feed.aspx.cs +++ b/web/studio/ASC.Web.Studio/Feed.aspx.cs @@ -26,6 +26,7 @@ using ASC.Web.Core.Files; using ASC.Web.Core.Utility.Skins; using ASC.Web.Studio.Controls.Common; +using ASC.Web.Studio.Masters; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls.Common.LoaderPage; using ASC.Web.Studio.UserControls.EmptyScreens; diff --git a/web/studio/ASC.Web.Studio/Management.aspx.cs b/web/studio/ASC.Web.Studio/Management.aspx.cs index 2fca624755..69dc9e7375 100644 --- a/web/studio/ASC.Web.Studio/Management.aspx.cs +++ b/web/studio/ASC.Web.Studio/Management.aspx.cs @@ -27,6 +27,7 @@ using ASC.Web.Core.Files; using ASC.Web.Core.Utility.Settings; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls.Common.HelpCenter; using ASC.Web.Studio.UserControls.Common.InviteLink; diff --git a/web/studio/ASC.Web.Studio/Masters/MainPage.cs b/web/studio/ASC.Web.Studio/Masters/MainPage.cs index 5c38dcfa92..1fb8a6992d 100644 --- a/web/studio/ASC.Web.Studio/Masters/MainPage.cs +++ b/web/studio/ASC.Web.Studio/Masters/MainPage.cs @@ -24,7 +24,6 @@ using System.Web; using AjaxPro; - using ASC.Common.Logging; using ASC.Core; using ASC.Core.Data; @@ -37,11 +36,12 @@ using ASC.Web.Studio.Core.SMS; using ASC.Web.Studio.Core.Statistic; using ASC.Web.Studio.Core.TFA; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.UserControls.Management; using ASC.Web.Studio.UserControls.Statistics; using ASC.Web.Studio.Utility; -namespace ASC.Web.Studio +namespace ASC.Web.Studio.Masters { /// /// Base page for all pages in projects @@ -102,7 +102,7 @@ protected void Page_PreInit(object sender, EventArgs e) if (!MayNotPaid && TenantExtra.EnableTariffSettings - && (TenantStatisticsProvider.IsNotPaid()) + && TenantStatisticsProvider.IsNotPaid() && WarmUp.Instance.CheckCompleted() && Request.QueryString["warmup"] != "true") { if (TariffSettings.HidePricingPage && !user.IsAdmin()) @@ -216,7 +216,7 @@ protected void SetLanguage(bool checkIp = true) if (culture.Value != null) { - var redirectUrl = String.Format("/{0}/{1}", culture.Key, Request.Path); + var redirectUrl = string.Format("/{0}/{1}", culture.Key, Request.Path); if (redirectUrl.EndsWith("Auth.aspx", StringComparison.InvariantCultureIgnoreCase)) redirectUrl = redirectUrl.Remove(redirectUrl.IndexOf("Auth.aspx", StringComparison.OrdinalIgnoreCase)); @@ -226,7 +226,7 @@ protected void SetLanguage(bool checkIp = true) } } } - else if (!String.IsNullOrEmpty(Request["lang"])) + else if (!string.IsNullOrEmpty(Request["lang"])) { var lang = Request["lang"].Split(',')[0]; var cultureInfo = SetupInfo.GetPersonalCulture(lang).Value; @@ -241,7 +241,7 @@ protected void SetLanguage(bool checkIp = true) Log.WarnFormat("Lang {0} not supported", lang); } } - else if (!String.IsNullOrEmpty(Request["email"])) + else if (!string.IsNullOrEmpty(Request["email"])) { var user = CoreContext.UserManager.GetUserByEmail(Request["email"]); diff --git a/web/studio/ASC.Web.Studio/Masters/MasterManagement/StudioMasterExtensions.cs b/web/studio/ASC.Web.Studio/Masters/MasterManagement/StudioMasterExtensions.cs index 1213068e0f..afbfd00d25 100644 --- a/web/studio/ASC.Web.Studio/Masters/MasterManagement/StudioMasterExtensions.cs +++ b/web/studio/ASC.Web.Studio/Masters/MasterManagement/StudioMasterExtensions.cs @@ -15,13 +15,15 @@ */ +using System; +using System.Web; using System.Web.UI; using ASC.Web.Core.Client.Bundling; using ASC.Web.Core.Client.HttpHandlers; using ASC.Web.Studio.Masters; -namespace System.Web +namespace ASC.Web.Studio.Masters.MasterManagement { public static class StudioMasterExtensions { @@ -35,7 +37,7 @@ public static Page RegisterStyle(this Page page, params string[] scriptPath) public static Page RegisterStyle(this Page page, Func converter, params string[] absoluteLessPath) { if (page == null) throw new ArgumentNullException("page"); - var master = GetStudioMaster(page); + var master = page.GetStudioMaster(); if (master != null) { master.AddStyles(converter, absoluteLessPath); @@ -57,7 +59,7 @@ public static Page RegisterBodyScripts(this Page page, params string[] scriptPat public static Page RegisterBodyScripts(this Page page, Func converter, params string[] scriptPath) { if (page == null) throw new ArgumentNullException("page"); - var master = GetStudioMaster(page); + var master = page.GetStudioMaster(); if (master != null) { master.AddBodyScripts(converter, scriptPath); @@ -68,7 +70,7 @@ public static Page RegisterBodyScripts(this Page page, Func conv public static Page RegisterStaticScripts(this Page page, ScriptBundleData bundleData) { if (page == null) throw new ArgumentNullException("page"); - var master = GetStudioMaster(page); + var master = page.GetStudioMaster(); if (master != null) { master.AddStaticBodyScripts(bundleData); @@ -79,7 +81,7 @@ public static Page RegisterStaticScripts(this Page page, ScriptBundleData bundle public static Page RegisterInlineScript(this Page page, string script, bool beforeBodyScript = false, bool onReady = true) { if (page == null) throw new ArgumentNullException("page"); - var master = GetStudioMaster(page); + var master = page.GetStudioMaster(); if (master != null) { master.RegisterInlineScript(script, beforeBodyScript, onReady); @@ -94,7 +96,7 @@ public static Page RegisterInlineScript(this Page page, string script, bool befo public static Page RegisterClientScript(this Page page, ClientScript clientScript) { if (page == null) throw new ArgumentNullException("page"); - var master = GetStudioMaster(page); + var master = page.GetStudioMaster(); if (master != null) { master.AddClientScript(clientScript); diff --git a/web/studio/ASC.Web.Studio/Masters/MasterResources/MasterLocalizationResources.cs b/web/studio/ASC.Web.Studio/Masters/MasterResources/MasterLocalizationResources.cs index 79efde0bde..be6246e675 100644 --- a/web/studio/ASC.Web.Studio/Masters/MasterResources/MasterLocalizationResources.cs +++ b/web/studio/ASC.Web.Studio/Masters/MasterResources/MasterLocalizationResources.cs @@ -23,6 +23,7 @@ using ASC.Core; using ASC.Web.Core.Client.HttpHandlers; +using ASC.Web.Studio.Core; using ASC.Web.Studio.Core.Users; using ASC.Web.Studio.PublicResources; diff --git a/web/studio/ASC.Web.Studio/My.aspx.cs b/web/studio/ASC.Web.Studio/My.aspx.cs index ef86ef92e9..b8e307e73c 100644 --- a/web/studio/ASC.Web.Studio/My.aspx.cs +++ b/web/studio/ASC.Web.Studio/My.aspx.cs @@ -16,12 +16,13 @@ using System; -using System.Web; using ASC.Core; using ASC.Core.Users; using ASC.Geolocation; using ASC.Web.Studio.Core.Users; +using ASC.Web.Studio.Masters; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls.Users; using ASC.Web.Studio.UserControls.Users.TipsSettings; diff --git a/web/studio/ASC.Web.Studio/PaymentRequired.aspx.cs b/web/studio/ASC.Web.Studio/PaymentRequired.aspx.cs index e3d1f78cf9..83c523d91a 100644 --- a/web/studio/ASC.Web.Studio/PaymentRequired.aspx.cs +++ b/web/studio/ASC.Web.Studio/PaymentRequired.aspx.cs @@ -16,13 +16,14 @@ using System; -using System.Web; using ASC.Core; using ASC.Core.Billing; using ASC.Web.Core.Files; using ASC.Web.Core.Utility; using ASC.Web.Core.WhiteLabel; +using ASC.Web.Studio.Masters; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/Products/CRM/ASC.Web.CRM.csproj b/web/studio/ASC.Web.Studio/Products/CRM/ASC.Web.CRM.csproj index 2e671d1f43..5e6692526b 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/ASC.Web.CRM.csproj +++ b/web/studio/ASC.Web.Studio/Products/CRM/ASC.Web.CRM.csproj @@ -1,572 +1,423 @@ - - + + - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {48EFB880-3D76-4B21-B31E-1007C0062B5C} + net48 + false + false Library - Properties - ASC.Web.CRM - ASC.Web.CRM - v4.8 - - - - - 4.0 - ..\..\bin\ + false + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 - false ..\..\bin\ASC.Web.CRM.xml CS1591 none - true - TRACE - prompt - 4 - false - + Calls.aspx ASPXCodeBehind - + Calls.aspx - + Cases.aspx ASPXCodeBehind - + Cases.aspx - - - - - - - - - - - - - + CasesFullCardView.ascx ASPXCodeBehind - + CasesFullCardView.ascx - + ButtonsSidePanel.ascx ASPXCodeBehind - + ButtonsSidePanel.ascx - + ListBaseView.ascx ASPXCodeBehind - + ListBaseView.ascx - + NavigationSidePanel.ascx ASPXCodeBehind - + NavigationSidePanel.ascx - - + InvoiceDetailsView.ascx ASPXCodeBehind - + InvoiceDetailsView.ascx - + InvoiceActionView.ascx ASPXCodeBehind - + InvoiceActionView.ascx - + ListInvoiceView.ascx ASPXCodeBehind - + ListInvoiceView.ascx - + SmtpSender.ascx ASPXCodeBehind - + SmtpSender.ascx - + ContactFullCardView.ascx ASPXCodeBehind - + ContactFullCardView.ascx - + ListContactView.ascx ASPXCodeBehind - + ListContactView.ascx - + ImportFromCSVView.ascx ASPXCodeBehind - + ImportFromCSVView.ascx - + DealFullCardView.ascx ASPXCodeBehind - + DealFullCardView.ascx - + ListDealView.ascx ASPXCodeBehind - + ListDealView.ascx - + SettingsHeaderView.ascx ASPXCodeBehind - + SettingsHeaderView.ascx - + CurrencySettingsView.ascx ASPXCodeBehind - + CurrencySettingsView.ascx - + DealMilestoneView.ascx ASPXCodeBehind - + DealMilestoneView.ascx - + OrganisationProfile.ascx ASPXCodeBehind - + OrganisationProfile.ascx - + InvoiceItemActionView.ascx ASPXCodeBehind - + InvoiceItemActionView.ascx - + InvoiceItemsView.ascx ASPXCodeBehind - + InvoiceItemsView.ascx - + InvoiceTaxesView.ascx ASPXCodeBehind - + InvoiceTaxesView.ascx - + ReportsNavigation.ascx ASPXCodeBehind - + ReportsNavigation.ascx - + ReportsView.ascx ASPXCodeBehind - + ReportsView.ascx - + VoipCommon.ascx ASPXCodeBehind - + VoipCommon.ascx - + VoipNumbers.ascx ASPXCodeBehind - + VoipNumbers.ascx - + VoipCalls.ascx ASPXCodeBehind - + VoipCalls.ascx - + VoipQuick.ascx - + VoipQuick.ascx - + TagSettingsView.ascx ASPXCodeBehind - + TagSettingsView.ascx - + TaskTemplateView.ascx ASPXCodeBehind - + TaskTemplateView.ascx - + ListTaskView.ascx ASPXCodeBehind - + ListTaskView.ascx - - - - - - - - - - - - - - - - - - + Reports.aspx ASPXCodeBehind - + Reports.aspx - - - - - - - - - + MailViewer.aspx ASPXCodeBehind - + MailViewer.aspx - - - - - - - - - - - - - - - - - - - - - - + Help.aspx ASPXCodeBehind - + Help.aspx - + filehandler.ashx - + webtoleadfromhandler.ashx - + Invoices.aspx ASPXCodeBehind - + Invoices.aspx - - - - - + Sender.aspx ASPXCodeBehind - + Sender.aspx - - - - - - - - - + WebToLeadFormView.ascx ASPXCodeBehind - + WebToLeadFormView.ascx - - + Default.aspx ASPXCodeBehind - + Default.aspx - + CasesActionView.ascx ASPXCodeBehind - + CasesActionView.ascx - + CasesDetailsView.ascx ASPXCodeBehind - + CasesDetailsView.ascx - + ListCasesView.ascx ASPXCodeBehind - + ListCasesView.ascx - + FileUploader.ascx ASPXCodeBehind - + FileUploader.ascx - + PrivatePanel.ascx ASPXCodeBehind - + PrivatePanel.ascx - + ContactActionView.ascx ASPXCodeBehind - + ContactActionView.ascx - + ContactDetailsView.ascx ASPXCodeBehind - + ContactDetailsView.ascx - + HistoryView.ascx ASPXCodeBehind - + HistoryView.ascx - + DealActionView.ascx ASPXCodeBehind - + DealActionView.ascx - + DealDetailsView.ascx ASPXCodeBehind - + DealDetailsView.ascx - + CommonSettingsView.ascx ASPXCodeBehind - + CommonSettingsView.ascx - + CustomFieldsView.ascx ASPXCodeBehind - + CustomFieldsView.ascx - + ListItemView.ascx ASPXCodeBehind - + ListItemView.ascx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Deals.aspx ASPXCodeBehind - + Deals.aspx - + BasicTemplate.Master ASPXCodeBehind - + BasicTemplate.Master - + ASPXCodeBehind - + ASPXCodeBehind - - - - - - - + Settings.aspx ASPXCodeBehind - + Settings.aspx - + Tasks.aspx ASPXCodeBehind - + Tasks.aspx - - - - - - - - - - - - - + Warmup.aspx ASPXCodeBehind - + Warmup.aspx @@ -700,12 +551,12 @@ - + Designer PublicResXFileCodeGenerator CRMErrorsResource.Designer.cs - + True True CRMErrorsResource.resx @@ -746,7 +597,7 @@ CRMVoipResource.resx - + Designer PublicResXFileCodeGenerator CRMVoipResource.Designer.cs @@ -769,7 +620,7 @@ CRMVoipResource.resx - + True True CRMVoipResource.resx @@ -822,7 +673,7 @@ CRMContactResource.resx - + Designer PublicResXFileCodeGenerator CRMContactResource.Designer.cs @@ -848,7 +699,7 @@ CRMContactResource.resx - + True True CRMContactResource.resx @@ -901,7 +752,7 @@ CRMCommonResource.resx - + Designer PublicResXFileCodeGenerator CRMCommonResource.Designer.cs @@ -927,7 +778,7 @@ CRMCommonResource.resx - + True True CRMCommonResource.resx @@ -980,7 +831,7 @@ CRMJSResource.resx - + Designer PublicResXFileCodeGenerator CRMJSResource.Designer.cs @@ -1006,7 +857,7 @@ CRMJSResource.resx - + True True CRMJSResource.resx @@ -1059,7 +910,7 @@ CRMDealResource.resx - + Designer PublicResXFileCodeGenerator CRMDealResource.Designer.cs @@ -1085,7 +936,7 @@ CRMDealResource.resx - + True True CRMDealResource.resx @@ -1120,7 +971,7 @@ CRMReportResource.resx - + Designer PublicResXFileCodeGenerator CRMReportResource.Designer.cs @@ -1146,7 +997,7 @@ CRMReportResource.resx - + True True CRMReportResource.resx @@ -1199,7 +1050,7 @@ CRMSettingResource.resx - + Designer PublicResXFileCodeGenerator CRMSettingResource.Designer.cs @@ -1225,7 +1076,7 @@ CRMSettingResource.resx - + True True CRMSettingResource.resx @@ -1278,7 +1129,7 @@ CRMTaskResource.resx - + Designer PublicResXFileCodeGenerator CRMTaskResource.Designer.cs @@ -1304,7 +1155,7 @@ CRMTaskResource.resx - + True True CRMTaskResource.resx @@ -1354,7 +1205,7 @@ CRMPatternResource.resx - + Designer PublicResXFileCodeGenerator CRMPatternResource.Designer.cs @@ -1380,7 +1231,7 @@ CRMPatternResource.resx - + True True CRMPatternResource.resx @@ -1421,7 +1272,7 @@ CRMInvoiceResource.resx - + Designer PublicResXFileCodeGenerator CRMInvoiceResource.Designer.cs @@ -1447,7 +1298,7 @@ CRMInvoiceResource.resx - + True True CRMInvoiceResource.resx @@ -1851,7 +1702,7 @@ CRMCasesResource.resx - + Designer PublicResXFileCodeGenerator CRMCasesResource.Designer.cs @@ -1877,7 +1728,7 @@ CRMCasesResource.resx - + True True CRMCasesResource.resx @@ -1930,7 +1781,7 @@ CRMEnumResource.resx - + Designer PublicResXFileCodeGenerator CRMEnumResource.Designer.cs @@ -1956,7 +1807,7 @@ CRMEnumResource.resx - + True True CRMEnumResource.resx @@ -2167,50 +2018,17 @@ - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {3f6b420f-abd3-4b5a-9f4c-5d61ffbb01de} - ASC.Data.Storage - - - {49f07fff-98a5-47d2-a9e9-a46b98c41245} - ASC.Api.Core - - - {ae1a0e06-6cd4-4e1d-8209-22bbbd6d5652} - ASC.ElasticSearch - - - {bd8a18a5-60c5-4411-9719-0aa11b4be0e9} - ASC.MessagingSystem - - - {481B0D9C-B2F8-4DE9-8597-BA8D24585099} - ASC.FederatedLogin - - - {988536c1-4b89-4649-8f77-5c16f55d95d1} - ASC.VoipService - - - {02c40a64-fe22-41d0-9037-69f0d6f787a9} - ASC.Web.Core - - - {e7be6ce8-f6b0-4b9b-831b-ba0c85c8d130} - ASC.Web.Studio - - - {8c534af7-5696-4e68-9ff4-ffc311893c10} - ASC.Web.Files - + + + + + + + + + + + @@ -2261,7 +2079,6 @@ web.config - @@ -2291,10 +2108,416 @@ - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - \ No newline at end of file diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Classes/BasePage.cs b/web/studio/ASC.Web.Studio/Products/CRM/Classes/BasePage.cs index 9a932949fe..15b6809ce3 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Classes/BasePage.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Classes/BasePage.cs @@ -19,12 +19,11 @@ using System.IO; using System.Runtime.Serialization.Json; using System.Text; -using System.Web; using ASC.CRM.Core.Dao; using ASC.Web.CRM.Core; -using ASC.Web.Studio; - +using ASC.Web.Studio.Masters; +using ASC.Web.Studio.Masters.MasterManagement; using Autofac; namespace ASC.Web.CRM diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Classes/RegisterClientScriptHelper.cs b/web/studio/ASC.Web.Studio/Products/CRM/Classes/RegisterClientScriptHelper.cs index 4abfbf8098..a267b022b7 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Classes/RegisterClientScriptHelper.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Classes/RegisterClientScriptHelper.cs @@ -24,7 +24,6 @@ using System.Linq; using System.Runtime.Serialization.Json; using System.Text; -using System.Web; using System.Web.UI; using ASC.Common.Logging; @@ -37,7 +36,7 @@ using ASC.Web.CRM.Configuration; using ASC.Web.CRM.Resources; using ASC.Web.Studio.Core; - +using ASC.Web.Studio.Masters.MasterManagement; using Newtonsoft.Json; #endregion diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Configuration/VoipModule.cs b/web/studio/ASC.Web.Studio/Products/CRM/Configuration/VoipModule.cs index 06cf42ed41..39c6bb0d10 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Configuration/VoipModule.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Configuration/VoipModule.cs @@ -16,7 +16,6 @@ using System; -using System.Web; using System.Web.UI; using ASC.Data.Storage; @@ -25,6 +24,7 @@ using ASC.Web.CRM.Resources; using ASC.Web.Studio; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.CRM.Configuration { diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Cases/CasesActionView.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Cases/CasesActionView.ascx.cs index fb5d27cef3..931c7128bd 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Cases/CasesActionView.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Cases/CasesActionView.ascx.cs @@ -34,7 +34,7 @@ using ASC.Web.CRM.Core.Search; using ASC.Web.CRM.Resources; using ASC.Web.Studio.Core.Users; - +using ASC.Web.Studio.Masters.MasterManagement; using Autofac; using Newtonsoft.Json.Linq; diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Cases/CasesDetailsView.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Cases/CasesDetailsView.ascx.cs index 4ea617bba6..d660f9a45b 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Cases/CasesDetailsView.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Cases/CasesDetailsView.ascx.cs @@ -16,10 +16,10 @@ using System; -using System.Web; using ASC.CRM.Core; using ASC.Web.CRM.Classes; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.CRM.Controls.Cases { diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Cases/CasesFullCardView.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Cases/CasesFullCardView.ascx.cs index 58e09b8af8..9f603b7630 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Cases/CasesFullCardView.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Cases/CasesFullCardView.ascx.cs @@ -18,11 +18,11 @@ #region Import using System; -using System.Web; using ASC.CRM.Core; using ASC.Web.CRM.Classes; using ASC.Web.CRM.Controls.Common; +using ASC.Web.Studio.Masters.MasterManagement; #endregion diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Common/FileUploader.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Common/FileUploader.ascx.cs index e598202d23..24987fc767 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Common/FileUploader.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Common/FileUploader.ascx.cs @@ -17,9 +17,9 @@ using System; using System.Text; -using System.Web; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.CRM.Controls.Common { diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Common/HistoryView.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Common/HistoryView.ascx.cs index b2d48cde2c..940b939695 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Common/HistoryView.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Common/HistoryView.ascx.cs @@ -20,12 +20,12 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web; using ASC.Core; using ASC.CRM.Core; using ASC.Web.CRM.Classes; using ASC.Web.CRM.Core.Enums; +using ASC.Web.Studio.Masters.MasterManagement; #endregion diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Common/ImportFromCSVView.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Common/ImportFromCSVView.ascx.cs index 95a8e9e2fc..2787805584 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Common/ImportFromCSVView.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Common/ImportFromCSVView.ascx.cs @@ -19,7 +19,6 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using System.Web; using ASC.Core; using ASC.CRM.Core; @@ -28,6 +27,7 @@ using ASC.Web.CRM.Configuration; using ASC.Web.CRM.Resources; using ASC.Web.Studio.Core.Users; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.CRM.Controls.Common { diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Common/ListBaseView.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Common/ListBaseView.ascx.cs index a08123ec60..fd0c9e9325 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Common/ListBaseView.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Common/ListBaseView.ascx.cs @@ -17,11 +17,11 @@ using System; using System.Collections.Generic; -using System.Web; using ASC.Core; using ASC.Web.CRM.Resources; using ASC.Web.Studio.Core.Users; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.UserControls.EmptyScreens; namespace ASC.Web.CRM.Controls.Common diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Common/PrivatePanel.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Common/PrivatePanel.ascx.cs index b096e84b64..776b4fd03b 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Common/PrivatePanel.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Common/PrivatePanel.ascx.cs @@ -18,12 +18,11 @@ using System; using System.Collections.Generic; using System.Text; -using System.Web; using ASC.Web.CRM.Classes; using ASC.Web.CRM.Resources; using ASC.Web.Studio.Core.Users; - +using ASC.Web.Studio.Masters.MasterManagement; using Newtonsoft.Json; diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Contacts/ContactActionView.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Contacts/ContactActionView.ascx.cs index 56c894bf0e..6006d56f80 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Contacts/ContactActionView.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Contacts/ContactActionView.ascx.cs @@ -33,7 +33,7 @@ using ASC.Web.CRM.Core.Enums; using ASC.Web.CRM.Resources; using ASC.Web.Studio.Core; - +using ASC.Web.Studio.Masters.MasterManagement; using Newtonsoft.Json.Linq; diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Contacts/ContactDetailsView.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Contacts/ContactDetailsView.ascx.cs index c7afa08388..ffb4daeda0 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Contacts/ContactDetailsView.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Contacts/ContactDetailsView.ascx.cs @@ -17,7 +17,6 @@ using System; using System.Text; -using System.Web; using ASC.CRM.Core; using ASC.CRM.Core.Entities; @@ -26,6 +25,7 @@ using ASC.Web.Core.Mobile; using ASC.Web.Core.Utility; using ASC.Web.CRM.Classes; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.CRM.Controls.Contacts diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Contacts/ContactFullCardView.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Contacts/ContactFullCardView.ascx.cs index a3324870c1..1db9f09883 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Contacts/ContactFullCardView.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Contacts/ContactFullCardView.ascx.cs @@ -27,6 +27,7 @@ using ASC.Web.CRM.Classes; using ASC.Web.CRM.Controls.Common; using ASC.Web.CRM.Resources; +using ASC.Web.Studio.Masters.MasterManagement; #endregion diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Deals/DealActionView.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Deals/DealActionView.ascx.cs index 63aea4400e..30ff5b9a1f 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Deals/DealActionView.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Deals/DealActionView.ascx.cs @@ -37,8 +37,9 @@ using ASC.Web.CRM.Core; using ASC.Web.CRM.Resources; using ASC.Web.CRM.Services.NotifyService; +using ASC.Web.Studio.Core; using ASC.Web.Studio.Core.Users; - +using ASC.Web.Studio.Masters.MasterManagement; using Autofac; #endregion diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Deals/DealDetailsView.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Deals/DealDetailsView.ascx.cs index 10a0e3410d..e00ed90992 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Deals/DealDetailsView.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Deals/DealDetailsView.ascx.cs @@ -18,11 +18,11 @@ #region Import using System; -using System.Web; using ASC.CRM.Core; using ASC.CRM.Core.Entities; using ASC.Web.CRM.Classes; +using ASC.Web.Studio.Masters.MasterManagement; #endregion diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Deals/DealFullCardView.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Deals/DealFullCardView.ascx.cs index 090a32d3c1..ee1b835bc7 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Deals/DealFullCardView.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Deals/DealFullCardView.ascx.cs @@ -20,13 +20,13 @@ using System; using System.Collections.Generic; using System.Threading; -using System.Web; using ASC.CRM.Core; using ASC.CRM.Core.Entities; using ASC.Web.CRM.Classes; using ASC.Web.CRM.Controls.Common; using ASC.Web.CRM.Resources; +using ASC.Web.Studio.Masters.MasterManagement; #endregion diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Invoices/InvoiceActionView.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Invoices/InvoiceActionView.ascx.cs index f764facd25..abaebd9fcb 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Invoices/InvoiceActionView.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Invoices/InvoiceActionView.ascx.cs @@ -33,6 +33,7 @@ using ASC.Web.CRM.Core; using ASC.Web.CRM.Resources; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; using Autofac; diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Invoices/InvoiceDetailsView.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Invoices/InvoiceDetailsView.ascx.cs index 3fc5e78f64..c68b8c2114 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Invoices/InvoiceDetailsView.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Invoices/InvoiceDetailsView.ascx.cs @@ -19,11 +19,11 @@ using System; using System.Text; -using System.Web; using ASC.CRM.Core; using ASC.CRM.Core.Entities; using ASC.Web.CRM.Classes; +using ASC.Web.Studio.Masters.MasterManagement; #endregion diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Reports/ReportsView.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Reports/ReportsView.ascx.cs index 80113f5cbb..fe6976d358 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Reports/ReportsView.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Reports/ReportsView.ascx.cs @@ -19,12 +19,12 @@ using System; using System.Collections.Generic; -using System.Web; using ASC.Core; using ASC.CRM.Core; using ASC.Web.CRM.Classes; using ASC.Web.CRM.Resources; +using ASC.Web.Studio.Masters.MasterManagement; #endregion diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Sender/SmtpSender.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Sender/SmtpSender.ascx.cs index 32fc20af86..decd822829 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Sender/SmtpSender.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Sender/SmtpSender.ascx.cs @@ -17,10 +17,10 @@ using System; using System.Text; -using System.Web; using ASC.Web.CRM.Classes; using ASC.Web.CRM.Controls.Common; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.CRM.Controls.Sender { diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/CommonSettingsView.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/CommonSettingsView.ascx.cs index fa7fda4215..793fc29f6b 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/CommonSettingsView.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/CommonSettingsView.ascx.cs @@ -16,7 +16,7 @@ using System; -using System.Web; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.CRM.Controls.Settings { diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/CurrencySettingsView.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/CurrencySettingsView.ascx.cs index 1f93bb6b3f..0eb59d7e39 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/CurrencySettingsView.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/CurrencySettingsView.ascx.cs @@ -17,10 +17,10 @@ using System; using System.Collections.Generic; -using System.Web; using ASC.CRM.Core; using ASC.Web.CRM.Classes; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.CRM.Controls.Settings { diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/CustomFieldsView.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/CustomFieldsView.ascx.cs index 35a841025d..305d85e744 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/CustomFieldsView.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/CustomFieldsView.ascx.cs @@ -18,7 +18,7 @@ #region Import using System; -using System.Web; +using ASC.Web.Studio.Masters.MasterManagement; #endregion diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/DealMilestoneView.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/DealMilestoneView.ascx.cs index d8ede0a9d5..d2584c85b0 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/DealMilestoneView.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/DealMilestoneView.ascx.cs @@ -18,7 +18,7 @@ #region Import using System; -using System.Web; +using ASC.Web.Studio.Masters.MasterManagement; #endregion diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/InvoiceSettings/InvoiceItemActionView.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/InvoiceSettings/InvoiceItemActionView.ascx.cs index ce73592c73..9bdd4a8d70 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/InvoiceSettings/InvoiceItemActionView.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/InvoiceSettings/InvoiceItemActionView.ascx.cs @@ -18,10 +18,9 @@ #region Import using System; -using System.Web; using ASC.Web.CRM.Classes; - +using ASC.Web.Studio.Masters.MasterManagement; using Newtonsoft.Json; #endregion diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/InvoiceSettings/InvoiceItemsView.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/InvoiceSettings/InvoiceItemsView.ascx.cs index 1361ce9dec..066afb84b9 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/InvoiceSettings/InvoiceItemsView.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/InvoiceSettings/InvoiceItemsView.ascx.cs @@ -16,7 +16,7 @@ using System; -using System.Web; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.CRM.Controls.Settings { diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/InvoiceSettings/InvoiceTaxesView.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/InvoiceSettings/InvoiceTaxesView.ascx.cs index 571e5d4150..2d54b3a587 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/InvoiceSettings/InvoiceTaxesView.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/InvoiceSettings/InvoiceTaxesView.ascx.cs @@ -18,7 +18,7 @@ #region Import using System; -using System.Web; +using ASC.Web.Studio.Masters.MasterManagement; #endregion diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/InvoiceSettings/OrganisationProfile.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/InvoiceSettings/OrganisationProfile.ascx.cs index 1374fc0dc1..adc2ab8eff 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/InvoiceSettings/OrganisationProfile.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/InvoiceSettings/OrganisationProfile.ascx.cs @@ -18,8 +18,7 @@ #region Import using System; -using System.Web; - +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; #endregion diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/ListItemView.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/ListItemView.ascx.cs index e42dfcaa9c..37c6e07ab0 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/ListItemView.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/ListItemView.ascx.cs @@ -19,9 +19,9 @@ using System; using System.Text; -using System.Web; using ASC.CRM.Core; +using ASC.Web.Studio.Masters.MasterManagement; #endregion diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/TagSettingsView.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/TagSettingsView.ascx.cs index 14a729d9f3..318d4b0ddc 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/TagSettingsView.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/TagSettingsView.ascx.cs @@ -16,7 +16,7 @@ using System; -using System.Web; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.CRM.Controls.Settings { diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/TaskTemplateView.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/TaskTemplateView.ascx.cs index a4088b6793..b9bdddda87 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/TaskTemplateView.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/TaskTemplateView.ascx.cs @@ -17,7 +17,6 @@ using System; using System.Text; -using System.Web; using ASC.CRM.Core; using ASC.Web.Core.Utility.Skins; @@ -25,6 +24,7 @@ using ASC.Web.CRM.Resources; using ASC.Web.Studio.Controls.Common; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.CRM.Controls.Settings { diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/VoipSettings/VoipCalls.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/VoipSettings/VoipCalls.ascx.cs index 15759b0dfa..274471eacc 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/VoipSettings/VoipCalls.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/VoipSettings/VoipCalls.ascx.cs @@ -16,12 +16,12 @@ using System; -using System.Web; using ASC.CRM.Core; using ASC.Data.Storage; using ASC.Web.Studio; using ASC.Web.Studio.Controls.Common; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; namespace ASC.Web.CRM.Controls.Settings diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/VoipSettings/VoipCommon.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/VoipSettings/VoipCommon.ascx.cs index c6c766f4b5..944addd02a 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/VoipSettings/VoipCommon.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/VoipSettings/VoipCommon.ascx.cs @@ -23,6 +23,7 @@ using ASC.CRM.Core; using ASC.Web.Core.Client.HttpHandlers; using ASC.Web.Studio; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.CRM.Controls.Settings { diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/VoipSettings/VoipNumbers.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/VoipSettings/VoipNumbers.ascx.cs index 37a6c95a5d..4b168b984e 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/VoipSettings/VoipNumbers.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/VoipSettings/VoipNumbers.ascx.cs @@ -16,10 +16,10 @@ using System; -using System.Web; using ASC.CRM.Core; using ASC.Web.Studio; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.CRM.Controls.Settings { diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/VoipSettings/VoipQuick.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/VoipSettings/VoipQuick.ascx.cs index 652005fb7e..dad9cf2851 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/VoipSettings/VoipQuick.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/VoipSettings/VoipQuick.ascx.cs @@ -24,6 +24,7 @@ using ASC.Web.Core.Files; using ASC.Web.Core.Utility; using ASC.Web.Studio; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/WebToLeadFormView.ascx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/WebToLeadFormView.ascx.cs index 31e7b1b25c..c5893cad7a 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/WebToLeadFormView.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Controls/Settings/WebToLeadFormView.ascx.cs @@ -18,10 +18,10 @@ using System; using System.Collections.Generic; using System.Text; -using System.Web; using ASC.Core; using ASC.Web.CRM.Classes; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.CRM.Controls.Settings diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Core/Entities/Deal.cs b/web/studio/ASC.Web.Studio/Products/CRM/Core/Entities/Deal.cs index ab2e92f7a2..c70741185d 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Core/Entities/Deal.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Core/Entities/Deal.cs @@ -21,6 +21,7 @@ using System.Runtime.Serialization; using ASC.Common.Security; +using ASC.Web.Studio.Core; #endregion diff --git a/web/studio/ASC.Web.Studio/Products/CRM/MailViewer.aspx.cs b/web/studio/ASC.Web.Studio/Products/CRM/MailViewer.aspx.cs index f3d9754381..a4776ff98d 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/MailViewer.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/MailViewer.aspx.cs @@ -18,11 +18,10 @@ #region Import using System.Text; -using System.Web; using ASC.CRM.Core; using ASC.Web.CRM.Classes; - +using ASC.Web.Studio.Masters.MasterManagement; using Newtonsoft.Json; #endregion diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Settings.aspx.cs b/web/studio/ASC.Web.Studio/Products/CRM/Settings.aspx.cs index d190950e69..28ee8cdb21 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Settings.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Settings.aspx.cs @@ -22,6 +22,7 @@ using ASC.CRM.Core.Entities; using ASC.Web.CRM.Controls.Settings; using ASC.Web.CRM.Resources; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.CRM diff --git a/web/studio/ASC.Web.Studio/Products/CRM/Utils/ExportToCSV.cs b/web/studio/ASC.Web.Studio/Products/CRM/Utils/ExportToCSV.cs index 64865ad2ce..3d6dbf104c 100644 --- a/web/studio/ASC.Web.Studio/Products/CRM/Utils/ExportToCSV.cs +++ b/web/studio/ASC.Web.Studio/Products/CRM/Utils/ExportToCSV.cs @@ -40,6 +40,7 @@ using ASC.Web.CRM.Resources; using ASC.Web.CRM.Services.NotifyService; using ASC.Web.Files.Utils; +using ASC.Web.Studio.Core; using ASC.Web.Studio.Utility; using Autofac; diff --git a/web/studio/ASC.Web.Studio/Products/Community/ASC.Web.Community.csproj b/web/studio/ASC.Web.Studio/Products/Community/ASC.Web.Community.csproj index 17bde47391..8e07f41072 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/ASC.Web.Community.csproj +++ b/web/studio/ASC.Web.Studio/Products/Community/ASC.Web.Community.csproj @@ -1,730 +1,536 @@ - - + + - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {11BA9805-752F-4F6F-A876-6BA56F0EB9DE} + net48 + false + false Library - Properties - ASC.Web.Community - ASC.Web.Community - v4.8 - false ..\..\..\..\..\ $(TrunkDir)\web\studio\ASC.Web.Studio\bin\ - - - - - 4.0 - + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 - false ..\..\bin\ASC.Web.Community.xml CS1591 none - true - TRACE - prompt - 4 - false + - + ButtonSidePanel.ascx ASPXCodeBehind - + ButtonSidePanel.ascx - + NavigationSidePanel.ascx ASPXCodeBehind - + NavigationSidePanel.ascx - + Default.aspx ASPXCodeBehind - + Default.aspx - + Help.aspx ASPXCodeBehind - + Help.aspx - - - - + Community.Master ASPXCodeBehind - + Community.Master - + AddBlog.aspx ASPXCodeBehind - + AddBlog.aspx - - - - - - - - - - - - - - - - - - - - - - - - - - + Default.aspx ASPXCodeBehind - + Default.aspx - + EditBlog.aspx ASPXCodeBehind - + EditBlog.aspx - + ASPXCodeBehind - + ASPXCodeBehind - + ViewBlog.aspx ASPXCodeBehind - + ViewBlog.aspx - + ViewBlogView.ascx ASPXCodeBehind - + ViewBlogView.ascx - + BookmarkInfo.aspx ASPXCodeBehind - + BookmarkInfo.aspx - - - - - - - - - - - - - - - - - - - - - - - - + CreateBookmark.aspx ASPXCodeBehind - + CreateBookmark.aspx - + Default.aspx ASPXCodeBehind - + Default.aspx - + FavouriteBookmarks.aspx ASPXCodeBehind - + FavouriteBookmarks.aspx - + True True BookmarkingSubscriptionPatterns.resx - + UserBookmarks.aspx ASPXCodeBehind - + UserBookmarks.aspx - + BookmarkAddedByUserContorl.ascx ASPXCodeBehind - + BookmarkAddedByUserContorl.ascx - + BookmarkHeaderPageControl.ascx ASPXCodeBehind - + BookmarkHeaderPageControl.ascx - + BookmarkInfoUserControl.ascx ASPXCodeBehind - + BookmarkInfoUserControl.ascx - + BookmarkingRemoverFromFavouritePopup.ascx ASPXCodeBehind - + BookmarkingRemoverFromFavouritePopup.ascx - + BookmarkingUserControl.ascx ASPXCodeBehind - + BookmarkingUserControl.ascx - + BookmarkRaitingUserControl.ascx ASPXCodeBehind - + BookmarkRaitingUserControl.ascx - + CommentsUserControl.ascx ASPXCodeBehind - + CommentsUserControl.ascx - - - - - - ASPXCodeBehind - - - - - - - - - - - - - + + ASPXCodeBehind + + BookmarkingPagingUserControl.ascx ASPXCodeBehind - + BookmarkingPagingUserControl.ascx - + CreateBookmarkUserControl.ascx ASPXCodeBehind - + CreateBookmarkUserControl.ascx - + ASPXCodeBehind - + Default.aspx.cs - + SingleBookmarkUserControl.ascx ASPXCodeBehind - + SingleBookmarkUserControl.ascx - - ASPXCodeBehind - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + ASPXCodeBehind + + Default.aspx ASPXCodeBehind - + Default.aspx - + EditTopic.aspx ASPXCodeBehind - + EditTopic.aspx - + Forum.Master ASPXCodeBehind - + Forum.Master - + ManagementCenter.aspx ASPXCodeBehind - + ManagementCenter.aspx - + NewForum.aspx ASPXCodeBehind - + NewForum.aspx - + NewPost.aspx ASPXCodeBehind - + NewPost.aspx - + Posts.aspx ASPXCodeBehind - + Posts.aspx - + Search.aspx ASPXCodeBehind - + Search.aspx - + Topics.aspx ASPXCodeBehind - + Topics.aspx - - - - - - - - + PagingControl.ascx ASPXCodeBehind - + PagingControl.ascx - + ForumEditor.ascx ASPXCodeBehind - + ForumEditor.ascx - + ForumMaker.ascx ASPXCodeBehind - + ForumMaker.ascx - + NewPostControl.ascx - + NewPostControl.ascx - + PostControl.ascx ASPXCodeBehind - + PostControl.ascx - + PostListControl.ascx - + PostListControl.ascx - - + ThreadCategoryListControl.ascx ASPXCodeBehind - + ThreadCategoryListControl.ascx - + TopicControl.ascx ASPXCodeBehind - + TopicControl.ascx - + TopicEditorControl.ascx ASPXCodeBehind - + TopicEditorControl.ascx - + TopicListControl.ascx ASPXCodeBehind - + TopicListControl.ascx - + UserTopics.aspx ASPXCodeBehind - + UserTopics.aspx - + Patterns.resx True True - - - - - - - - - - - - - - - - - - - - - + FeedItem.ascx ASPXCodeBehind - + FeedItem.ascx - + FeedView.ascx ASPXCodeBehind - + FeedView.ascx - + Default.aspx ASPXCodeBehind - + Default.aspx - + EditNews.aspx ASPXCodeBehind - + EditNews.aspx - + EditPoll.aspx ASPXCodeBehind - + EditPoll.aspx - + News.aspx ASPXCodeBehind - + News.aspx - + News.Master ASPXCodeBehind - + News.Master - - - + NewsPatternsResource.resx True True - - - - - - - - - - - - - - - - - - - - - - - - - - - - ASPXCodeBehind - - - - - + + ASPXCodeBehind + + Default.aspx ASPXCodeBehind - + Default.aspx - + Diff.aspx ASPXCodeBehind - + Diff.aspx - - - + ListCategories.aspx - + ListCategories.aspx - + ListFiles.aspx ASPXCodeBehind - + ListFiles.aspx - + ListPages.aspx ASPXCodeBehind - + ListPages.aspx - + PageHistoryList.aspx ASPXCodeBehind - + PageHistoryList.aspx - + True True WikiPatternsResource.resx - + Wiki.Master ASPXCodeBehind - + Wiki.Master - - + EditFile.ascx ASPXCodeBehind - + EditFile.ascx - + EditPage.ascx ASPXCodeBehind - + EditPage.ascx - + FileUploader.aspx - + FileUploader.aspx - + ListFiles.ascx ASPXCodeBehind - + ListFiles.ascx - + ListPages.ascx ASPXCodeBehind - + ListPages.ascx - + MiniToolbar.ascx ASPXCodeBehind - + MiniToolbar.ascx - + ViewFile.ascx ASPXCodeBehind - + ViewFile.ascx - + ViewPage.ascx ASPXCodeBehind - + ViewPage.ascx - + Photos.aspx ASPXCodeBehind - + Photos.aspx - - - - - BlogsResource.resx @@ -773,7 +579,7 @@ BlogsResource.resx - + Designer PublicResXFileCodeGenerator BlogsResource.Designer.cs @@ -799,7 +605,7 @@ BlogsResource.resx - + True True BlogsResource.resx @@ -852,7 +658,7 @@ BlogPatternResource.resx - + Designer PublicResXFileCodeGenerator BlogPatternResource.Designer.cs @@ -878,22 +684,16 @@ BlogPatternResource.resx - + True True BlogPatternResource.resx - + True True BlogPatternsResource.resx - - - - - - BlogsResource.resx @@ -941,7 +741,7 @@ - + PublicResXFileCodeGenerator BlogPatternsResource.Designer.cs Designer @@ -991,7 +791,7 @@ BookmarkingPatternResource.resx - + Designer PublicResXFileCodeGenerator BookmarkingPatternResource.Designer.cs @@ -1017,7 +817,7 @@ BookmarkingPatternResource.resx - + True True BookmarkingPatternResource.resx @@ -1070,7 +870,7 @@ BookmarkingBusinessResources.resx - + Designer PublicResXFileCodeGenerator BookmarkingBusinessResources.Designer.cs @@ -1096,12 +896,12 @@ BookmarkingBusinessResources.resx - + True True BookmarkingBusinessResources.resx - + PublicResXFileCodeGenerator BookmarkingSubscriptionPatterns.Designer.cs Designer @@ -1154,7 +954,7 @@ BookmarkingResource.resx - + Designer PublicResXFileCodeGenerator @@ -1179,7 +979,7 @@ BookmarkingResource.resx - + True True BookmarkingResource.resx @@ -1232,7 +1032,7 @@ BookmarkingUCResource.resx - + Designer PublicResXFileCodeGenerator BookmarkingUCResource.Designer.cs @@ -1258,7 +1058,7 @@ BookmarkingUCResource.resx - + True True BookmarkingUCResource.resx @@ -1311,7 +1111,7 @@ ForumPatternResource.resx - + Designer PublicResXFileCodeGenerator ForumPatternResource.Designer.cs @@ -1337,12 +1137,12 @@ ForumPatternResource.resx - + True True ForumPatternResource.resx - + Designer PublicResXFileCodeGenerator Patterns.Designer.cs @@ -1395,7 +1195,7 @@ ForumResource.resx - + Designer PublicResXFileCodeGenerator @@ -1420,7 +1220,7 @@ ForumResource.resx - + True True ForumResource.resx @@ -1473,7 +1273,7 @@ ForumUCResource.resx - + Designer PublicResXFileCodeGenerator ForumUCResource.Designer.cs @@ -1499,7 +1299,7 @@ ForumUCResource.resx - + True True ForumUCResource.resx @@ -1552,7 +1352,7 @@ NewsResource.resx - + Designer PublicResXFileCodeGenerator NewsResource.Designer.cs @@ -1578,12 +1378,12 @@ NewsResource.resx - + True True NewsResource.resx - + Designer PublicResXFileCodeGenerator NewsPatternsResource.Designer.cs @@ -1636,7 +1436,7 @@ NewsPatternResource.resx - + Designer PublicResXFileCodeGenerator NewsPatternResource.Designer.cs @@ -1662,7 +1462,7 @@ NewsPatternResource.resx - + True True NewsPatternResource.resx @@ -1715,7 +1515,7 @@ WikiUCResource.resx - + Designer PublicResXFileCodeGenerator WikiUCResource.Designer.cs @@ -1741,7 +1541,7 @@ WikiUCResource.resx - + True True WikiUCResource.resx @@ -1794,7 +1594,7 @@ WikiResource.resx - + Designer PublicResXFileCodeGenerator WikiResource.Designer.cs @@ -1820,12 +1620,12 @@ WikiResource.resx - + True True WikiResource.resx - + Designer PublicResXFileCodeGenerator WikiPatternsResource.Designer.cs @@ -1878,7 +1678,7 @@ WikiPatternResource.resx - + Designer PublicResXFileCodeGenerator WikiPatternResource.Designer.cs @@ -1904,7 +1704,7 @@ WikiPatternResource.resx - + True True WikiPatternResource.resx @@ -1972,7 +1772,7 @@ CommunityResource.resx - + Designer PublicResXFileCodeGenerator CommunityResource.Designer.cs @@ -2005,7 +1805,7 @@ CommunityResource.resx Designer - + True True CommunityResource.resx @@ -3059,34 +2859,13 @@ - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {3f6b420f-abd3-4b5a-9f4c-5d61ffbb01de} - ASC.Data.Storage - - - {49f07fff-98a5-47d2-a9e9-a46b98c41245} - ASC.Api.Core - - - {ae1a0e06-6cd4-4e1d-8209-22bbbd6d5652} - ASC.ElasticSearch - - - {02c40a64-fe22-41d0-9037-69f0d6f787a9} - ASC.Web.Core - - - {e7be6ce8-f6b0-4b9b-831b-ba0c85c8d130} - ASC.Web.Studio - + + + + + + + @@ -3138,12 +2917,490 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/web/studio/ASC.Web.Studio/Products/Community/Default.aspx.cs b/web/studio/ASC.Web.Studio/Products/Community/Default.aspx.cs index 11b46bf608..3625be30f4 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Default.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Default.aspx.cs @@ -25,7 +25,7 @@ using ASC.Core.Users; using ASC.Web.Community.Product; using ASC.Web.Core; -using ASC.Web.Studio; +using ASC.Web.Studio.Masters; using ASC.Web.Studio.UserControls.EmptyScreens; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/Products/Community/Help.aspx.cs b/web/studio/ASC.Web.Studio/Products/Community/Help.aspx.cs index 5a4c7cf3ab..b420c7047c 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Help.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Help.aspx.cs @@ -16,8 +16,7 @@ using System; - -using ASC.Web.Studio; +using ASC.Web.Studio.Masters; using ASC.Web.Studio.UserControls.Common.HelpCenter; namespace ASC.Web.Community diff --git a/web/studio/ASC.Web.Studio/Products/Community/Master/Community.Master.cs b/web/studio/ASC.Web.Studio/Products/Community/Master/Community.Master.cs index 9b6d842d69..4dbf13987e 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Master/Community.Master.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Master/Community.Master.cs @@ -16,10 +16,10 @@ using System; -using System.Web; using System.Web.UI; using ASC.Web.Community.Controls; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Community { diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Blogs/AddBlog.aspx.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Blogs/AddBlog.aspx.cs index 689f4aeab6..306c4a1095 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Blogs/AddBlog.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Blogs/AddBlog.aspx.cs @@ -19,7 +19,6 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using System.Web; using AjaxPro; @@ -31,6 +30,7 @@ using ASC.Web.Community.Modules.Blogs.Core.Resources; using ASC.Web.Community.Product; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.Community.Blogs diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Blogs/Default.aspx.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Blogs/Default.aspx.cs index 432ec5e819..6fc5accc80 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Blogs/Default.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Blogs/Default.aspx.cs @@ -30,6 +30,7 @@ using ASC.Web.Community.Product; using ASC.Web.Core.Utility.Skins; using ASC.Web.Studio.Controls.Common; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.Community.Blogs diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Blogs/EditBlog.aspx.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Blogs/EditBlog.aspx.cs index 35af5738cb..c280d9f537 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Blogs/EditBlog.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Blogs/EditBlog.aspx.cs @@ -30,6 +30,7 @@ using ASC.Web.Community.Modules.Blogs.Core.Resources; using ASC.Web.Community.Product; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.Community.Blogs diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Blogs/PageControllers/BasePage.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Blogs/PageControllers/BasePage.cs index 5aa80dbd9e..f4d3efe06e 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Blogs/PageControllers/BasePage.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Blogs/PageControllers/BasePage.cs @@ -22,7 +22,8 @@ using ASC.Blogs.Core; using ASC.Web.Core.Utility; -using ASC.Web.Studio; +using ASC.Web.Studio.Masters; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.Community.Blogs diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Blogs/ViewBlog.aspx.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Blogs/ViewBlog.aspx.cs index 29523152b2..9d7ea16b40 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Blogs/ViewBlog.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Blogs/ViewBlog.aspx.cs @@ -26,6 +26,7 @@ using ASC.Web.Community.Modules.Blogs.Core.Resources; using ASC.Web.Community.Product; using ASC.Web.Core.Users; +using ASC.Web.Studio.Core; using ASC.Web.Studio.UserControls.Common.Comments; using ASC.Web.Studio.Utility; using ASC.Web.Studio.Utility.HtmlUtility; diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/Core/Business/BookmarkingService.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/Core/Business/BookmarkingService.cs index 20726c41f3..2bb2e2aef6 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/Core/Business/BookmarkingService.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/Core/Business/BookmarkingService.cs @@ -37,6 +37,7 @@ using ASC.Notify.Recipients; using ASC.Web.Community.Search; using ASC.Web.Core.Users; +using ASC.Web.Studio.Core; using ASC.Web.Studio.Utility; using Tag = ASC.Bookmarking.Pojo.Tag; diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/CreateBookmark.aspx.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/CreateBookmark.aspx.cs index 6f1a88d268..18e9d277b9 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/CreateBookmark.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/CreateBookmark.aspx.cs @@ -15,13 +15,12 @@ */ -using System.Web; - using ASC.Bookmarking; using ASC.Bookmarking.Business.Permissions; using ASC.Bookmarking.Common; using ASC.Web.Community.Bookmarking.Util; using ASC.Web.Community.Modules.Bookmarking.UserControls.Resources; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; using ASC.Web.UserControls.Bookmarking; using ASC.Web.UserControls.Bookmarking.Common; diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/UserControls/BookmarkingUserControl.ascx.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/UserControls/BookmarkingUserControl.ascx.cs index 48f7a09bdd..26196d4b2b 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/UserControls/BookmarkingUserControl.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/UserControls/BookmarkingUserControl.ascx.cs @@ -37,6 +37,7 @@ using ASC.Web.Core; using ASC.Web.Core.Utility.Skins; using ASC.Web.Studio.Controls.Common; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.UserControls.Common.ViewSwitcher; using ASC.Web.Studio.Utility; using ASC.Web.UserControls.Bookmarking.Common; diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/UserControls/Common/ActionButton/ActionButton.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/UserControls/Common/ActionButton/ActionButton.cs index 6e3e2c2d2d..026cd50271 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/UserControls/Common/ActionButton/ActionButton.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/UserControls/Common/ActionButton/ActionButton.cs @@ -17,9 +17,9 @@ using System; using System.Text; -using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.UserControls.Bookmarking.Common { diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/UserControls/Common/Presentation/BookmarkInfoBase.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/UserControls/Common/Presentation/BookmarkInfoBase.cs index a1597d324e..e665a6fc79 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/UserControls/Common/Presentation/BookmarkInfoBase.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/UserControls/Common/Presentation/BookmarkInfoBase.cs @@ -26,6 +26,7 @@ using ASC.Web.Community.Modules.Bookmarking.UserControls.Resources; using ASC.Web.Core.Helpers; using ASC.Web.Core.Utility.Skins; +using ASC.Web.Studio.Core.Users; using ASC.Web.UserControls.Bookmarking.Common.Util; namespace ASC.Web.UserControls.Bookmarking.Common.Presentation diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/UserControls/Common/Presentation/BookmarkingServiceHelper.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/UserControls/Common/Presentation/BookmarkingServiceHelper.cs index cec49821b1..0f92673a1c 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/UserControls/Common/Presentation/BookmarkingServiceHelper.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/UserControls/Common/Presentation/BookmarkingServiceHelper.cs @@ -38,6 +38,7 @@ using ASC.Web.Core.Users; using ASC.Web.Core.Utility.Skins; using ASC.Web.Studio.Controls.Common; +using ASC.Web.Studio.Core.Users; using ASC.Web.Studio.UserControls.Common.Comments; using ASC.Web.Studio.UserControls.Common.ViewSwitcher; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/UserControls/Common/Util/BookmarkingConverter.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/UserControls/Common/Util/BookmarkingConverter.cs index 836ec690ee..08e900c105 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/UserControls/Common/Util/BookmarkingConverter.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/UserControls/Common/Util/BookmarkingConverter.cs @@ -22,6 +22,7 @@ using ASC.Bookmarking.Business.Permissions; using ASC.Bookmarking.Pojo; using ASC.Web.Core.Users; +using ASC.Web.Studio.Core; using ASC.Web.Studio.UserControls.Common.Comments; using ASC.Web.Studio.Utility; using ASC.Web.Studio.Utility.HtmlUtility; diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/Util/BookmarkingBasePage.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/Util/BookmarkingBasePage.cs index 701de9badb..a055f37b6e 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/Util/BookmarkingBasePage.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Bookmarking/Util/BookmarkingBasePage.cs @@ -16,14 +16,14 @@ using System; -using System.Web; using ASC.Bookmarking; using ASC.Bookmarking.Common; using ASC.Web.Community.Modules.Bookmarking.UserControls.Resources; using ASC.Web.Community.Product; using ASC.Web.Core.Utility; -using ASC.Web.Studio; +using ASC.Web.Studio.Masters; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.UserControls.Bookmarking.Common.Presentation; namespace ASC.Web.Community.Bookmarking.Util diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/Default.aspx.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/Default.aspx.cs index 63d722a32f..c93e1ad572 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/Default.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/Default.aspx.cs @@ -23,8 +23,8 @@ using ASC.Forum; using ASC.Web.Community.Modules.Forum.Resources; using ASC.Web.Core.Utility.Skins; -using ASC.Web.Studio; using ASC.Web.Studio.Controls.Common; +using ASC.Web.Studio.Masters; using ASC.Web.Studio.Utility; using ASC.Web.UserControls.Forum.Common; diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/EditTopic.aspx.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/EditTopic.aspx.cs index 397602cc72..2f57eded1c 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/EditTopic.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/EditTopic.aspx.cs @@ -18,7 +18,7 @@ using System; using ASC.Web.Community.Modules.Forum.Resources; -using ASC.Web.Studio; +using ASC.Web.Studio.Masters; using ASC.Web.Studio.Utility; using ASC.Web.UserControls.Forum; using ASC.Web.UserControls.Forum.Common; diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/Forum.Master.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/Forum.Master.cs index 93fb88ecdb..68a9fe8084 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/Forum.Master.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/Forum.Master.cs @@ -17,13 +17,13 @@ using System; using System.Text; -using System.Web; using System.Web.UI; using System.Web.UI.WebControls; using ASC.Web.Community.Modules.Forum.Resources; using ASC.Web.Core.Utility; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Community.Forum { diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/ManagementCenter.aspx.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/ManagementCenter.aspx.cs index 79d60f9892..76f7aaf04a 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/ManagementCenter.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/ManagementCenter.aspx.cs @@ -17,8 +17,7 @@ using System; using System.Web.UI; - -using ASC.Web.Studio; +using ASC.Web.Studio.Masters; using ASC.Web.UserControls.Forum.Common; namespace ASC.Web.Community.Forum diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/NewForum.aspx.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/NewForum.aspx.cs index fcec63140f..b415017ff5 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/NewForum.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/NewForum.aspx.cs @@ -23,7 +23,7 @@ using ASC.Forum; using ASC.Web.Community.Modules.Forum.Resources; -using ASC.Web.Studio; +using ASC.Web.Studio.Masters; using ASC.Web.Studio.Utility; namespace ASC.Web.Community.Forum diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/NewPost.aspx.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/NewPost.aspx.cs index 24cb20473a..a38bd2a170 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/NewPost.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/NewPost.aspx.cs @@ -18,7 +18,7 @@ using System; using ASC.Web.Community.Modules.Forum.Resources; -using ASC.Web.Studio; +using ASC.Web.Studio.Masters; using ASC.Web.Studio.Utility; using ASC.Web.UserControls.Forum; using ASC.Web.UserControls.Forum.Common; diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/Posts.aspx.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/Posts.aspx.cs index 7c445d0a77..46ddd292bc 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/Posts.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/Posts.aspx.cs @@ -23,7 +23,7 @@ using ASC.Forum; using ASC.Web.Community.Modules.Forum.Resources; using ASC.Web.Community.Resources; -using ASC.Web.Studio; +using ASC.Web.Studio.Masters; using ASC.Web.Studio.Utility; using ASC.Web.UserControls.Forum; using ASC.Web.UserControls.Forum.Common; diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/Search.aspx.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/Search.aspx.cs index 9b694d75bc..5aa1d30c0b 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/Search.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/Search.aspx.cs @@ -23,8 +23,8 @@ using ASC.Forum; using ASC.Web.Community.Modules.Forum.Resources; using ASC.Web.Core.Utility.Skins; -using ASC.Web.Studio; using ASC.Web.Studio.Controls.Common; +using ASC.Web.Studio.Masters; using ASC.Web.Studio.Utility; using ASC.Web.UserControls.Forum; using ASC.Web.UserControls.Forum.Common; diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/Topics.aspx.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/Topics.aspx.cs index 583e42ffcb..2caeb4dbde 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/Topics.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/Topics.aspx.cs @@ -24,8 +24,8 @@ using ASC.Forum; using ASC.Web.Community.Modules.Forum.Resources; using ASC.Web.Core.Utility.Skins; -using ASC.Web.Studio; using ASC.Web.Studio.Controls.Common; +using ASC.Web.Studio.Masters; using ASC.Web.Studio.Utility; using ASC.Web.UserControls.Forum.Common; diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserControls/Common/DateTimeService.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserControls/Common/DateTimeService.cs index a314218652..26a1f8e9f6 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserControls/Common/DateTimeService.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserControls/Common/DateTimeService.cs @@ -19,6 +19,7 @@ using ASC.Core.Tenants; using ASC.Web.Community.Modules.Forum.UserControls.Resources; +using ASC.Web.Studio.Core; namespace ASC.Web.UserControls.Forum.Common { diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserControls/Common/ForumScriptProvider.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserControls/Common/ForumScriptProvider.cs index 15df0c9a32..73369f2fed 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserControls/Common/ForumScriptProvider.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserControls/Common/ForumScriptProvider.cs @@ -17,10 +17,10 @@ using System; using System.Text; -using System.Web; using System.Web.UI; using ASC.Web.Community.Modules.Forum.UserControls.Resources; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.UserControls.Forum.Common { diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserControls/NewPostControl.ascx.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserControls/NewPostControl.ascx.cs index d3f73a7615..7c8b1fc36f 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserControls/NewPostControl.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserControls/NewPostControl.ascx.cs @@ -39,6 +39,7 @@ using ASC.Web.Studio.Controls.FileUploader; using ASC.Web.Studio.Controls.FileUploader.HttpModule; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; using ASC.Web.Studio.Utility.HtmlUtility; using ASC.Web.UserControls.Forum.Common; diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserControls/PostListControl.ascx.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserControls/PostListControl.ascx.cs index 381ab1004a..ec5c9d38f0 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserControls/PostListControl.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserControls/PostListControl.ascx.cs @@ -30,6 +30,7 @@ using ASC.Web.Community.Modules.Forum.UserControls.Resources; using ASC.Web.Core; using ASC.Web.Studio.Controls.Common; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.UserControls.Common.PollForm; using ASC.Web.Studio.Utility; using ASC.Web.UserControls.Forum.Common; diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserControls/TopicControl.ascx.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserControls/TopicControl.ascx.cs index 090e4b3899..37630da3c9 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserControls/TopicControl.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserControls/TopicControl.ascx.cs @@ -27,6 +27,7 @@ using ASC.Forum; using ASC.Web.Community.Modules.Forum.UserControls.Resources; using ASC.Web.Core.Utility.Skins; +using ASC.Web.Studio.Core.Users; using ASC.Web.Studio.Utility; using ASC.Web.UserControls.Forum.Common; diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserControls/TopicEditorControl.ascx.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserControls/TopicEditorControl.ascx.cs index dfd06ddcd2..6730359c41 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserControls/TopicEditorControl.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserControls/TopicEditorControl.ascx.cs @@ -28,6 +28,7 @@ using ASC.Forum; using ASC.Web.Community.Modules.Forum.UserControls.Resources; using ASC.Web.Community.Search; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.UserControls.Common.PollForm; using ASC.Web.Studio.Utility; using ASC.Web.UserControls.Forum.Common; diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserControls/TopicListControl.ascx.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserControls/TopicListControl.ascx.cs index a91fd0f794..7eb056833c 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserControls/TopicListControl.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserControls/TopicListControl.ascx.cs @@ -25,6 +25,7 @@ using ASC.Core; using ASC.Forum; using ASC.Web.Studio.Controls.Common; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.UserControls.Forum diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserTopics.aspx.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserTopics.aspx.cs index 4a438b4016..719518bb48 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserTopics.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Forum/UserTopics.aspx.cs @@ -25,8 +25,8 @@ using ASC.Forum; using ASC.Web.Community.Modules.Forum.Resources; using ASC.Web.Core.Utility.Skins; -using ASC.Web.Studio; using ASC.Web.Studio.Controls.Common; +using ASC.Web.Studio.Masters; using ASC.Web.Studio.Utility; using ASC.Web.UserControls.Forum; using ASC.Web.UserControls.Forum.Common; diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/News/Code/DAO/DbFeedStorage.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/News/Code/DAO/DbFeedStorage.cs index dfc59e1f9c..e5b1864e55 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/News/Code/DAO/DbFeedStorage.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/News/Code/DAO/DbFeedStorage.cs @@ -34,6 +34,7 @@ using ASC.Web.Community.News.Code.Module; using ASC.Web.Community.Search; using ASC.Web.Core.Users; +using ASC.Web.Studio.Core; using ASC.Web.Studio.Utility; using ASC.Web.Studio.Utility.HtmlUtility; diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/News/Default.aspx.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/News/Default.aspx.cs index 76a38c5f88..e0c97d2ee0 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/News/Default.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/News/Default.aspx.cs @@ -32,8 +32,10 @@ using ASC.Web.Community.Product; using ASC.Web.Core.Users; using ASC.Web.Core.Utility.Skins; -using ASC.Web.Studio; using ASC.Web.Studio.Controls.Common; +using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.UserControls.Common.Comments; using ASC.Web.Studio.Utility; using ASC.Web.Studio.Utility.HtmlUtility; diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/News/EditNews.aspx.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/News/EditNews.aspx.cs index f456aa79ac..35c05c947a 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/News/EditNews.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/News/EditNews.aspx.cs @@ -30,6 +30,8 @@ using ASC.Web.Community.Product; using ASC.Web.Studio; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; using ASC.Web.Studio.Utility.HtmlUtility; diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/News/EditPoll.aspx.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/News/EditPoll.aspx.cs index 6efb34bbb8..e4e453fc79 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/News/EditPoll.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/News/EditPoll.aspx.cs @@ -23,7 +23,7 @@ using ASC.Web.Community.News.Code; using ASC.Web.Community.News.Code.DAO; using ASC.Web.Community.Product; -using ASC.Web.Studio; +using ASC.Web.Studio.Masters; using ASC.Web.Studio.UserControls.Common.PollForm; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/News/News.Master.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/News/News.Master.cs index 563642397b..02afe7f1b2 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/News/News.Master.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/News/News.Master.cs @@ -16,13 +16,13 @@ using System; -using System.Web; using ASC.Core; using ASC.Notify.Recipients; using ASC.Web.Community.News.Code.Module; using ASC.Web.Core.Utility; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Community.News { diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Wiki/Code/BaseUserControl.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Wiki/Code/BaseUserControl.cs index 60cfb65543..41ab161951 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Wiki/Code/BaseUserControl.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Wiki/Code/BaseUserControl.cs @@ -16,9 +16,9 @@ using System; -using System.Web; using ASC.Web.Core.Utility; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.UserControls.Wiki.Data; using ASC.Web.UserControls.Wiki.Handlers; diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Wiki/Common/WikiBasePage.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Wiki/Common/WikiBasePage.cs index 14cead29c5..87c64a95f3 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Wiki/Common/WikiBasePage.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Wiki/Common/WikiBasePage.cs @@ -24,6 +24,7 @@ using ASC.Web.Community.Modules.Wiki.Resources; using ASC.Web.Studio; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters; using ASC.Web.Studio.Utility; using ASC.Web.UserControls.Wiki; using ASC.Web.UserControls.Wiki.Data; diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Wiki/Default.aspx.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Wiki/Default.aspx.cs index bab687035d..058da55fb3 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Wiki/Default.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Wiki/Default.aspx.cs @@ -35,6 +35,7 @@ using ASC.Web.Core.Users; using ASC.Web.Core.Utility.Skins; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.UserControls.Common.Comments; using ASC.Web.Studio.Utility; using ASC.Web.Studio.Utility.HtmlUtility; diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Wiki/ListFiles.aspx.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Wiki/ListFiles.aspx.cs index 27cc3f76f6..69193a4a3c 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Wiki/ListFiles.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Wiki/ListFiles.aspx.cs @@ -30,6 +30,7 @@ using ASC.Web.Core.Utility.Skins; using ASC.Web.Studio.Controls.Common; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Core.Users; using ASC.Web.UserControls.Wiki; using ASC.Web.UserControls.Wiki.Data; using ASC.Web.UserControls.Wiki.Handlers; diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Wiki/ListPages.aspx.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Wiki/ListPages.aspx.cs index 9a07da68c7..d00957c972 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Wiki/ListPages.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Wiki/ListPages.aspx.cs @@ -26,6 +26,7 @@ using ASC.Web.Community.Wiki.Common; using ASC.Web.Core.Utility.Skins; using ASC.Web.Studio.Controls.Common; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.UserControls.Wiki; using ASC.Web.UserControls.Wiki.Data; diff --git a/web/studio/ASC.Web.Studio/Products/Community/Modules/Wiki/Wiki.Master.cs b/web/studio/ASC.Web.Studio/Products/Community/Modules/Wiki/Wiki.Master.cs index bf34c78f2e..be79b550d0 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Modules/Wiki/Wiki.Master.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Modules/Wiki/Wiki.Master.cs @@ -25,7 +25,7 @@ using ASC.Web.Community.Wiki.Common; using ASC.Web.Core.Utility; using ASC.Web.Studio.Core; - +using ASC.Web.Studio.Masters.MasterManagement; using WikiNotifySource = ASC.Web.UserControls.Wiki.WikiNotifySource; namespace ASC.Web.Community.Wiki diff --git a/web/studio/ASC.Web.Studio/Products/Community/Photos.aspx.cs b/web/studio/ASC.Web.Studio/Products/Community/Photos.aspx.cs index 3d6855ba59..a96fdcbd46 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Photos.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Photos.aspx.cs @@ -26,8 +26,8 @@ using System.Web.UI; using ASC.Api; -using ASC.Web.Studio; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters; #endregion diff --git a/web/studio/ASC.Web.Studio/Products/Community/Search/NewsWrapper.cs b/web/studio/ASC.Web.Studio/Products/Community/Search/NewsWrapper.cs index 9696a96b99..215fe602c8 100644 --- a/web/studio/ASC.Web.Studio/Products/Community/Search/NewsWrapper.cs +++ b/web/studio/ASC.Web.Studio/Products/Community/Search/NewsWrapper.cs @@ -44,7 +44,7 @@ public sealed class NewsWrapper : Wrapper [Join(JoinTypeEnum.Sub, "tenant:tenant", "id:poll")] public List PollVariantWrapper { get; set; } - public static implicit operator NewsWrapper(Feed feed) + public static implicit operator NewsWrapper(ASC.Web.Community.News.Code.Feed feed) { var result = new NewsWrapper { diff --git a/web/studio/ASC.Web.Studio/Products/Files/ASC.Web.Files.csproj b/web/studio/ASC.Web.Studio/Products/Files/ASC.Web.Files.csproj index 4cb1767f76..f87c1e5a0c 100644 --- a/web/studio/ASC.Web.Studio/Products/Files/ASC.Web.Files.csproj +++ b/web/studio/ASC.Web.Studio/Products/Files/ASC.Web.Files.csproj @@ -1,288 +1,185 @@ - - + + - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {8C534AF7-5696-4E68-9FF4-FFC311893C10} - {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} + net48 + false + false Library - Properties - ASC.Web.Files - ASC.Web.Files - v4.8 - - - - - 4.0 - - false - - - - ..\..\bin\ + false + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 - false ..\..\bin\ASC.Web.Files.xml CS1591 none - true - TRACE - prompt - 4 - false + + false + false + - - + FormFilling.ascx ASPXCodeBehind - + FormFilling.ascx - + AppBanner.ascx ASPXCodeBehind - + AppBanner.ascx - + ContentList.ascx ASPXCodeBehind - + ContentList.ascx - + ConfirmConvert.ascx ASPXCodeBehind - + ConfirmConvert.ascx - + FileChoisePopup.ascx ASPXCodeBehind - + FileChoisePopup.ascx - + MainContentFilter.ascx ASPXCodeBehind - + MainContentFilter.ascx - + MainButton.ascx ASPXCodeBehind - + MainButton.ascx - + PrivateRoomOpenFile.ascx ASPXCodeBehind - + PrivateRoomOpenFile.ascx - + Sailfish.ascx ASPXCodeBehind - + Sailfish.ascx - + Desktop.ascx ASPXCodeBehind - + Desktop.ascx - + FileSelector.ascx ASPXCodeBehind - + FileSelector.ascx - + App.aspx ASPXCodeBehind - + App.aspx - + MoreFeatures.ascx ASPXCodeBehind - + MoreFeatures.ascx - + UnsubscribeDialog.ascx ASPXCodeBehind - + UnsubscribeDialog.ascx - + SharingDialog.ascx ASPXCodeBehind - + SharingDialog.ascx - - - - - - - - - - - - - - - - - + docusignhandler.ashx - + OpenPrivate.aspx ASPXCodeBehind - + OpenPrivate.aspx - + SaveAs.aspx ASPXCodeBehind - + SaveAs.aspx - - + FileChoice.aspx ASPXCodeBehind - + FileChoice.aspx - + EditorScripts.ascx ASPXCodeBehind - - - - - - - - - - - + thirdpartyapphandler.ashx - - + Share.aspx ASPXCodeBehind - + Share.aspx - - - - - - - - - - - - - - + Warmup.aspx ASPXCodeBehind - + Warmup.aspx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + BasicTemplate.Master ASPXCodeBehind - + BasicTemplate.Master - - @@ -421,42 +318,24 @@ - + DocEditor.aspx ASPXCodeBehind - + DocEditor.aspx - + Default.aspx ASPXCodeBehind - + Default.aspx - + filehandler.ashx - - - - - - - - - - - - - - - - - - @@ -522,7 +401,7 @@ FilesCommonResource.resx - + Designer PublicResXFileCodeGenerator FilesCommonResource.Designer.cs @@ -548,7 +427,7 @@ FilesCommonResource.resx - + True True FilesCommonResource.resx @@ -601,7 +480,7 @@ FilesJSResource.resx - + Designer PublicResXFileCodeGenerator FilesJSResource.Designer.cs @@ -627,7 +506,7 @@ FilesJSResource.resx - + True True FilesJSResource.resx @@ -680,7 +559,7 @@ FilesUCResource.resx - + Designer PublicResXFileCodeGenerator FilesUCResource.Designer.cs @@ -706,7 +585,7 @@ FilesUCResource.resx - + True True FilesUCResource.resx @@ -759,7 +638,7 @@ FilesPatternResource.resx - + Designer PublicResXFileCodeGenerator FilesPatternResource.Designer.cs @@ -785,7 +664,7 @@ FilesPatternResource.resx - + True True FilesPatternResource.resx @@ -1009,97 +888,76 @@ - + ChunkUploadDialog.ascx ASPXCodeBehind - + ChunkUploadDialog.ascx - + ConvertFile.ascx ASPXCodeBehind - + ConvertFile.ascx - - - - + CreateMenu.ascx ASPXCodeBehind - + CreateMenu.ascx - + AccessRights.ascx ASPXCodeBehind - + AccessRights.ascx - + ThirdParty.ascx ASPXCodeBehind - + ThirdParty.ascx - + EmptyFolder.ascx ASPXCodeBehind - + EmptyFolder.ascx - + MainMenu.ascx ASPXCodeBehind - + MainMenu.ascx - + MainContent.ascx ASPXCodeBehind - + MainContent.ascx - + Tree.ascx ASPXCodeBehind - + Tree.ascx - + TreeBuilder.ascx ASPXCodeBehind - + TreeBuilder.ascx - - - - - - - - - - - - - - - - - - @@ -1182,41 +1040,15 @@ - - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {3f6b420f-abd3-4b5a-9f4c-5d61ffbb01de} - ASC.Data.Storage - - - {49f07fff-98a5-47d2-a9e9-a46b98c41245} - ASC.Api.Core - - - {ae1a0e06-6cd4-4e1d-8209-22bbbd6d5652} - ASC.ElasticSearch - - - {bd8a18a5-60c5-4411-9719-0aa11b4be0e9} - ASC.MessagingSystem - - - {481b0d9c-b2f8-4de9-8597-ba8d24585099} - ASC.FederatedLogin - - - {02c40a64-fe22-41d0-9037-69f0d6f787a9} - ASC.Web.Core - - - {e7be6ce8-f6b0-4b9b-831b-ba0c85c8d130} - ASC.Web.Studio - + + + + + + + + + @@ -1262,11 +1094,174 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - @@ -1278,12 +1273,10 @@ http://localhost/ASC.Web.Files False False - - + False - \ No newline at end of file diff --git a/web/studio/ASC.Web.Studio/Products/Files/ASC.Web.Files.csproj.user b/web/studio/ASC.Web.Studio/Products/Files/ASC.Web.Files.csproj.user new file mode 100644 index 0000000000..db8622989d --- /dev/null +++ b/web/studio/ASC.Web.Studio/Products/Files/ASC.Web.Files.csproj.user @@ -0,0 +1,6 @@ + + + + Debug|Any CPU + + \ No newline at end of file diff --git a/web/studio/ASC.Web.Studio/Products/Files/App.aspx.cs b/web/studio/ASC.Web.Studio/Products/Files/App.aspx.cs index 1b1ea42282..b6342f0ca4 100644 --- a/web/studio/ASC.Web.Studio/Products/Files/App.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Files/App.aspx.cs @@ -23,8 +23,8 @@ using ASC.Web.Files.HttpHandlers; using ASC.Web.Files.Resources; using ASC.Web.Files.ThirdPartyApp; -using ASC.Web.Studio; - +using ASC.Web.Studio.Masters; +using ASC.Web.Studio.Masters.MasterManagement; using Global = ASC.Web.Files.Classes.Global; namespace ASC.Web.Files diff --git a/web/studio/ASC.Web.Studio/Products/Files/Configuration/FilesSpaceUsageStatManager.cs b/web/studio/ASC.Web.Studio/Products/Files/Configuration/FilesSpaceUsageStatManager.cs index 58ad477368..f85e645b9b 100644 --- a/web/studio/ASC.Web.Studio/Products/Files/Configuration/FilesSpaceUsageStatManager.cs +++ b/web/studio/ASC.Web.Studio/Products/Files/Configuration/FilesSpaceUsageStatManager.cs @@ -29,6 +29,7 @@ using ASC.Web.Core; using ASC.Web.Files.Classes; using ASC.Web.Files.Resources; +using ASC.Web.Studio.Core.Users; using ASC.Web.Studio.Utility; namespace ASC.Web.Files diff --git a/web/studio/ASC.Web.Studio/Products/Files/Controls/ChunkUploadDialog/ChunkUploadDialog.ascx.cs b/web/studio/ASC.Web.Studio/Products/Files/Controls/ChunkUploadDialog/ChunkUploadDialog.ascx.cs index 6530f671c3..efa3e56e39 100644 --- a/web/studio/ASC.Web.Studio/Products/Files/Controls/ChunkUploadDialog/ChunkUploadDialog.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/Files/Controls/ChunkUploadDialog/ChunkUploadDialog.ascx.cs @@ -19,11 +19,11 @@ using System.IO; using System.Runtime.Serialization.Json; using System.Text; -using System.Web; using System.Web.UI; using ASC.Web.Files.Classes; using ASC.Web.Studio.Core.Quota; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Files.Controls { diff --git a/web/studio/ASC.Web.Studio/Products/Files/Controls/Desktop/Desktop.ascx.cs b/web/studio/ASC.Web.Studio/Products/Files/Controls/Desktop/Desktop.ascx.cs index 7941d479e0..cd11756fcb 100644 --- a/web/studio/ASC.Web.Studio/Products/Files/Controls/Desktop/Desktop.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/Files/Controls/Desktop/Desktop.ascx.cs @@ -16,13 +16,13 @@ using System; -using System.Web; using System.Web.UI; using ASC.Core; using ASC.Web.Core.Files; using ASC.Web.Core.WhiteLabel; using ASC.Web.Files.Classes; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.Files.Controls diff --git a/web/studio/ASC.Web.Studio/Products/Files/Controls/FileSelector/FileSelector.ascx.cs b/web/studio/ASC.Web.Studio/Products/Files/Controls/FileSelector/FileSelector.ascx.cs index 313becb40f..0d5dda4be9 100644 --- a/web/studio/ASC.Web.Studio/Products/Files/Controls/FileSelector/FileSelector.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/Files/Controls/FileSelector/FileSelector.ascx.cs @@ -16,11 +16,11 @@ using System; -using System.Web; using System.Web.UI; using ASC.Web.Files.Classes; using ASC.Web.Files.Resources; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Files.Controls { diff --git a/web/studio/ASC.Web.Studio/Products/Files/Controls/MainContent/MainContent.ascx.cs b/web/studio/ASC.Web.Studio/Products/Files/Controls/MainContent/MainContent.ascx.cs index 46e3b927c3..f8779b1524 100644 --- a/web/studio/ASC.Web.Studio/Products/Files/Controls/MainContent/MainContent.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/Files/Controls/MainContent/MainContent.ascx.cs @@ -20,7 +20,6 @@ using System.IO; using System.Runtime.Serialization.Json; using System.Text; -using System.Web; using System.Web.UI; using ASC.Core; @@ -29,6 +28,8 @@ using ASC.Web.Files.Classes; using ASC.Web.Files.Services.WCFService; using ASC.Web.Files.Services.WCFService.FileOperations; +using ASC.Web.Studio.Masters.MasterManagement; +using ASC.Web.Studio.UserControls.Common.MediaViewer; using ASC.Web.Studio.UserControls.EmptyScreens; using ASC.Web.Studio.UserControls.Management; using ASC.Web.Studio.Utility; @@ -97,7 +98,7 @@ private void InitControls() if (!NoMediaViewers) { - ControlPlaceHolder.Controls.Add(LoadControl(Studio.UserControls.Common.MediaPlayer.Location)); + ControlPlaceHolder.Controls.Add(LoadControl(MediaPlayer.Location)); } UploaderPlaceHolder.Controls.Add(LoadControl(ChunkUploadDialog.Location)); diff --git a/web/studio/ASC.Web.Studio/Products/Files/Controls/Sailfish/Sailfish.ascx.cs b/web/studio/ASC.Web.Studio/Products/Files/Controls/Sailfish/Sailfish.ascx.cs index f147daddfa..06a84002c8 100644 --- a/web/studio/ASC.Web.Studio/Products/Files/Controls/Sailfish/Sailfish.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/Files/Controls/Sailfish/Sailfish.ascx.cs @@ -16,11 +16,11 @@ using System; -using System.Web; using System.Web.UI; using ASC.Web.Core.Files; using ASC.Web.Files.Classes; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Files.Controls { diff --git a/web/studio/ASC.Web.Studio/Products/Files/Controls/Tree/Tree.ascx.cs b/web/studio/ASC.Web.Studio/Products/Files/Controls/Tree/Tree.ascx.cs index df6bef1b95..9a56f3c6ac 100644 --- a/web/studio/ASC.Web.Studio/Products/Files/Controls/Tree/Tree.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/Files/Controls/Tree/Tree.ascx.cs @@ -16,7 +16,6 @@ using System; -using System.Web; using System.Web.UI; using ASC.Core; @@ -24,6 +23,7 @@ using ASC.Files.Core; using ASC.Web.Core.Files; using ASC.Web.Files.Classes; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Files.Controls { diff --git a/web/studio/ASC.Web.Studio/Products/Files/Default.aspx.cs b/web/studio/ASC.Web.Studio/Products/Files/Default.aspx.cs index 64fad7ec71..381231905b 100644 --- a/web/studio/ASC.Web.Studio/Products/Files/Default.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Files/Default.aspx.cs @@ -32,9 +32,9 @@ using ASC.Web.Files.Masters; using ASC.Web.Files.Resources; using ASC.Web.Files.Utils; -using ASC.Web.Studio; using ASC.Web.Studio.Core; using ASC.Web.Studio.Core.Notify; +using ASC.Web.Studio.Masters; using ASC.Web.Studio.UserControls.Common.LoaderPage; namespace ASC.Web.Files diff --git a/web/studio/ASC.Web.Studio/Products/Files/DocEditor.aspx.cs b/web/studio/ASC.Web.Studio/Products/Files/DocEditor.aspx.cs index 2fc583c3d8..efc750a6cf 100644 --- a/web/studio/ASC.Web.Studio/Products/Files/DocEditor.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Files/DocEditor.aspx.cs @@ -45,6 +45,7 @@ using ASC.Web.Files.Utils; using ASC.Web.Studio; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls.DeepLink; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/Products/Files/FileChoice.aspx.cs b/web/studio/ASC.Web.Studio/Products/Files/FileChoice.aspx.cs index 5b7be570f0..1c4eee8dfd 100644 --- a/web/studio/ASC.Web.Studio/Products/Files/FileChoice.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Files/FileChoice.aspx.cs @@ -28,7 +28,8 @@ using ASC.Web.Files.Classes; using ASC.Web.Files.Controls; using ASC.Web.Files.Resources; -using ASC.Web.Studio; +using ASC.Web.Studio.Masters; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Files { diff --git a/web/studio/ASC.Web.Studio/Products/Files/OpenPrivate.aspx.cs b/web/studio/ASC.Web.Studio/Products/Files/OpenPrivate.aspx.cs index 116df9950d..6b08a9245b 100644 --- a/web/studio/ASC.Web.Studio/Products/Files/OpenPrivate.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Files/OpenPrivate.aspx.cs @@ -28,10 +28,10 @@ using ASC.Web.Files.Controls; using ASC.Web.Files.Resources; using ASC.Web.Studio.Core; -using ASC.Web.Studio; using Global = ASC.Web.Files.Classes.Global; using ASC.Web.Core.Utility; +using ASC.Web.Studio.Masters; namespace ASC.Web.Files { diff --git a/web/studio/ASC.Web.Studio/Products/Files/Properties/launchSettings.json b/web/studio/ASC.Web.Studio/Products/Files/Properties/launchSettings.json new file mode 100644 index 0000000000..81629ace79 --- /dev/null +++ b/web/studio/ASC.Web.Studio/Products/Files/Properties/launchSettings.json @@ -0,0 +1,12 @@ +{ + "profiles": { + "ASC.Web.Files": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "http://localhost:64481" + } + } +} \ No newline at end of file diff --git a/web/studio/ASC.Web.Studio/Products/Files/SaveAs.aspx.cs b/web/studio/ASC.Web.Studio/Products/Files/SaveAs.aspx.cs index 0c2bbfedc3..99c171e31c 100644 --- a/web/studio/ASC.Web.Studio/Products/Files/SaveAs.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Files/SaveAs.aspx.cs @@ -17,7 +17,6 @@ using System; using System.Text; -using System.Web; using ASC.Web.Core.Client.Bundling; using ASC.Web.Core.Files; @@ -25,8 +24,8 @@ using ASC.Web.Files.Classes; using ASC.Web.Files.Controls; using ASC.Web.Files.Resources; -using ASC.Web.Studio; - +using ASC.Web.Studio.Masters; +using ASC.Web.Studio.Masters.MasterManagement; using Global = ASC.Web.Files.Classes.Global; namespace ASC.Web.Files diff --git a/web/studio/ASC.Web.Studio/Products/Files/Share.aspx.cs b/web/studio/ASC.Web.Studio/Products/Files/Share.aspx.cs index f484c12477..4a7f0f141f 100644 --- a/web/studio/ASC.Web.Studio/Products/Files/Share.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Files/Share.aspx.cs @@ -28,8 +28,8 @@ using ASC.Web.Files.Classes; using ASC.Web.Files.Controls; using ASC.Web.Files.Resources; -using ASC.Web.Studio; - +using ASC.Web.Studio.Masters; +using ASC.Web.Studio.Masters.MasterManagement; using Newtonsoft.Json; using Global = ASC.Web.Files.Classes.Global; diff --git a/web/studio/ASC.Web.Studio/Products/People/ASC.Web.People.csproj b/web/studio/ASC.Web.Studio/Products/People/ASC.Web.People.csproj index a656f26752..1c0645fdfc 100644 --- a/web/studio/ASC.Web.Studio/Products/People/ASC.Web.People.csproj +++ b/web/studio/ASC.Web.Studio/Products/People/ASC.Web.People.csproj @@ -1,157 +1,113 @@ - - + + - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {7EA1E14F-FC71-48A7-9786-1FB0CD9EC1CD} Library - Properties - ASC.Web.People - ASC.Web.People - v4.8 - - - - - 4.0 - ..\..\bin\ + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 - false ..\..\bin\ASC.Web.People.xml CS1591 none - true - TRACE - prompt - 4 - false + + + net48 + false + false - - + CardDavSettings.aspx ASPXCodeBehind - + CardDavSettings.aspx - - - - - - - - - - - - + Import.aspx ASPXCodeBehind - + Import.aspx - - + Birthdays.aspx ASPXCodeBehind - + Birthdays.aspx - + Reassigns.aspx ASPXCodeBehind - + Reassigns.aspx - - + Help.aspx ASPXCodeBehind - + Help.aspx - - - - + PeopleBaseTemplate.Master ASPXCodeBehind - + PeopleBaseTemplate.Master - - + Default.aspx ASPXCodeBehind - + Default.aspx - + Profile.aspx ASPXCodeBehind - + Profile.aspx - + ProfileAction.aspx - + ProfileAction.aspx - - + SideButtonsPanel.ascx ASPXCodeBehind - + SideButtonsPanel.ascx - + ImportUsers.ascx ASPXCodeBehind - + ImportUsers.ascx - + SideNavigationPanel.ascx ASPXCodeBehind - + SideNavigationPanel.ascx - + Warmup.aspx ASPXCodeBehind - + Warmup.aspx @@ -296,7 +252,7 @@ BirthdayPatternResource.resx - + PublicResXFileCodeGenerator BirthdayPatternResource.Designer.cs Designer @@ -328,7 +284,7 @@ BirthdayPatternResource.resx - + True True BirthdayPatternResource.resx @@ -393,7 +349,7 @@ BirthdaysResource.resx - + PublicResXFileCodeGenerator BirthdaysResource.Designer.cs Designer @@ -425,7 +381,7 @@ BirthdaysResource.resx - + True True BirthdaysResource.resx @@ -475,7 +431,7 @@ PeopleJSResource.resx - + Designer PublicResXFileCodeGenerator PeopleJSResource.Designer.cs @@ -501,7 +457,7 @@ PeopleJSResource.resx - + True True PeopleJSResource.resx @@ -554,7 +510,7 @@ PeopleResource.resx - + Designer PublicResXFileCodeGenerator PeopleResource.Designer.cs @@ -580,7 +536,7 @@ PeopleResource.resx - + True True PeopleResource.resx @@ -699,30 +655,12 @@ - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {7080343d-fbe7-423a-9405-4f883f6e235b} - ASC.Mail - - - {bd8a18a5-60c5-4411-9719-0aa11b4be0e9} - ASC.MessagingSystem - - - {02c40a64-fe22-41d0-9037-69f0d6f787a9} - ASC.Web.Core - - - {e7be6ce8-f6b0-4b9b-831b-ba0c85c8d130} - ASC.Web.Studio - + + + + + + @@ -732,7 +670,141 @@ 13.0.1 - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/web/studio/ASC.Web.Studio/Products/People/Birthdays.aspx.cs b/web/studio/ASC.Web.Studio/Products/People/Birthdays.aspx.cs index 9316cdf902..63d84e9450 100644 --- a/web/studio/ASC.Web.Studio/Products/People/Birthdays.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/People/Birthdays.aspx.cs @@ -27,8 +27,9 @@ using ASC.Web.Core.Utility; using ASC.Web.People.Core; using ASC.Web.People.Resources; -using ASC.Web.Studio; using ASC.Web.Studio.Controls.Common; +using ASC.Web.Studio.Masters; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.People diff --git a/web/studio/ASC.Web.Studio/Products/People/CardDavSettings.aspx.cs b/web/studio/ASC.Web.Studio/Products/People/CardDavSettings.aspx.cs index 7692b9b7a2..616201fe59 100644 --- a/web/studio/ASC.Web.Studio/Products/People/CardDavSettings.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/People/CardDavSettings.aspx.cs @@ -23,7 +23,8 @@ using ASC.Core; using ASC.Web.Core; using ASC.Web.Core.Utility; -using ASC.Web.Studio; +using ASC.Web.Studio.Masters; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.People { diff --git a/web/studio/ASC.Web.Studio/Products/People/Classes/BirthdaysNotifyClient.cs b/web/studio/ASC.Web.Studio/Products/People/Classes/BirthdaysNotifyClient.cs index 4e784f9e56..3f2d2d750c 100644 --- a/web/studio/ASC.Web.Studio/Products/People/Classes/BirthdaysNotifyClient.cs +++ b/web/studio/ASC.Web.Studio/Products/People/Classes/BirthdaysNotifyClient.cs @@ -33,6 +33,7 @@ using ASC.Notify.Recipients; using ASC.Web.Core; using ASC.Web.People.Resources; +using ASC.Web.Studio.Core; using ASC.Web.Studio.Core.Notify; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/Products/People/Default.aspx.cs b/web/studio/ASC.Web.Studio/Products/People/Default.aspx.cs index a40392d87e..7cc9078e04 100644 --- a/web/studio/ASC.Web.Studio/Products/People/Default.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/People/Default.aspx.cs @@ -17,14 +17,14 @@ using System; using System.Configuration; -using System.Web; using ASC.Core; using ASC.Core.Users; using ASC.Web.Core; using ASC.Web.Core.Utility; using ASC.Web.People.Resources; -using ASC.Web.Studio; +using ASC.Web.Studio.Masters; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.UserControls.Common.LoaderPage; using ASC.Web.Studio.UserControls.Management.ImpersonateUser; using ASC.Web.Studio.UserControls.Statistics; diff --git a/web/studio/ASC.Web.Studio/Products/People/Help.aspx.cs b/web/studio/ASC.Web.Studio/Products/People/Help.aspx.cs index 468ce62a0e..7ce0e17996 100644 --- a/web/studio/ASC.Web.Studio/Products/People/Help.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/People/Help.aspx.cs @@ -16,8 +16,7 @@ using System; - -using ASC.Web.Studio; +using ASC.Web.Studio.Masters; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls.Common.HelpCenter; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/Products/People/Import.aspx.cs b/web/studio/ASC.Web.Studio/Products/People/Import.aspx.cs index bc4da30fb8..ae5ae56078 100644 --- a/web/studio/ASC.Web.Studio/Products/People/Import.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/People/Import.aspx.cs @@ -18,8 +18,8 @@ using System; using ASC.Web.People.UserControls; -using ASC.Web.Studio; using ASC.Web.Studio.Core.Users; +using ASC.Web.Studio.Masters; using ASC.Web.Studio.PublicResources; diff --git a/web/studio/ASC.Web.Studio/Products/People/Profile.aspx.cs b/web/studio/ASC.Web.Studio/Products/People/Profile.aspx.cs index 1c17005eb2..d6a4678774 100644 --- a/web/studio/ASC.Web.Studio/Products/People/Profile.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/People/Profile.aspx.cs @@ -23,8 +23,8 @@ using ASC.Core.Users; using ASC.Geolocation; using ASC.Web.Core; -using ASC.Web.Studio; using ASC.Web.Studio.Core.Users; +using ASC.Web.Studio.Masters; using ASC.Web.Studio.UserControls.Users; using ASC.Web.Studio.UserControls.Users.TipsSettings; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/Products/People/ProfileAction.aspx.cs b/web/studio/ASC.Web.Studio/Products/People/ProfileAction.aspx.cs index 23e7fd3e4a..a68c9751e9 100644 --- a/web/studio/ASC.Web.Studio/Products/People/ProfileAction.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/People/ProfileAction.aspx.cs @@ -27,9 +27,9 @@ using ASC.Web.Core.Users; using ASC.Web.Core.Utility; using ASC.Web.People.Resources; -using ASC.Web.Studio; using ASC.Web.Studio.Core; using ASC.Web.Studio.Core.Users; +using ASC.Web.Studio.Masters; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls.Users.UserProfile; diff --git a/web/studio/ASC.Web.Studio/Products/People/Reassigns.aspx.cs b/web/studio/ASC.Web.Studio/Products/People/Reassigns.aspx.cs index b3183258c8..5c96682dd4 100644 --- a/web/studio/ASC.Web.Studio/Products/People/Reassigns.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/People/Reassigns.aspx.cs @@ -22,7 +22,8 @@ using ASC.Core.Users; using ASC.Web.Core; using ASC.Web.People.Resources; -using ASC.Web.Studio; +using ASC.Web.Studio.Masters; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.People diff --git a/web/studio/ASC.Web.Studio/Products/People/UserControls/ImportUsers/ImportUsers.ascx.cs b/web/studio/ASC.Web.Studio/Products/People/UserControls/ImportUsers/ImportUsers.ascx.cs index 6bb4ec7bc6..c827eaaa49 100644 --- a/web/studio/ASC.Web.Studio/Products/People/UserControls/ImportUsers/ImportUsers.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/People/UserControls/ImportUsers/ImportUsers.ascx.cs @@ -16,7 +16,6 @@ using System; -using System.Web; using System.Web.UI; using AjaxPro; @@ -25,6 +24,7 @@ using ASC.Core.Users; using ASC.Web.Core.Utility; using ASC.Web.People.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.UserControls.Statistics; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/Products/People/web.config b/web/studio/ASC.Web.Studio/Products/People/web.config index 23274f78ef..04fab67d3a 100644 --- a/web/studio/ASC.Web.Studio/Products/People/web.config +++ b/web/studio/ASC.Web.Studio/Products/People/web.config @@ -6,10 +6,10 @@ - - - - + + + + diff --git a/web/studio/ASC.Web.Studio/Products/Projects/ASC.Web.Projects.csproj b/web/studio/ASC.Web.Studio/Products/Projects/ASC.Web.Projects.csproj index 361796661f..1eafb06e03 100644 --- a/web/studio/ASC.Web.Studio/Products/Projects/ASC.Web.Projects.csproj +++ b/web/studio/ASC.Web.Studio/Products/Projects/ASC.Web.Projects.csproj @@ -1,62 +1,28 @@ - - - - - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - + + + net48 + false + false Release - AnyCPU - 9.0.30729 - 2.0 - {11ACB4CA-A305-4CAA-8546-392C6DAFC7C4} - {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} Library - Properties - ASC.Web.Projects - ASC.Web.Projects - v4.8 OnBuildSuccess - - - - - 4.0 - false - - - - - ..\..\bin\ + false + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 - false ..\..\bin\ASC.Web.Projects.xml CS1591 none - true - TRACE - prompt - 4 - false + + false + false + - - @@ -102,332 +68,206 @@ - - - - - - - - - - - - - + ASPXCodeBehind - + ASPXCodeBehind - - - - - + Contacts.aspx ASPXCodeBehind - + Contacts.aspx - + CommonList.ascx ASPXCodeBehind - + CommonList.ascx - + ButtonSidePanel.ascx ASPXCodeBehind - + ButtonSidePanel.ascx - + NavigationSidePanel.ascx ASPXCodeBehind - + NavigationSidePanel.ascx - + ProjectDocumentsPopup.ascx ASPXCodeBehind - + ProjectDocumentsPopup.ascx - + DiscussionAction.ascx ASPXCodeBehind - + DiscussionAction.ascx - + ProjectAction.ascx ASPXCodeBehind - + ProjectAction.ascx - + ReportFile.ascx ASPXCodeBehind - + ReportFile.ascx - + ReportFilters.ascx ASPXCodeBehind - + ReportFilters.ascx - + ReportTemplateView.ascx ASPXCodeBehind - + ReportTemplateView.ascx - + ReportView.ascx ASPXCodeBehind - + ReportView.ascx - + EditTemplate.ascx ASPXCodeBehind - + EditTemplate.ascx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Default.aspx ASPXCodeBehind - + Default.aspx - + GanttChart.aspx ASPXCodeBehind - + GanttChart.aspx - + Help.aspx ASPXCodeBehind - + Help.aspx - - - - + Messages.aspx ASPXCodeBehind - + Messages.aspx - + Milestones.aspx ASPXCodeBehind - + Milestones.aspx - + Projects.aspx ASPXCodeBehind - + Projects.aspx - + BasicTemplate.Master ASPXCodeBehind - + BasicTemplate.Master - + ProjectTeam.aspx ASPXCodeBehind - + ProjectTeam.aspx - + ProjectTemplates.aspx ASPXCodeBehind - + ProjectTemplates.aspx - + Reports.aspx ASPXCodeBehind - + Reports.aspx - + Settings.aspx ASPXCodeBehind - + Settings.aspx - + Tasks.aspx ASPXCodeBehind - + Tasks.aspx - - - - - - - - - - - - + Timer.aspx ASPXCodeBehind - + Timer.aspx - + TimeTracking.aspx ASPXCodeBehind - + TimeTracking.aspx - + TMDocs.aspx ASPXCodeBehind - + TMDocs.aspx - - + Warmup.aspx ASPXCodeBehind - + Warmup.aspx @@ -591,7 +431,7 @@ ProjectsEnumResource.resx - + Designer PublicResXFileCodeGenerator ProjectsEnumResource.Designer.cs @@ -617,21 +457,11 @@ ProjectsEnumResource.resx - - True - True - ProjectsEnumResource.resx - - + Designer PublicResXFileCodeGenerator ProjectsPatternResource.Designer.cs - - True - True - ProjectsPatternResource.resx - PatternResource.resx @@ -680,7 +510,7 @@ PatternResource.resx - + Designer PublicResXFileCodeGenerator PatternResource.Designer.cs @@ -706,11 +536,6 @@ PatternResource.resx - - True - True - PatternResource.resx - EngineResource.resx @@ -756,7 +581,7 @@ EngineResource.resx - + Designer PublicResXFileCodeGenerator EngineResource.Designer.cs @@ -782,11 +607,6 @@ EngineResource.resx - - True - True - EngineResource.resx - ImportResource.resx @@ -835,7 +655,7 @@ ImportResource.resx - + Designer PublicResXFileCodeGenerator ImportResource.Designer.cs @@ -861,11 +681,6 @@ ImportResource.resx - - True - True - ImportResource.resx - ProjectResource.resx @@ -914,7 +729,7 @@ ProjectResource.resx - + Designer PublicResXFileCodeGenerator ProjectResource.Designer.cs @@ -940,11 +755,6 @@ ProjectResource.resx - - True - True - ProjectResource.resx - ProjectsCommonResource.resx @@ -993,7 +803,7 @@ ProjectsCommonResource.resx - + Designer PublicResXFileCodeGenerator ProjectsCommonResource.Designer.cs @@ -1019,11 +829,6 @@ ProjectsCommonResource.resx - - True - True - ProjectsCommonResource.resx - ProjectsFileResource.resx @@ -1072,7 +877,7 @@ ProjectsFileResource.resx - + Designer PublicResXFileCodeGenerator ProjectsFileResource.Designer.cs @@ -1098,11 +903,6 @@ ProjectsFileResource.resx - - True - True - ProjectsFileResource.resx - GrammaticalResource.resx @@ -1151,7 +951,7 @@ GrammaticalResource.resx - + Designer PublicResXFileCodeGenerator GrammaticalResource.Designer.cs @@ -1177,11 +977,6 @@ GrammaticalResource.resx - - True - True - GrammaticalResource.resx - ProjectsFilterResource.resx @@ -1230,7 +1025,7 @@ ProjectsFilterResource.resx - + Designer PublicResXFileCodeGenerator ProjectsFilterResource.Designer.cs @@ -1256,11 +1051,6 @@ ProjectsFilterResource.resx - - True - True - ProjectsFilterResource.resx - ProjectsJSResource.resx @@ -1309,7 +1099,7 @@ ProjectsJSResource.resx - + Designer PublicResXFileCodeGenerator ProjectsJSResource.Designer.cs @@ -1335,11 +1125,6 @@ ProjectsJSResource.resx - - True - True - ProjectsJSResource.resx - MessageResource.resx @@ -1388,7 +1173,7 @@ MessageResource.resx - + Designer PublicResXFileCodeGenerator MessageResource.Designer.cs @@ -1414,11 +1199,6 @@ MessageResource.resx - - True - True - MessageResource.resx - MilestoneResource.resx @@ -1467,7 +1247,7 @@ MilestoneResource.resx - + Designer PublicResXFileCodeGenerator MilestoneResource.Designer.cs @@ -1493,11 +1273,6 @@ MilestoneResource.resx - - True - True - MilestoneResource.resx - ProjectTemplatesResource.resx @@ -1546,7 +1321,7 @@ ProjectTemplatesResource.resx - + Designer PublicResXFileCodeGenerator ProjectTemplatesResource.Designer.cs @@ -1572,11 +1347,6 @@ ProjectTemplatesResource.resx - - True - True - ProjectTemplatesResource.resx - ReportResource.resx @@ -1625,7 +1395,7 @@ ReportResource.resx - + Designer PublicResXFileCodeGenerator ReportResource.Designer.cs @@ -1651,11 +1421,6 @@ ReportResource.resx - - True - True - ReportResource.resx - TaskResource.resx @@ -1704,7 +1469,7 @@ TaskResource.resx - + Designer PublicResXFileCodeGenerator TaskResource.Designer.cs @@ -1730,11 +1495,6 @@ TaskResource.resx - - True - True - TaskResource.resx - TimeTrackingResource.resx @@ -1783,7 +1543,7 @@ TimeTrackingResource.resx - + Designer PublicResXFileCodeGenerator TimeTrackingResource.Designer.cs @@ -1809,11 +1569,6 @@ TimeTrackingResource.resx - - True - True - TimeTrackingResource.resx - ProjectsEnumResource.resx @@ -2926,38 +2681,14 @@ - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {3f6b420f-abd3-4b5a-9f4c-5d61ffbb01de} - ASC.Data.Storage - - - {ae1a0e06-6cd4-4e1d-8209-22bbbd6d5652} - ASC.ElasticSearch - - - {02c40a64-fe22-41d0-9037-69f0d6f787a9} - ASC.Web.Core - - - {e7be6ce8-f6b0-4b9b-831b-ba0c85c8d130} - ASC.Web.Studio - - - {48efb880-3d76-4b21-b31e-1007c0062b5c} - ASC.Web.CRM - - - {8c534af7-5696-4e68-9ff4-ffc311893c10} - ASC.Web.Files - + + + + + + + + @@ -2982,7 +2713,745 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2991,17 +3460,13 @@ True 54559 / - - + False False - - + False - - \ No newline at end of file diff --git a/web/studio/ASC.Web.Studio/Products/Projects/ASC.Web.Projects.csproj.user b/web/studio/ASC.Web.Studio/Products/Projects/ASC.Web.Projects.csproj.user new file mode 100644 index 0000000000..db8622989d --- /dev/null +++ b/web/studio/ASC.Web.Studio/Products/Projects/ASC.Web.Projects.csproj.user @@ -0,0 +1,6 @@ + + + + Debug|Any CPU + + \ No newline at end of file diff --git a/web/studio/ASC.Web.Studio/Products/Projects/Classes/BasePage.cs b/web/studio/ASC.Web.Studio/Products/Projects/Classes/BasePage.cs index 2589f5a914..5f0486813c 100644 --- a/web/studio/ASC.Web.Studio/Products/Projects/Classes/BasePage.cs +++ b/web/studio/ASC.Web.Studio/Products/Projects/Classes/BasePage.cs @@ -23,8 +23,7 @@ using ASC.Web.Projects.Classes; using ASC.Web.Projects.Core; using ASC.Web.Projects.Masters; -using ASC.Web.Studio; - +using ASC.Web.Studio.Masters; using Autofac; namespace ASC.Web.Projects diff --git a/web/studio/ASC.Web.Studio/Products/Projects/Contacts.aspx.cs b/web/studio/ASC.Web.Studio/Products/Projects/Contacts.aspx.cs index 97961f8ac8..0584ff8e64 100644 --- a/web/studio/ASC.Web.Studio/Products/Projects/Contacts.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Projects/Contacts.aspx.cs @@ -15,13 +15,12 @@ */ -using System.Web; - using ASC.Web.Core; using ASC.Web.Core.Utility.Skins; using ASC.Web.Projects.Classes; using ASC.Web.Projects.Configuration; using ASC.Web.Projects.Resources; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/Products/Projects/Controls/Common/ProjectDocumentsPopup.ascx.cs b/web/studio/ASC.Web.Studio/Products/Projects/Controls/Common/ProjectDocumentsPopup.ascx.cs index e140af50d3..0e850c1c01 100644 --- a/web/studio/ASC.Web.Studio/Products/Projects/Controls/Common/ProjectDocumentsPopup.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/Projects/Controls/Common/ProjectDocumentsPopup.ascx.cs @@ -16,12 +16,12 @@ using System; -using System.Web; using System.Web.UI; using ASC.Files.Core; using ASC.Web.Files; using ASC.Web.Projects.Classes; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls.Common.LoaderPage; diff --git a/web/studio/ASC.Web.Studio/Products/Projects/Controls/Messages/DiscussionAction.ascx.cs b/web/studio/ASC.Web.Studio/Products/Projects/Controls/Messages/DiscussionAction.ascx.cs index 7ded53648b..203926279f 100644 --- a/web/studio/ASC.Web.Studio/Products/Projects/Controls/Messages/DiscussionAction.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/Projects/Controls/Messages/DiscussionAction.ascx.cs @@ -16,10 +16,10 @@ using System; -using System.Web; using ASC.Projects.Core.Domain; using ASC.Web.Projects.Resources; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Projects.Controls.Messages diff --git a/web/studio/ASC.Web.Studio/Products/Projects/Controls/Projects/ProjectAction.ascx.cs b/web/studio/ASC.Web.Studio/Products/Projects/Controls/Projects/ProjectAction.ascx.cs index b1c17231fd..5abb4882c5 100644 --- a/web/studio/ASC.Web.Studio/Products/Projects/Controls/Projects/ProjectAction.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/Projects/Controls/Projects/ProjectAction.ascx.cs @@ -16,9 +16,9 @@ using System; -using System.Web; using ASC.Web.Core.Utility; using ASC.Web.Projects.Classes; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Projects.Controls.Projects { diff --git a/web/studio/ASC.Web.Studio/Products/Projects/Controls/Reports/ReportFilters.ascx.cs b/web/studio/ASC.Web.Studio/Products/Projects/Controls/Reports/ReportFilters.ascx.cs index c82d8bd73d..1f1a2282d9 100644 --- a/web/studio/ASC.Web.Studio/Products/Projects/Controls/Reports/ReportFilters.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/Projects/Controls/Reports/ReportFilters.ascx.cs @@ -19,7 +19,7 @@ using ASC.Core.Tenants; using ASC.Projects.Core.Domain.Reports; - +using ASC.Web.Studio.Core; using Report = ASC.Web.Projects.Classes.Report; namespace ASC.Web.Projects.Controls.Reports diff --git a/web/studio/ASC.Web.Studio/Products/Projects/Controls/Templates/EditTemplate.ascx.cs b/web/studio/ASC.Web.Studio/Products/Projects/Controls/Templates/EditTemplate.ascx.cs index 3bc4367561..2d67a908b1 100644 --- a/web/studio/ASC.Web.Studio/Products/Projects/Controls/Templates/EditTemplate.ascx.cs +++ b/web/studio/ASC.Web.Studio/Products/Projects/Controls/Templates/EditTemplate.ascx.cs @@ -16,11 +16,11 @@ using System; -using System.Web; using ASC.Web.Core.Utility; using ASC.Web.Projects.Classes; using ASC.Web.Projects.Resources; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.Projects.Controls.Templates diff --git a/web/studio/ASC.Web.Studio/Products/Projects/GanttChart.aspx.cs b/web/studio/ASC.Web.Studio/Products/Projects/GanttChart.aspx.cs index c1ad51911a..6d8ad0138d 100644 --- a/web/studio/ASC.Web.Studio/Products/Projects/GanttChart.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Projects/GanttChart.aspx.cs @@ -17,11 +17,11 @@ using System.Collections.Generic; using System.Linq; -using System.Web; using ASC.Web.Core.Mobile; using ASC.Web.Core.Utility; using ASC.Web.Projects.Resources; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.Projects diff --git a/web/studio/ASC.Web.Studio/Products/Projects/Masters/ClientScripts/ClientUserResources.cs b/web/studio/ASC.Web.Studio/Products/Projects/Masters/ClientScripts/ClientUserResources.cs index 40bfab45c6..c85acecab2 100644 --- a/web/studio/ASC.Web.Studio/Products/Projects/Masters/ClientScripts/ClientUserResources.cs +++ b/web/studio/ASC.Web.Studio/Products/Projects/Masters/ClientScripts/ClientUserResources.cs @@ -30,7 +30,7 @@ using ASC.Web.Core.Users; using ASC.Web.Projects.Classes; using ASC.Web.Projects.Core; - +using ASC.Web.Studio.Core.Users; using Autofac; namespace ASC.Web.Projects.Masters.ClientScripts diff --git a/web/studio/ASC.Web.Studio/Products/Projects/Properties/launchSettings.json b/web/studio/ASC.Web.Studio/Products/Projects/Properties/launchSettings.json new file mode 100644 index 0000000000..a80c1a9719 --- /dev/null +++ b/web/studio/ASC.Web.Studio/Products/Projects/Properties/launchSettings.json @@ -0,0 +1,12 @@ +{ + "profiles": { + "ASC.Web.Projects": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "http://localhost:64707" + } + } +} \ No newline at end of file diff --git a/web/studio/ASC.Web.Studio/Products/Projects/Reports.aspx.cs b/web/studio/ASC.Web.Studio/Products/Projects/Reports.aspx.cs index e469b807f7..e1582d1f75 100644 --- a/web/studio/ASC.Web.Studio/Products/Projects/Reports.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Projects/Reports.aspx.cs @@ -20,11 +20,10 @@ using System.Linq; using System.Text; using System.Threading; -using System.Web; using ASC.Projects.Core.Domain; using ASC.Projects.Core.Domain.Reports; - +using ASC.Web.Studio.Masters.MasterManagement; using PathProvider = ASC.Web.Projects.Classes.PathProvider; using Report = ASC.Web.Projects.Classes.Report; diff --git a/web/studio/ASC.Web.Studio/Products/Projects/Settings.aspx.cs b/web/studio/ASC.Web.Studio/Products/Projects/Settings.aspx.cs index 3fe37f4867..77aca7a7f0 100644 --- a/web/studio/ASC.Web.Studio/Products/Projects/Settings.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Projects/Settings.aspx.cs @@ -27,6 +27,7 @@ using ASC.Web.Core.Utility; using ASC.Web.Projects.Classes; using ASC.Web.Projects.Resources; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.Projects diff --git a/web/studio/ASC.Web.Studio/Products/Projects/TMDocs.aspx.cs b/web/studio/ASC.Web.Studio/Products/Projects/TMDocs.aspx.cs index fbd66df326..c533f4134c 100644 --- a/web/studio/ASC.Web.Studio/Products/Projects/TMDocs.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Projects/TMDocs.aspx.cs @@ -15,13 +15,12 @@ */ -using System.Web; - using ASC.Web.Core.Files; using ASC.Web.Core.Utility; using ASC.Web.Files.Classes; using ASC.Web.Files.Controls; using ASC.Web.Projects.Resources; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.Projects diff --git a/web/studio/ASC.Web.Studio/Products/Sample/ASC.Web.Sample.csproj b/web/studio/ASC.Web.Studio/Products/Sample/ASC.Web.Sample.csproj index d7caa4ccd2..986d2b0393 100644 --- a/web/studio/ASC.Web.Studio/Products/Sample/ASC.Web.Sample.csproj +++ b/web/studio/ASC.Web.Studio/Products/Sample/ASC.Web.Sample.csproj @@ -1,60 +1,22 @@ - - + + - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {1AE21BB5-267C-443E-852E-1753AC1BD04D} - {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} Library - Properties - ASC.Web.Sample - ASC.Web.Sample - v4.8 - - - - - 4.0 - - false - - - - ..\..\bin\ + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 - false ..\..\bin\ASC.Web.Sample.xml CS1591 none - true - TRACE - prompt - 4 - false - - - - - + + net48 + false + false + 5.1.2 @@ -79,7 +41,6 @@ - @@ -91,150 +52,100 @@ - - - - - - - + ButtonsSidePanel.ascx ASPXCodeBehind - + ButtonsSidePanel.ascx - + NavigationSidePanel.ascx ASPXCodeBehind - + NavigationSidePanel.ascx - + Api.aspx ASPXCodeBehind - + Api.aspx - + Database.aspx ASPXCodeBehind - + Database.aspx - + UserControls.aspx ASPXCodeBehind - + UserControls.aspx - + Elements.aspx ASPXCodeBehind - + Elements.aspx - + Styles.aspx ASPXCodeBehind - + Styles.aspx - + Default.aspx ASPXCodeBehind - + Default.aspx - + Help.aspx ASPXCodeBehind - + Help.aspx - + BasicTemplate.Master ASPXCodeBehind - + BasicTemplate.Master - - - + True True SampleResource.resx - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {3f6b420f-abd3-4b5a-9f4c-5d61ffbb01de} - ASC.Data.Storage - - - {02c40a64-fe22-41d0-9037-69f0d6f787a9} - ASC.Web.Core - - - {e7be6ce8-f6b0-4b9b-831b-ba0c85c8d130} - ASC.Web.Studio - + + + + + - + + + + PublicResXFileCodeGenerator SampleResource.Designer.cs Designer - - - - - - - - - False - True - 57406 - / - - - False - False - - - False - - - - - \ No newline at end of file diff --git a/web/studio/ASC.Web.Studio/Products/Sample/ASC.Web.Sample.csproj.user b/web/studio/ASC.Web.Studio/Products/Sample/ASC.Web.Sample.csproj.user new file mode 100644 index 0000000000..db8622989d --- /dev/null +++ b/web/studio/ASC.Web.Studio/Products/Sample/ASC.Web.Sample.csproj.user @@ -0,0 +1,6 @@ + + + + Debug|Any CPU + + \ No newline at end of file diff --git a/web/studio/ASC.Web.Studio/Products/Sample/Api.aspx.cs b/web/studio/ASC.Web.Studio/Products/Sample/Api.aspx.cs index b4ee2d2653..59ebfd822e 100644 --- a/web/studio/ASC.Web.Studio/Products/Sample/Api.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Sample/Api.aspx.cs @@ -18,7 +18,7 @@ using System; using ASC.Web.Sample.Resources; -using ASC.Web.Studio; +using ASC.Web.Studio.Masters; namespace ASC.Web.Sample { diff --git a/web/studio/ASC.Web.Studio/Products/Sample/Database.aspx.cs b/web/studio/ASC.Web.Studio/Products/Sample/Database.aspx.cs index cfe7e05d81..1952509e7f 100644 --- a/web/studio/ASC.Web.Studio/Products/Sample/Database.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Sample/Database.aspx.cs @@ -18,7 +18,7 @@ using System; using ASC.Web.Sample.Resources; -using ASC.Web.Studio; +using ASC.Web.Studio.Masters; namespace ASC.Web.Sample { diff --git a/web/studio/ASC.Web.Studio/Products/Sample/Default.aspx.cs b/web/studio/ASC.Web.Studio/Products/Sample/Default.aspx.cs index 34f89db967..ac427959a3 100644 --- a/web/studio/ASC.Web.Studio/Products/Sample/Default.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Sample/Default.aspx.cs @@ -18,7 +18,7 @@ using System; using ASC.Web.Sample.Resources; -using ASC.Web.Studio; +using ASC.Web.Studio.Masters; namespace ASC.Web.Sample { diff --git a/web/studio/ASC.Web.Studio/Products/Sample/Elements.aspx.cs b/web/studio/ASC.Web.Studio/Products/Sample/Elements.aspx.cs index abc5b1bfbd..0d4ca05d00 100644 --- a/web/studio/ASC.Web.Studio/Products/Sample/Elements.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Sample/Elements.aspx.cs @@ -18,7 +18,7 @@ using System; using ASC.Web.Sample.Resources; -using ASC.Web.Studio; +using ASC.Web.Studio.Masters; namespace ASC.Web.Sample { diff --git a/web/studio/ASC.Web.Studio/Products/Sample/Help.aspx.cs b/web/studio/ASC.Web.Studio/Products/Sample/Help.aspx.cs index f83de46d9e..f4b13fab43 100644 --- a/web/studio/ASC.Web.Studio/Products/Sample/Help.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Sample/Help.aspx.cs @@ -18,7 +18,7 @@ using System; using ASC.Web.Sample.Resources; -using ASC.Web.Studio; +using ASC.Web.Studio.Masters; namespace ASC.Web.Sample { diff --git a/web/studio/ASC.Web.Studio/Products/Sample/Properties/launchSettings.json b/web/studio/ASC.Web.Studio/Products/Sample/Properties/launchSettings.json new file mode 100644 index 0000000000..ce4762d78c --- /dev/null +++ b/web/studio/ASC.Web.Studio/Products/Sample/Properties/launchSettings.json @@ -0,0 +1,12 @@ +{ + "profiles": { + "ASC.Web.Sample": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "http://localhost:64718" + } + } +} \ No newline at end of file diff --git a/web/studio/ASC.Web.Studio/Products/Sample/Styles.aspx.cs b/web/studio/ASC.Web.Studio/Products/Sample/Styles.aspx.cs index 637325e76e..645759a8ff 100644 --- a/web/studio/ASC.Web.Studio/Products/Sample/Styles.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Sample/Styles.aspx.cs @@ -18,7 +18,7 @@ using System; using ASC.Web.Sample.Resources; -using ASC.Web.Studio; +using ASC.Web.Studio.Masters; namespace ASC.Web.Sample { diff --git a/web/studio/ASC.Web.Studio/Products/Sample/UserControls.aspx.cs b/web/studio/ASC.Web.Studio/Products/Sample/UserControls.aspx.cs index 6d179545dd..1d57daf2e4 100644 --- a/web/studio/ASC.Web.Studio/Products/Sample/UserControls.aspx.cs +++ b/web/studio/ASC.Web.Studio/Products/Sample/UserControls.aspx.cs @@ -18,7 +18,7 @@ using System; using ASC.Web.Sample.Resources; -using ASC.Web.Studio; +using ASC.Web.Studio.Masters; namespace ASC.Web.Sample { diff --git a/web/studio/ASC.Web.Studio/Properties/AssemblyInfo.cs b/web/studio/ASC.Web.Studio/Properties/AssemblyInfo.cs index 9b06a70cbd..c92bddc133 100644 --- a/web/studio/ASC.Web.Studio/Properties/AssemblyInfo.cs +++ b/web/studio/ASC.Web.Studio/Properties/AssemblyInfo.cs @@ -4,6 +4,8 @@ // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. +//[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")] + [assembly: AssemblyTitle("ASC.Web.Studio")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] diff --git a/web/studio/ASC.Web.Studio/Properties/launchSettings.json b/web/studio/ASC.Web.Studio/Properties/launchSettings.json new file mode 100644 index 0000000000..a891625ae9 --- /dev/null +++ b/web/studio/ASC.Web.Studio/Properties/launchSettings.json @@ -0,0 +1,12 @@ +{ + "profiles": { + "ASC.Web.Studio": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "http://localhost:64454" + } + } +} \ No newline at end of file diff --git a/web/studio/ASC.Web.Studio/Search.aspx.cs b/web/studio/ASC.Web.Studio/Search.aspx.cs index 6fb1a6d0af..1ea833d343 100644 --- a/web/studio/ASC.Web.Studio/Search.aspx.cs +++ b/web/studio/ASC.Web.Studio/Search.aspx.cs @@ -29,6 +29,7 @@ using ASC.Web.Core.Utility.Skins; using ASC.Web.Studio.Controls.Common; using ASC.Web.Studio.Core.Search; +using ASC.Web.Studio.Masters; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls.Common.Search; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/ServerError.aspx.cs b/web/studio/ASC.Web.Studio/ServerError.aspx.cs index 6e3f326b10..99a10991dd 100644 --- a/web/studio/ASC.Web.Studio/ServerError.aspx.cs +++ b/web/studio/ASC.Web.Studio/ServerError.aspx.cs @@ -16,7 +16,7 @@ using System; - +using ASC.Web.Studio.Masters; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/Tariffs.aspx.cs b/web/studio/ASC.Web.Studio/Tariffs.aspx.cs index be4fd737e7..a6e4331f7f 100644 --- a/web/studio/ASC.Web.Studio/Tariffs.aspx.cs +++ b/web/studio/ASC.Web.Studio/Tariffs.aspx.cs @@ -22,6 +22,7 @@ using ASC.Core; using ASC.Core.Tenants; using ASC.Web.Core.Files; +using ASC.Web.Studio.Masters; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls.Management; using ASC.Web.Studio.UserControls.Statistics; diff --git a/web/studio/ASC.Web.Studio/Terms.aspx.cs b/web/studio/ASC.Web.Studio/Terms.aspx.cs index eef787d676..cde988f5eb 100644 --- a/web/studio/ASC.Web.Studio/Terms.aspx.cs +++ b/web/studio/ASC.Web.Studio/Terms.aspx.cs @@ -18,6 +18,7 @@ using System; using ASC.Core; +using ASC.Web.Studio.Masters; using ASC.Web.Studio.Utility; namespace ASC.Web.Studio diff --git a/web/studio/ASC.Web.Studio/UserControls/Common/Attachments/Attachments.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Common/Attachments/Attachments.ascx.cs index c9b40f597f..3c02232365 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Common/Attachments/Attachments.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Common/Attachments/Attachments.ascx.cs @@ -23,7 +23,9 @@ using ASC.Web.Core.Files; using ASC.Web.Core.Utility; using ASC.Web.Studio.Controls.Common; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; +using ASC.Web.Studio.UserControls.Common.MediaViewer; using ASC.Web.Studio.Utility; namespace ASC.Web.Studio.UserControls.Common.Attachments @@ -107,7 +109,7 @@ private void CreateEmptyPanel() private void InitViewers() { - MediaViewersPlaceHolder.Controls.Add(LoadControl(Common.MediaPlayer.Location)); + MediaViewersPlaceHolder.Controls.Add(LoadControl(MediaPlayer.Location)); } protected void Page_Load(object sender, EventArgs e) diff --git a/web/studio/ASC.Web.Studio/UserControls/Common/Authorize/Authorize.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Common/Authorize/Authorize.ascx.cs index 7c5220ec4d..88ef86c080 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Common/Authorize/Authorize.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Common/Authorize/Authorize.ascx.cs @@ -41,6 +41,7 @@ using ASC.Web.Studio.Core.SMS; using ASC.Web.Studio.Core.TFA; using ASC.Web.Studio.Masters; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls.Users.UserProfile; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Common/AuthorizeDocs/AuthorizeDocs.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Common/AuthorizeDocs/AuthorizeDocs.ascx.cs index 51ea35d0d0..1f5f767abb 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Common/AuthorizeDocs/AuthorizeDocs.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Common/AuthorizeDocs/AuthorizeDocs.ascx.cs @@ -28,6 +28,7 @@ using ASC.Web.Core; using ASC.Web.Core.Utility; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls.Users.UserProfile; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Common/ChooseTimePeriod/ChooseTimePeriod.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Common/ChooseTimePeriod/ChooseTimePeriod.ascx.cs index 4fa5caf3dd..ee6514512e 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Common/ChooseTimePeriod/ChooseTimePeriod.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Common/ChooseTimePeriod/ChooseTimePeriod.ascx.cs @@ -18,8 +18,8 @@ using System; using System.Text; using System.Threading; -using System.Web; using System.Web.UI; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Studio.UserControls.Common.ChooseTimePeriod { diff --git a/web/studio/ASC.Web.Studio/UserControls/Common/Comments/Comments.cs b/web/studio/ASC.Web.Studio/UserControls/Common/Comments/Comments.cs index cf87d06241..225f78247b 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Common/Comments/Comments.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Common/Comments/Comments.cs @@ -21,7 +21,7 @@ using System.Web; using System.Web.UI; using System.Web.UI.WebControls; - +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; namespace ASC.Web.Studio.UserControls.Common.Comments diff --git a/web/studio/ASC.Web.Studio/UserControls/Common/Confirm/Confirm.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Common/Confirm/Confirm.ascx.cs index 27f8907bfe..3e450b5e27 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Common/Confirm/Confirm.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Common/Confirm/Confirm.ascx.cs @@ -16,8 +16,8 @@ using System; -using System.Web; using System.Web.UI; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Studio.UserControls.Common { diff --git a/web/studio/ASC.Web.Studio/UserControls/Common/HelpCenter/HelpCenter.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Common/HelpCenter/HelpCenter.ascx.cs index 95e4a662e4..af12b27717 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Common/HelpCenter/HelpCenter.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Common/HelpCenter/HelpCenter.ascx.cs @@ -24,6 +24,8 @@ using ASC.Web.Core; using ASC.Web.Core.Utility; using ASC.Web.Studio.Core.HelpCenter; +using ASC.Web.Studio.Masters.MasterManagement; +using ASC.Web.Studio.UserControls.Common.MediaViewer; using ASC.Web.Studio.UserControls.Common.VideoGuides; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Common/LoaderPage/LoaderPage.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Common/LoaderPage/LoaderPage.ascx.cs index 4d471b0c88..8b942f298a 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Common/LoaderPage/LoaderPage.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Common/LoaderPage/LoaderPage.ascx.cs @@ -16,12 +16,12 @@ using System; -using System.Web; using System.Web.UI; using ASC.Core; using ASC.Web.Core.Utility; using ASC.Web.Core.WhiteLabel; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Studio.UserControls.Common.LoaderPage { diff --git a/web/studio/ASC.Web.Studio/UserControls/Common/MediaViewer/MediaPlayer.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Common/MediaViewer/MediaPlayer.ascx.cs index 47e8b07029..80ab92fda7 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Common/MediaViewer/MediaPlayer.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Common/MediaViewer/MediaPlayer.ascx.cs @@ -16,12 +16,11 @@ using System; -using System.Web; using System.Web.UI; - using ASC.Web.Core.Utility; +using ASC.Web.Studio.Masters.MasterManagement; -namespace ASC.Web.Studio.UserControls.Common +namespace ASC.Web.Studio.UserControls.Common.MediaViewer { public partial class MediaPlayer : UserControl { diff --git a/web/studio/ASC.Web.Studio/UserControls/Common/PersonalFooter/PersonalFooter.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Common/PersonalFooter/PersonalFooter.ascx.cs index 7ebe16a928..05a32b7a19 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Common/PersonalFooter/PersonalFooter.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Common/PersonalFooter/PersonalFooter.ascx.cs @@ -17,10 +17,10 @@ using System; using System.Configuration; -using System.Web; using System.Web.UI; using ASC.Web.Core.Utility; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.Studio.UserControls.Common.PersonalFooter diff --git a/web/studio/ASC.Web.Studio/UserControls/Common/PollForm/PollForm.cs b/web/studio/ASC.Web.Studio/UserControls/Common/PollForm/PollForm.cs index 15183ed5de..8ec95ecfdc 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Common/PollForm/PollForm.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Common/PollForm/PollForm.cs @@ -24,7 +24,7 @@ using System.Web.UI.WebControls; using AjaxPro; - +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; namespace ASC.Web.Studio.UserControls.Common.PollForm diff --git a/web/studio/ASC.Web.Studio/UserControls/Common/PollForm/PollFormMaster.cs b/web/studio/ASC.Web.Studio/UserControls/Common/PollForm/PollFormMaster.cs index 1f522658a3..a65871cb31 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Common/PollForm/PollFormMaster.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Common/PollForm/PollFormMaster.cs @@ -22,7 +22,7 @@ using System.Web; using System.Web.UI; using System.Web.UI.WebControls; - +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; namespace ASC.Web.Studio.UserControls.Common.PollForm diff --git a/web/studio/ASC.Web.Studio/UserControls/Common/Search/SearchResults.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Common/Search/SearchResults.ascx.cs index 332d5cc4ee..5d2144e2a8 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Common/Search/SearchResults.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Common/Search/SearchResults.ascx.cs @@ -17,12 +17,12 @@ using System; using System.Collections.Generic; -using System.Web; using System.Web.UI; using System.Web.UI.WebControls; using ASC.Web.Core.Utility; using ASC.Web.Studio.Core.Search; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Studio.UserControls.Common.Search { diff --git a/web/studio/ASC.Web.Studio/UserControls/Common/SharingSettings/SharingSettings.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Common/SharingSettings/SharingSettings.ascx.cs index c3f2b7cf51..a38f9d9009 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Common/SharingSettings/SharingSettings.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Common/SharingSettings/SharingSettings.ascx.cs @@ -16,10 +16,10 @@ using System; -using System.Web; using System.Web.UI; using ASC.Web.Core.Utility; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Studio.UserControls.Common { diff --git a/web/studio/ASC.Web.Studio/UserControls/Common/SmallChat/SmallChat.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Common/SmallChat/SmallChat.ascx.cs index d4cc87f14f..3dce086db2 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Common/SmallChat/SmallChat.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Common/SmallChat/SmallChat.ascx.cs @@ -16,11 +16,11 @@ using System; -using System.Web; using System.Web.UI; using ASC.Data.Storage; using ASC.Web.Core.Utility; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Studio.UserControls.Common.SmallChat { diff --git a/web/studio/ASC.Web.Studio/UserControls/Common/Support/SupportChat.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Common/Support/SupportChat.ascx.cs index d0641f9312..3dd736a612 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Common/Support/SupportChat.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Common/Support/SupportChat.ascx.cs @@ -20,6 +20,7 @@ using System.Web.UI; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Studio.UserControls.Common.Support { diff --git a/web/studio/ASC.Web.Studio/UserControls/Common/TopStudioPanel/VoipPhoneControl.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Common/TopStudioPanel/VoipPhoneControl.ascx.cs index 0b0936f827..eef23d4807 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Common/TopStudioPanel/VoipPhoneControl.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Common/TopStudioPanel/VoipPhoneControl.ascx.cs @@ -16,11 +16,11 @@ using System; -using System.Web; using System.Web.UI; using ASC.Web.Core.Client.Bundling; using ASC.Web.Core.Client.HttpHandlers; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Studio.UserControls.Common { diff --git a/web/studio/ASC.Web.Studio/UserControls/Common/ViewSwitcher/ViewSwitcher.cs b/web/studio/ASC.Web.Studio/UserControls/Common/ViewSwitcher/ViewSwitcher.cs index 34fd9c0ed0..9469894b5a 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Common/ViewSwitcher/ViewSwitcher.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Common/ViewSwitcher/ViewSwitcher.cs @@ -20,10 +20,10 @@ using System.ComponentModel; using System.Linq; using System.Text; -using System.Web; using System.Web.UI; using ASC.Web.Core.Utility; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Studio.UserControls.Common.ViewSwitcher { diff --git a/web/studio/ASC.Web.Studio/UserControls/DeepLink/DeepLinking.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/DeepLink/DeepLinking.ascx.cs index 7f091a586b..49b278f720 100644 --- a/web/studio/ASC.Web.Studio/UserControls/DeepLink/DeepLinking.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/DeepLink/DeepLinking.ascx.cs @@ -26,6 +26,7 @@ using ASC.Security.Cryptography; using ASC.Web.Core.Utility; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls.DeepLink; diff --git a/web/studio/ASC.Web.Studio/UserControls/EmptyScreens/CRMDashboardEmptyScreen.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/EmptyScreens/CRMDashboardEmptyScreen.ascx.cs index c242d3e152..d460c69040 100644 --- a/web/studio/ASC.Web.Studio/UserControls/EmptyScreens/CRMDashboardEmptyScreen.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/EmptyScreens/CRMDashboardEmptyScreen.ascx.cs @@ -18,6 +18,7 @@ using System; using System.Web; using System.Web.UI; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Studio.UserControls.EmptyScreens { diff --git a/web/studio/ASC.Web.Studio/UserControls/EmptyScreens/CommunityDashboardEmptyScreen.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/EmptyScreens/CommunityDashboardEmptyScreen.ascx.cs index ae4e3abda6..c2b1ee087f 100644 --- a/web/studio/ASC.Web.Studio/UserControls/EmptyScreens/CommunityDashboardEmptyScreen.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/EmptyScreens/CommunityDashboardEmptyScreen.ascx.cs @@ -21,6 +21,7 @@ using System.Web.UI; using ASC.Web.Core; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Studio.UserControls.EmptyScreens { diff --git a/web/studio/ASC.Web.Studio/UserControls/EmptyScreens/FilesDashboardEmptyScreen.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/EmptyScreens/FilesDashboardEmptyScreen.ascx.cs index b8625b39cf..261ade729e 100644 --- a/web/studio/ASC.Web.Studio/UserControls/EmptyScreens/FilesDashboardEmptyScreen.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/EmptyScreens/FilesDashboardEmptyScreen.ascx.cs @@ -18,6 +18,7 @@ using System; using System.Web; using System.Web.UI; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Studio.UserControls.EmptyScreens { diff --git a/web/studio/ASC.Web.Studio/UserControls/EmptyScreens/WelcomeDashboard.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/EmptyScreens/WelcomeDashboard.ascx.cs index 5052770cf3..4a670e732d 100644 --- a/web/studio/ASC.Web.Studio/UserControls/EmptyScreens/WelcomeDashboard.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/EmptyScreens/WelcomeDashboard.ascx.cs @@ -21,6 +21,7 @@ using ASC.Core; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.Studio.UserControls.EmptyScreens diff --git a/web/studio/ASC.Web.Studio/UserControls/Feed/FeedList.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Feed/FeedList.ascx.cs index b32aa1d976..90d61d2d13 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Feed/FeedList.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Feed/FeedList.ascx.cs @@ -16,11 +16,11 @@ using System; -using System.Web; using System.Web.UI; using ASC.Web.Core; using ASC.Web.Core.Utility; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Studio.UserControls.Feed { diff --git a/web/studio/ASC.Web.Studio/UserControls/FirstTime/EmailAndPassword.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/FirstTime/EmailAndPassword.ascx.cs index b5baeef3df..407b2cf1b5 100644 --- a/web/studio/ASC.Web.Studio/UserControls/FirstTime/EmailAndPassword.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/FirstTime/EmailAndPassword.ascx.cs @@ -42,6 +42,7 @@ using ASC.Web.Studio.Core; using ASC.Web.Studio.Core.Notify; using ASC.Web.Studio.Core.Users; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls.Management; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/FirstTime/StepContainer.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/FirstTime/StepContainer.ascx.cs index 3b5d519626..e1b50a1ac5 100644 --- a/web/studio/ASC.Web.Studio/UserControls/FirstTime/StepContainer.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/FirstTime/StepContainer.ascx.cs @@ -16,10 +16,10 @@ using System; -using System.Web; using System.Web.UI; using ASC.Web.Core.Utility; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Studio.UserControls.FirstTime { diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/AccessRights/AccessRights.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/AccessRights/AccessRights.ascx.cs index db371ff3dc..c5f55e35c7 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/AccessRights/AccessRights.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/AccessRights/AccessRights.ascx.cs @@ -37,6 +37,7 @@ using ASC.Web.Studio.Core; using ASC.Web.Studio.Core.Notify; using ASC.Web.Studio.Core.Users; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/AdminHelperSettings/AdminHelperSettings.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/AdminHelperSettings/AdminHelperSettings.ascx.cs index d8fcbdb3e1..d4208f01d2 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/AdminHelperSettings/AdminHelperSettings.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/AdminHelperSettings/AdminHelperSettings.ascx.cs @@ -20,6 +20,7 @@ using System.Web.UI; using ASC.Web.Core.Utility; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Studio.UserControls.Management.AdminHelperSettings { diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/AdminMessageSettings/AdminMessageSettings.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/AdminMessageSettings/AdminMessageSettings.ascx.cs index b2ca71f166..9d0ae8a921 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/AdminMessageSettings/AdminMessageSettings.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/AdminMessageSettings/AdminMessageSettings.ascx.cs @@ -25,6 +25,7 @@ using ASC.MessagingSystem; using ASC.Web.Core.Utility.Settings; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/AuditTrail/AuditTrail.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/AuditTrail/AuditTrail.ascx.cs index 23f7c2aed3..3ca1ebc452 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/AuditTrail/AuditTrail.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/AuditTrail/AuditTrail.ascx.cs @@ -16,12 +16,12 @@ using System; -using System.Web; using System.Web.UI; using ASC.Core; using ASC.Data.Storage; using ASC.Web.Studio.Controls.Common; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/AuthorizationKeys/AuthService.cs b/web/studio/ASC.Web.Studio/UserControls/Management/AuthorizationKeys/AuthService.cs index be122d2b10..a9342fab13 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/AuthorizationKeys/AuthService.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/AuthorizationKeys/AuthService.cs @@ -17,7 +17,6 @@ using System.Collections.Generic; using System.Diagnostics; - using ASC.Core.Common.Configuration; using ASC.Web.Studio.PublicResources; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/AuthorizationKeys/AuthorizationKeys.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/AuthorizationKeys/AuthorizationKeys.ascx.cs index 992a7edc5e..f1c079f5f2 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/AuthorizationKeys/AuthorizationKeys.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/AuthorizationKeys/AuthorizationKeys.ascx.cs @@ -33,6 +33,7 @@ using ASC.Web.Core.Sms; using ASC.Web.Core.Utility; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/Backup/Backup.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/Backup/Backup.ascx.cs index 0b5caae6d4..b437df6d81 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/Backup/Backup.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/Backup/Backup.ascx.cs @@ -16,13 +16,13 @@ using System; -using System.Web; using System.Web.UI; using ASC.Core; using ASC.Web.Core.Utility; using ASC.Web.Studio.Core; using ASC.Web.Studio.Core.Backup; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.UserControls.Common.ChooseTimePeriod; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/ColorThemes/ColorThemes.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/ColorThemes/ColorThemes.ascx.cs index 71d7dc24af..10bd9abb8e 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/ColorThemes/ColorThemes.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/ColorThemes/ColorThemes.ascx.cs @@ -18,10 +18,10 @@ using System; using System.Collections.Generic; using System.Text.RegularExpressions; -using System.Web; using System.Web.UI; using ASC.Web.Core.Utility; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/ConfirmActivation/ConfirmActivation.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/ConfirmActivation/ConfirmActivation.ascx.cs index 9c02637172..6de2c30f78 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/ConfirmActivation/ConfirmActivation.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/ConfirmActivation/ConfirmActivation.ascx.cs @@ -27,6 +27,8 @@ using ASC.Web.Core.Utility; using ASC.Web.Studio.Core.SMS; using ASC.Web.Studio.Core.TFA; +using ASC.Web.Studio.Core.Users; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/ConfirmInviteActivation/ConfirmInviteActivation.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/ConfirmInviteActivation/ConfirmInviteActivation.ascx.cs index f63aa4ab44..01781e3dbc 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/ConfirmInviteActivation/ConfirmInviteActivation.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/ConfirmInviteActivation/ConfirmInviteActivation.ascx.cs @@ -34,6 +34,7 @@ using ASC.Web.Studio.Core; using ASC.Web.Studio.Core.Notify; using ASC.Web.Studio.Core.Users; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls.Statistics; using ASC.Web.Studio.UserControls.Users.UserProfile; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/CookieSettings/CookieSettings.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/CookieSettings/CookieSettings.ascx.cs index 6e0a7c8c28..b368cbf30f 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/CookieSettings/CookieSettings.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/CookieSettings/CookieSettings.ascx.cs @@ -24,6 +24,7 @@ using ASC.MessagingSystem; using ASC.Web.Core; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/CustomNavigation/CustomNavigation.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/CustomNavigation/CustomNavigation.ascx.cs index 1533e1ce05..a4155d77b6 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/CustomNavigation/CustomNavigation.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/CustomNavigation/CustomNavigation.ascx.cs @@ -17,10 +17,10 @@ using System; using System.Collections.Generic; -using System.Web; using System.Web.UI; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.Studio.UserControls.Management diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/CustomNavigation/LogoUploader.cs b/web/studio/ASC.Web.Studio/UserControls/Management/CustomNavigation/LogoUploader.cs index 66493be241..2ea62f52d0 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/CustomNavigation/LogoUploader.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/CustomNavigation/LogoUploader.cs @@ -20,7 +20,6 @@ using System.Globalization; using System.IO; using System.Web; - using ASC.Common.Logging; using ASC.Core; using ASC.Data.Storage; @@ -108,7 +107,7 @@ public class StorageHelper public static string SaveTmpLogo(string tmpLogoPath) { - if (String.IsNullOrEmpty(tmpLogoPath)) return null; + if (string.IsNullOrEmpty(tmpLogoPath)) return null; try { @@ -138,7 +137,7 @@ public static string SaveTmpLogo(string tmpLogoPath) public static void DeleteLogo(string logoPath) { - if (String.IsNullOrEmpty(logoPath)) return; + if (string.IsNullOrEmpty(logoPath)) return; try { diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/DeactivatePortal/DeactivatePortal.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/DeactivatePortal/DeactivatePortal.ascx.cs index 9545407bb4..e0a96a44e1 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/DeactivatePortal/DeactivatePortal.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/DeactivatePortal/DeactivatePortal.ascx.cs @@ -27,6 +27,7 @@ using ASC.MessagingSystem; using ASC.Web.Studio.Core; using ASC.Web.Studio.Core.Notify; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/DefaultPageSettings/DefaultPageSettings.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/DefaultPageSettings/DefaultPageSettings.ascx.cs index e34714f3c9..d91a37a03e 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/DefaultPageSettings/DefaultPageSettings.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/DefaultPageSettings/DefaultPageSettings.ascx.cs @@ -19,11 +19,11 @@ using System.Collections.Generic; using System.Configuration; using System.Linq; -using System.Web; using System.Web.UI; using ASC.Web.Core; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/DnsSettings/DnsSettings.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/DnsSettings/DnsSettings.ascx.cs index ad81371ed3..846333b3a3 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/DnsSettings/DnsSettings.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/DnsSettings/DnsSettings.ascx.cs @@ -27,6 +27,7 @@ using ASC.MessagingSystem; using ASC.Web.Studio.Core; using ASC.Web.Studio.Core.Notify; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/DocService/DocService.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/DocService/DocService.ascx.cs index 67b6ee1833..0f44d89e71 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/DocService/DocService.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/DocService/DocService.ascx.cs @@ -16,10 +16,10 @@ using System; -using System.Web; using System.Web.UI; using ASC.Data.Storage; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.Studio.UserControls.Management diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/FullTextSearch/FullTextSearch.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/FullTextSearch/FullTextSearch.ascx.cs index 3e1ad3fef0..a1dd2c02cf 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/FullTextSearch/FullTextSearch.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/FullTextSearch/FullTextSearch.ascx.cs @@ -27,6 +27,7 @@ using ASC.ElasticSearch.Service; using ASC.MessagingSystem; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/GreetingSettings/GreetingLogoSettings.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/GreetingSettings/GreetingLogoSettings.ascx.cs index cae33c9f39..1b27e9d011 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/GreetingSettings/GreetingLogoSettings.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/GreetingSettings/GreetingLogoSettings.ascx.cs @@ -28,6 +28,7 @@ using ASC.Web.Core.Utility; using ASC.Web.Core.WhiteLabel; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/GreetingSettings/GreetingSettings.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/GreetingSettings/GreetingSettings.ascx.cs index ea087735fd..3f348fc126 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/GreetingSettings/GreetingSettings.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/GreetingSettings/GreetingSettings.ascx.cs @@ -25,6 +25,7 @@ using ASC.MessagingSystem; using ASC.Web.Core.WhiteLabel; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; namespace ASC.Web.Studio.UserControls.Management diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/GreetingSettings/LogoUploader.cs b/web/studio/ASC.Web.Studio/UserControls/Management/GreetingSettings/LogoUploader.cs index 2d1519f4fc..99705fbfaf 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/GreetingSettings/LogoUploader.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/GreetingSettings/LogoUploader.cs @@ -18,7 +18,6 @@ using System; using System.IO; using System.Web; - using ASC.Core; using ASC.Web.Core.Users; using ASC.Web.Core.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/ImpersonateUser/ImpersonateSettings.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/ImpersonateUser/ImpersonateSettings.ascx.cs index 34f60c839a..bcf3486869 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/ImpersonateUser/ImpersonateSettings.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/ImpersonateUser/ImpersonateSettings.ascx.cs @@ -16,11 +16,11 @@ using System; -using System.Web; using System.Web.UI; using ASC.Core; using ASC.Web.Core.Utility; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.Studio.UserControls.Management.ImpersonateUser diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/ImpersonateUser/ImpersonateUserConfirmationPanel.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/ImpersonateUser/ImpersonateUserConfirmationPanel.ascx.cs index 06f78c3ef3..a575843e9e 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/ImpersonateUser/ImpersonateUserConfirmationPanel.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/ImpersonateUser/ImpersonateUserConfirmationPanel.ascx.cs @@ -16,10 +16,10 @@ using System; -using System.Web; using System.Web.UI; using ASC.Web.Core.Utility; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Studio.UserControls.Management.ImpersonateUser { diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/InvitePanel/InvitePanel.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/InvitePanel/InvitePanel.ascx.cs index a489b3748d..1b19350bab 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/InvitePanel/InvitePanel.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/InvitePanel/InvitePanel.ascx.cs @@ -16,13 +16,13 @@ using System; -using System.Web; using System.Web.UI; using ASC.Core; using ASC.Core.Users; using ASC.Web.Core; using ASC.Web.Core.Utility; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.UserControls.Statistics; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/IpSecurity/IpSecurity.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/IpSecurity/IpSecurity.ascx.cs index 54633d5e3d..758165bf30 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/IpSecurity/IpSecurity.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/IpSecurity/IpSecurity.ascx.cs @@ -16,11 +16,11 @@ using System; -using System.Web; using System.Web.UI; using ASC.Web.Core.Utility.Settings; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.Studio.UserControls.Management.IpSecurity diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/LdapSettings/LdapSettings.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/LdapSettings/LdapSettings.ascx.cs index 02591711e2..836bb9d77a 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/LdapSettings/LdapSettings.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/LdapSettings/LdapSettings.ascx.cs @@ -16,7 +16,6 @@ using System; -using System.Web; using System.Web.UI; using AjaxPro; @@ -24,6 +23,7 @@ using ASC.Core; using ASC.Web.Core.Utility; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; using Newtonsoft.Json; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/LoginHistory/LoginHistory.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/LoginHistory/LoginHistory.ascx.cs index c1658a4461..b518f31fd1 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/LoginHistory/LoginHistory.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/LoginHistory/LoginHistory.ascx.cs @@ -16,13 +16,13 @@ using System; -using System.Web; using System.Web.UI; using ASC.Core; using ASC.Data.Storage; using ASC.Web.Core.Utility; using ASC.Web.Studio.Controls.Common; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/LoginSettings/LoginSettings.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/LoginSettings/LoginSettings.ascx.cs index 23038714a6..63a943b3fc 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/LoginSettings/LoginSettings.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/LoginSettings/LoginSettings.ascx.cs @@ -16,9 +16,8 @@ using System; -using System.Web; using System.Web.UI; - +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.Studio.UserControls.Management diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/MailDomainSettings/MailDomainSettings.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/MailDomainSettings/MailDomainSettings.ascx.cs index 5c698f90a7..41c0f254ec 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/MailDomainSettings/MailDomainSettings.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/MailDomainSettings/MailDomainSettings.ascx.cs @@ -29,6 +29,7 @@ using ASC.MessagingSystem; using ASC.Web.Core.Utility.Settings; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls.Statistics; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/MailService/MailService.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/MailService/MailService.ascx.cs index 7d777e4d6a..82424ccf1f 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/MailService/MailService.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/MailService/MailService.ascx.cs @@ -16,12 +16,12 @@ using System; -using System.Web; using System.Web.UI; using ASC.Core; using ASC.Data.Storage; using ASC.Web.Core.Mail; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.Studio.UserControls.Management diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/Monitoring/LogHelper.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/Monitoring/LogHelper.ascx.cs index a6fc56c91f..51250541ea 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/Monitoring/LogHelper.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/Monitoring/LogHelper.ascx.cs @@ -24,6 +24,7 @@ using System.Web.UI; using ASC.Web.Core.Utility; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; using ICSharpCode.SharpZipLib.Zip; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/Monitoring/PortsChecker.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/Monitoring/PortsChecker.ascx.cs index 7c569e03a9..25bdbb8720 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/Monitoring/PortsChecker.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/Monitoring/PortsChecker.ascx.cs @@ -19,7 +19,6 @@ using System.Collections.Generic; using System.Linq; using System.Net.Sockets; -using System.Web; using System.Web.UI; using AjaxPro; @@ -27,6 +26,7 @@ using ASC.Core; using ASC.Web.Core.Utility; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/Monitoring/ServiceHealthChecker.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/Monitoring/ServiceHealthChecker.ascx.cs index a7c78596bb..5e2871eb24 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/Monitoring/ServiceHealthChecker.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/Monitoring/ServiceHealthChecker.ascx.cs @@ -20,7 +20,6 @@ using System.Configuration; using System.Linq; using System.ServiceProcess; -using System.Web; using System.Web.Configuration; using System.Web.Hosting; using System.Web.UI; @@ -30,6 +29,7 @@ using ASC.Core; using ASC.Web.Core.Utility; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/NamingPeopleSettings/NamingPeopleSettings.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/NamingPeopleSettings/NamingPeopleSettings.ascx.cs index ae3d3526f1..c1f2def33a 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/NamingPeopleSettings/NamingPeopleSettings.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/NamingPeopleSettings/NamingPeopleSettings.ascx.cs @@ -16,9 +16,8 @@ using System; -using System.Web; using System.Web.UI; - +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.Studio.UserControls.Management diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/NamingPeopleSettings/NamingPeopleSettingsContent.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/NamingPeopleSettings/NamingPeopleSettingsContent.ascx.cs index 6d57e3da51..c863f801c6 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/NamingPeopleSettings/NamingPeopleSettingsContent.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/NamingPeopleSettings/NamingPeopleSettingsContent.ascx.cs @@ -26,6 +26,7 @@ using ASC.MessagingSystem; using ASC.Web.Studio.Core; using ASC.Web.Studio.Core.Users; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; namespace ASC.Web.Studio.UserControls.Management diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/PasswordSettings/PasswordSettings.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/PasswordSettings/PasswordSettings.ascx.cs index 2e64bcd275..6b07931997 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/PasswordSettings/PasswordSettings.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/PasswordSettings/PasswordSettings.ascx.cs @@ -16,11 +16,11 @@ using System; -using System.Web; using System.Web.UI; using ASC.Web.Core.Utility; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.Studio.UserControls.Management diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/PortalAccessSettings/PortalAccessSettings.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/PortalAccessSettings/PortalAccessSettings.ascx.cs index 2f09e3bb02..b2344d520a 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/PortalAccessSettings/PortalAccessSettings.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/PortalAccessSettings/PortalAccessSettings.ascx.cs @@ -32,6 +32,7 @@ using ASC.Web.Core; using ASC.Web.Core.Utility.Settings; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls.Statistics; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/PortalRename/PortalRename.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/PortalRename/PortalRename.ascx.cs index d9da7a8124..43f73be75f 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/PortalRename/PortalRename.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/PortalRename/PortalRename.ascx.cs @@ -16,11 +16,11 @@ using System; -using System.Web; using System.Web.UI; using ASC.Core; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Studio.UserControls.Management diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/PricingPageSettings/PricingPageSettings.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/PricingPageSettings/PricingPageSettings.ascx.cs index 6ef8a69bee..1a477653a9 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/PricingPageSettings/PricingPageSettings.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/PricingPageSettings/PricingPageSettings.ascx.cs @@ -20,7 +20,7 @@ using System.Web.UI; using AjaxPro; - +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/PrivacyRoom/PrivacyRoom.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/PrivacyRoom/PrivacyRoom.ascx.cs index 6107301e21..3d0433cc05 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/PrivacyRoom/PrivacyRoom.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/PrivacyRoom/PrivacyRoom.ascx.cs @@ -16,10 +16,10 @@ using System; -using System.Web; using System.Web.UI; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.Studio.UserControls.Management diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/ProductsAndInstruments/ProductsAndInstruments.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/ProductsAndInstruments/ProductsAndInstruments.ascx.cs index 4d465c6650..864dc8baf7 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/ProductsAndInstruments/ProductsAndInstruments.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/ProductsAndInstruments/ProductsAndInstruments.ascx.cs @@ -19,13 +19,13 @@ using System.Collections.Generic; using System.Configuration; using System.Linq; -using System.Web; using System.Web.UI; using ASC.Web.Core; using ASC.Web.Core.ModuleManagement; using ASC.Web.Core.Utility.Settings; using ASC.Web.Core.WebZones; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.Studio.UserControls.Management diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/ProfileOperation/ProfileOperation.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/ProfileOperation/ProfileOperation.ascx.cs index a507ce13ca..b1a96b4d0d 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/ProfileOperation/ProfileOperation.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/ProfileOperation/ProfileOperation.ascx.cs @@ -26,6 +26,7 @@ using ASC.Web.Core.Users; using ASC.Web.Core.Utility; using ASC.Web.Studio.Core.Notify; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Studio.UserControls.Management { diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/PromoCode/PromoCode.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/PromoCode/PromoCode.ascx.cs index a0cdb8e206..0e0eb79081 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/PromoCode/PromoCode.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/PromoCode/PromoCode.ascx.cs @@ -16,13 +16,13 @@ using System; -using System.Web; using System.Web.UI; using AjaxPro; using ASC.Common.Logging; using ASC.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/Restore/Restore.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/Restore/Restore.ascx.cs index a0c81c934e..c3cd8a2178 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/Restore/Restore.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/Restore/Restore.ascx.cs @@ -18,7 +18,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web; using System.Web.UI; using Amazon; @@ -27,6 +26,7 @@ using ASC.Core.Common.Contracts; using ASC.Web.Studio.Core; using ASC.Web.Studio.Core.Backup; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.Studio.UserControls.Management diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/ShareLinkPassword/ShareLinkPassword.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/ShareLinkPassword/ShareLinkPassword.ascx.cs index 051b345754..6c5270e708 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/ShareLinkPassword/ShareLinkPassword.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/ShareLinkPassword/ShareLinkPassword.ascx.cs @@ -16,9 +16,8 @@ using System; -using System.Web; using System.Web.UI; - +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/SingleSignOnSettings/SingleSignOnSettings.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/SingleSignOnSettings/SingleSignOnSettings.ascx.cs index 92f1df95d7..2f3578603f 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/SingleSignOnSettings/SingleSignOnSettings.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/SingleSignOnSettings/SingleSignOnSettings.ascx.cs @@ -17,13 +17,13 @@ using System; using System.Text; -using System.Web; using System.Web.UI; using AjaxPro; using ASC.Core; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; using Newtonsoft.Json; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/SmsControls/ChangeMobileNumber.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/SmsControls/ChangeMobileNumber.ascx.cs index 2d1ecff2b1..fbe106bf5b 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/SmsControls/ChangeMobileNumber.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/SmsControls/ChangeMobileNumber.ascx.cs @@ -17,7 +17,6 @@ using System; using System.ServiceModel.Security; -using System.Web; using System.Web.UI; using AjaxPro; @@ -25,6 +24,7 @@ using ASC.Core; using ASC.Core.Users; using ASC.Web.Studio.Core.Notify; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/SmsControls/ConfirmMobileActivation.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/SmsControls/ConfirmMobileActivation.ascx.cs index 7414bb2962..2538b54a9c 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/SmsControls/ConfirmMobileActivation.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/SmsControls/ConfirmMobileActivation.ascx.cs @@ -33,6 +33,7 @@ using ASC.Web.Core.Utility; using ASC.Web.Studio.Core; using ASC.Web.Studio.Core.SMS; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls.Common; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/SmsControls/SmsValidationSettings.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/SmsControls/SmsValidationSettings.ascx.cs index 565c79718a..5a55fed44c 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/SmsControls/SmsValidationSettings.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/SmsControls/SmsValidationSettings.ascx.cs @@ -16,7 +16,6 @@ using System; -using System.Web; using System.Web.UI; using AjaxPro; @@ -25,6 +24,7 @@ using ASC.Web.Studio.Core; using ASC.Web.Studio.Core.SMS; using ASC.Web.Studio.Core.TFA; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.Studio.UserControls.Management diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/SmtpSettings/SmtpSettings.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/SmtpSettings/SmtpSettings.ascx.cs index 9721f7e694..a2d2d86bb3 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/SmtpSettings/SmtpSettings.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/SmtpSettings/SmtpSettings.ascx.cs @@ -17,7 +17,6 @@ using System; using System.Text; -using System.Web; using System.Web.UI; using AjaxPro; @@ -25,6 +24,7 @@ using ASC.Core; using ASC.Data.Storage; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; using Newtonsoft.Json; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/StorageSettings/StorageSettings.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/StorageSettings/StorageSettings.ascx.cs index b3c84281de..4a541ea14f 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/StorageSettings/StorageSettings.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/StorageSettings/StorageSettings.ascx.cs @@ -16,10 +16,10 @@ using System; -using System.Web; using System.Web.UI; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.Studio.UserControls.Management.StorageSettings diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffCustom.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffCustom.ascx.cs index 0bdc4eed57..1319c4e47d 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffCustom.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffCustom.ascx.cs @@ -35,6 +35,7 @@ using ASC.Web.Core.Utility; using ASC.Web.Studio.Core; using ASC.Web.Studio.Core.Notify; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls.Statistics; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffDesktop.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffDesktop.ascx.cs index fa567f3cd6..5d29c41aa7 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffDesktop.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffDesktop.ascx.cs @@ -16,11 +16,11 @@ using System; -using System.Web; using System.Web.UI; using ASC.Core; using ASC.Web.Core.WhiteLabel; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Studio.UserControls.Management { diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffHistory.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffHistory.ascx.cs index 170430c4d7..f483e90779 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffHistory.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffHistory.ascx.cs @@ -17,11 +17,11 @@ using System; using System.Collections.Generic; -using System.Web; using System.Web.UI; using ASC.Core.Billing; using ASC.Web.Core.Utility; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Studio.UserControls.Management { diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffLimitExceed.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffLimitExceed.ascx.cs index dee8c2dcdb..c51ff010f5 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffLimitExceed.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffLimitExceed.ascx.cs @@ -16,10 +16,10 @@ using System; -using System.Web; using System.Web.UI; using ASC.Web.Core.WhiteLabel; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.Studio.UserControls.Management diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffNotify.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffNotify.ascx.cs index 3fe009a9d5..53d4f273ea 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffNotify.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffNotify.ascx.cs @@ -29,6 +29,7 @@ using ASC.Web.Core; using ASC.Web.Core.WhiteLabel; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls.Statistics; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffSaas.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffSaas.ascx.cs index 3a56bb8403..3c0f302344 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffSaas.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffSaas.ascx.cs @@ -20,7 +20,6 @@ using System.Globalization; using System.Linq; using System.Threading; -using System.Web; using System.Web.UI; using AjaxPro; @@ -38,6 +37,7 @@ using ASC.Web.Core.Utility; using ASC.Web.Core.WhiteLabel; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls.Management.SingleSignOnSettings; using ASC.Web.Studio.UserControls.Statistics; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffSettings.cs b/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffSettings.cs index 1891d352a3..b9255a551f 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffSettings.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffSettings.cs @@ -18,7 +18,6 @@ using System; using System.Globalization; using System.Runtime.Serialization; - using ASC.Core.Common.Settings; namespace ASC.Web.Studio.UserControls.Management diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffStandalone.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffStandalone.ascx.cs index b5c48e1083..7ade481d87 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffStandalone.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/TariffSettings/TariffStandalone.ascx.cs @@ -30,6 +30,7 @@ using ASC.Web.Core; using ASC.Web.Core.Utility; using ASC.Web.Core.WhiteLabel; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls.Statistics; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/TfaControls/ConfirmTfa.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/TfaControls/ConfirmTfa.ascx.cs index f498814352..2797a2e0ff 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/TfaControls/ConfirmTfa.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/TfaControls/ConfirmTfa.ascx.cs @@ -29,6 +29,7 @@ using ASC.Web.Core.Security; using ASC.Web.Studio.Core; using ASC.Web.Studio.Core.TFA; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls.Common; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/TfaControls/ResetAppDialog.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/TfaControls/ResetAppDialog.ascx.cs index 16cde3bbe1..919e92beec 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/TfaControls/ResetAppDialog.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/TfaControls/ResetAppDialog.ascx.cs @@ -16,10 +16,10 @@ using System; -using System.Web; using System.Web.UI; using ASC.Core.Users; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Studio.UserControls.Management diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/TfaControls/ShowBackupCodesDialog.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/TfaControls/ShowBackupCodesDialog.ascx.cs index 6afb375a8b..74c16d74d1 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/TfaControls/ShowBackupCodesDialog.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/TfaControls/ShowBackupCodesDialog.ascx.cs @@ -16,10 +16,10 @@ using System; -using System.Web; using System.Web.UI; using ASC.Core.Users; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Studio.UserControls.Management diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/TimeAndLanguage/TimeAndLanguage.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/TimeAndLanguage/TimeAndLanguage.ascx.cs index df9ec11d91..3a22a05716 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/TimeAndLanguage/TimeAndLanguage.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/TimeAndLanguage/TimeAndLanguage.ascx.cs @@ -19,13 +19,13 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using System.Web; using System.Web.UI; using ASC.Core; using ASC.Core.Tenants; using ASC.Web.Core.WhiteLabel; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/TransferPortal/TransferPortal.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/TransferPortal/TransferPortal.ascx.cs index b2c028213e..ef53d3fce2 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/TransferPortal/TransferPortal.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/TransferPortal/TransferPortal.ascx.cs @@ -18,7 +18,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web; using System.Web.UI; using AjaxPro; @@ -28,6 +27,7 @@ using ASC.Core.Users; using ASC.Web.Studio.Core; using ASC.Web.Studio.Core.Backup; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; namespace ASC.Web.Studio.UserControls.Management diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/VersionSettings/VersionSettings.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/VersionSettings/VersionSettings.ascx.cs index 15c4f3f5b9..e89a460e90 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/VersionSettings/VersionSettings.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/VersionSettings/VersionSettings.ascx.cs @@ -17,13 +17,13 @@ using System; using System.Linq; -using System.Web; using System.Web.UI; using AjaxPro; using ASC.Core; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/WhiteLabel/LogoUploader.cs b/web/studio/ASC.Web.Studio/UserControls/Management/WhiteLabel/LogoUploader.cs index 2ab06b06bc..fd6363c470 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/WhiteLabel/LogoUploader.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/WhiteLabel/LogoUploader.cs @@ -19,7 +19,6 @@ using System.Drawing; using System.IO; using System.Web; - using ASC.Core; using ASC.Web.Core.Users; using ASC.Web.Core.Utility; @@ -27,7 +26,7 @@ using ASC.Web.Studio.Core; using ASC.Web.Studio.PublicResources; -namespace ASC.Web.Studio.UserControls.WhiteLabel +namespace ASC.Web.Studio.UserControls.Management.WhiteLabel { internal class LogoUploader : IFileUploadHandler { diff --git a/web/studio/ASC.Web.Studio/UserControls/Management/WhiteLabel/WhiteLabel.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Management/WhiteLabel/WhiteLabel.ascx.cs index 4f4f7a92d3..f33ba598d1 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Management/WhiteLabel/WhiteLabel.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Management/WhiteLabel/WhiteLabel.ascx.cs @@ -16,11 +16,11 @@ using System; -using System.Web; using System.Web.UI; using ASC.Web.Core.WhiteLabel; using ASC.Web.Studio; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Statistics/ProductQuotes/ClientTemplateResources.cs b/web/studio/ASC.Web.Studio/UserControls/Statistics/ProductQuotes/ClientTemplateResources.cs index ff4e8694fd..f876600478 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Statistics/ProductQuotes/ClientTemplateResources.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Statistics/ProductQuotes/ClientTemplateResources.cs @@ -19,7 +19,6 @@ using System.Collections.Generic; using System.Linq; using System.Web; - using ASC.Web.Core.Client.HttpHandlers; namespace ASC.Web.Studio.UserControls.Statistics diff --git a/web/studio/ASC.Web.Studio/UserControls/Statistics/ProductQuotes/ProductQuotes.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Statistics/ProductQuotes/ProductQuotes.ascx.cs index 8350d922b8..0c36da6041 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Statistics/ProductQuotes/ProductQuotes.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Statistics/ProductQuotes/ProductQuotes.ascx.cs @@ -18,7 +18,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web; using System.Web.UI; using ASC.Core; @@ -28,6 +27,8 @@ using ASC.Web.Core.Client.Bundling; using ASC.Web.Core.Utility; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; +using ASC.Web.Studio.UserControls.Common; using ASC.Web.Studio.Utility; namespace ASC.Web.Studio.UserControls.Statistics diff --git a/web/studio/ASC.Web.Studio/UserControls/Statistics/VisitorsChart/VisitorsChart.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Statistics/VisitorsChart/VisitorsChart.ascx.cs index fa57309fd6..f139808252 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Statistics/VisitorsChart/VisitorsChart.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Statistics/VisitorsChart/VisitorsChart.ascx.cs @@ -17,9 +17,8 @@ using System; using System.Text; -using System.Web; using System.Web.UI; - +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Users/AuthCommunications/AuthCommunications.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Users/AuthCommunications/AuthCommunications.ascx.cs index 8e47c7a636..07efd84e74 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Users/AuthCommunications/AuthCommunications.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Users/AuthCommunications/AuthCommunications.ascx.cs @@ -32,6 +32,7 @@ using ASC.Web.Studio.Core; using ASC.Web.Studio.Core.Notify; using ASC.Web.Studio.Core.Users; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls.Statistics; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Users/ResendInvitesControl/ResendInvitesControl.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Users/ResendInvitesControl/ResendInvitesControl.ascx.cs index 2d66ac28aa..3b46685597 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Users/ResendInvitesControl/ResendInvitesControl.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Users/ResendInvitesControl/ResendInvitesControl.ascx.cs @@ -26,6 +26,7 @@ using ASC.Core.Users; using ASC.MessagingSystem; using ASC.Web.Studio.Core.Notify; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; namespace ASC.Web.Studio.UserControls.Users diff --git a/web/studio/ASC.Web.Studio/UserControls/Users/TipsSettings/TipsSettings.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Users/TipsSettings/TipsSettings.ascx.cs index bbc5ef8a84..ac88ff5fb0 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Users/TipsSettings/TipsSettings.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Users/TipsSettings/TipsSettings.ascx.cs @@ -16,8 +16,8 @@ using System; -using System.Web; using System.Web.UI; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Studio.UserControls.Users.TipsSettings { diff --git a/web/studio/ASC.Web.Studio/UserControls/Users/UserConnections/UserConnections.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Users/UserConnections/UserConnections.ascx.cs index 8a07b8f086..9a0073c76c 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Users/UserConnections/UserConnections.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Users/UserConnections/UserConnections.ascx.cs @@ -16,10 +16,10 @@ using System; -using System.Web; using System.Web.UI; using ASC.Web.Core.Utility; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Studio.UserControls.Users { diff --git a/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/AccountLinkControl.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/AccountLinkControl.ascx.cs index 712ee097e7..3b2e0f2fa5 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/AccountLinkControl.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/AccountLinkControl.ascx.cs @@ -26,6 +26,7 @@ using ASC.FederatedLogin.LoginProviders; using ASC.FederatedLogin.Profile; using ASC.Web.Core.Mobile; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; using Newtonsoft.Json; diff --git a/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/ConfirmationDeleteUser.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/ConfirmationDeleteUser.ascx.cs index 31f3ce7f08..8856a6ea38 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/ConfirmationDeleteUser.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/ConfirmationDeleteUser.ascx.cs @@ -16,8 +16,8 @@ using System; -using System.Web; using System.Web.UI; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Studio.UserControls.Users.UserProfile { diff --git a/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/LoadPhotoControl.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/LoadPhotoControl.ascx.cs index 5e7524b690..a7687eba2e 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/LoadPhotoControl.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/LoadPhotoControl.ascx.cs @@ -16,12 +16,12 @@ using System; -using System.Web; using System.Web.UI; using ASC.Core.Users; using ASC.Web.Core.Users; using ASC.Web.Core.Utility; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Studio.UserControls.Users.UserProfile { diff --git a/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/PwdTool.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/PwdTool.ascx.cs index ab062df6cd..f65fe9ac4e 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/PwdTool.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/PwdTool.ascx.cs @@ -16,10 +16,10 @@ using System; -using System.Web; using System.Web.UI; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Studio.UserControls.Users.UserProfile { diff --git a/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/UserEmailChange.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/UserEmailChange.ascx.cs index 0553b9b193..e759a7b5a6 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/UserEmailChange.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/UserEmailChange.ascx.cs @@ -16,12 +16,12 @@ using System; -using System.Web; using System.Web.UI; using ASC.Core.Users; using ASC.Web.Core.Utility; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Studio.UserControls.Users.UserProfile { diff --git a/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/UserLanguage.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/UserLanguage.ascx.cs index 27677b32f4..51d7e58991 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/UserLanguage.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/UserLanguage.ascx.cs @@ -25,6 +25,7 @@ using ASC.MessagingSystem; using ASC.Web.Core.WhiteLabel; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/UserProfileActions.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/UserProfileActions.ascx.cs index 235cb24c86..2376bf948b 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/UserProfileActions.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/UserProfileActions.ascx.cs @@ -25,6 +25,7 @@ using ASC.Web.Core.Utility; using ASC.Web.Studio.Core.Notify; using ASC.Web.Studio.Core.Users; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls.Management.ImpersonateUser; using ASC.Web.Studio.UserControls.Users.UserProfile; diff --git a/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/UserProfileControl.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/UserProfileControl.ascx.cs index dab8819bbf..b6346e4b91 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/UserProfileControl.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/UserProfileControl.ascx.cs @@ -30,6 +30,7 @@ using ASC.Web.Studio.Core; using ASC.Web.Studio.Core.TFA; using ASC.Web.Studio.Core.Users; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls.Management; using ASC.Web.Studio.UserControls.Users.UserProfile; diff --git a/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/UserProfileEditControl.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/UserProfileEditControl.ascx.cs index e3cefc9ade..a9430b918e 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/UserProfileEditControl.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Users/UserProfile/UserProfileEditControl.ascx.cs @@ -18,7 +18,6 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Web; using System.Web.UI; using ASC.Core; @@ -27,7 +26,9 @@ using ASC.Web.Core; using ASC.Web.Core.Users; using ASC.Web.Core.Utility; +using ASC.Web.Studio.Core; using ASC.Web.Studio.Core.Users; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls.Statistics; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/UserControls/Users/UserSubscriptions/UserSubscriptions.ascx.cs b/web/studio/ASC.Web.Studio/UserControls/Users/UserSubscriptions/UserSubscriptions.ascx.cs index 3342251146..6824c923e7 100644 --- a/web/studio/ASC.Web.Studio/UserControls/Users/UserSubscriptions/UserSubscriptions.ascx.cs +++ b/web/studio/ASC.Web.Studio/UserControls/Users/UserSubscriptions/UserSubscriptions.ascx.cs @@ -34,6 +34,7 @@ using ASC.Web.Core.Utility; using ASC.Web.Studio.Core; using ASC.Web.Studio.Core.Notify; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/VoipClient.aspx.cs b/web/studio/ASC.Web.Studio/VoipClient.aspx.cs index 895e6765fd..62d5973a66 100644 --- a/web/studio/ASC.Web.Studio/VoipClient.aspx.cs +++ b/web/studio/ASC.Web.Studio/VoipClient.aspx.cs @@ -26,6 +26,7 @@ using ASC.Web.Core; using ASC.Web.Core.Client.HttpHandlers; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters; using ASC.Web.Studio.UserControls.Common; namespace ASC.Web.Studio diff --git a/web/studio/ASC.Web.Studio/Wizard.aspx.cs b/web/studio/ASC.Web.Studio/Wizard.aspx.cs index 1a23f838fb..a4b550b669 100644 --- a/web/studio/ASC.Web.Studio/Wizard.aspx.cs +++ b/web/studio/ASC.Web.Studio/Wizard.aspx.cs @@ -16,12 +16,13 @@ using System; -using System.Web; using ASC.Core; using ASC.Web.Core.Files; using ASC.Web.Core.Utility.Settings; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls.FirstTime; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Studio/addons/calendar/ASC.Web.Calendar.csproj b/web/studio/ASC.Web.Studio/addons/calendar/ASC.Web.Calendar.csproj index 158c4c7822..75b318039d 100644 --- a/web/studio/ASC.Web.Studio/addons/calendar/ASC.Web.Calendar.csproj +++ b/web/studio/ASC.Web.Studio/addons/calendar/ASC.Web.Calendar.csproj @@ -1,117 +1,75 @@ - - + + - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {7BCED72B-1DDE-4732-8EB3-2CF7002D7305} - {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} Library - Properties - ASC.Web.Calendar - ASC.Web.Calendar - v4.8 - - - - - 4.0 - - false - - - - ..\..\..\..\..\web\studio\ASC.Web.Studio\bin\ + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 - false ..\..\bin\ASC.Web.Calendar.xml CS1591 none - true - TRACE - prompt - 4 - false - - - - + + net48 + false + false + 5.1.2 - - - + DocumentsPopup.ascx ASPXCodeBehind - + DocumentsPopup.ascx - + Default.aspx ASPXCodeBehind - + Default.aspx - - - - + CalendarControl.ascx ASPXCodeBehind - + CalendarControl.ascx - + CalendarResources.ascx ASPXCodeBehind - + CalendarResources.ascx - + ButtonSidePanel.ascx ASPXCodeBehind - + ButtonSidePanel.ascx - + CalendarSidePanel.ascx ASPXCodeBehind - + CalendarSidePanel.ascx - + SidePanel.ascx ASPXCodeBehind - + SidePanel.ascx @@ -164,7 +122,7 @@ CalendarJSResource.resx - + Designer PublicResXFileCodeGenerator CalendarJSResource.Designer.cs @@ -190,7 +148,7 @@ CalendarJSResource.resx - + True True CalendarJSResource.resx @@ -243,7 +201,7 @@ CalendarAddonResource.resx - + Designer PublicResXFileCodeGenerator CalendarAddonResource.Designer.cs @@ -269,7 +227,7 @@ CalendarAddonResource.resx - + True True CalendarAddonResource.resx @@ -456,7 +414,6 @@ - web.config @@ -465,69 +422,86 @@ - + + + + + + + - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {3f6b420f-abd3-4b5a-9f4c-5d61ffbb01de} - ASC.Data.Storage - - - {5f7dc7bd-d831-449a-908d-5a419e4dfe71} - ASC.Api.Calendar - - - {02c40a64-fe22-41d0-9037-69f0d6f787a9} - ASC.Web.Core - - - {e7be6ce8-f6b0-4b9b-831b-ba0c85c8d130} - ASC.Web.Studio - - - {8c534af7-5696-4e68-9ff4-ffc311893c10} - ASC.Web.Files - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - False - True - 54560 - / - - - False - False - - - False - - - - - - \ No newline at end of file diff --git a/web/studio/ASC.Web.Studio/addons/calendar/ASC.Web.Calendar.csproj.user b/web/studio/ASC.Web.Studio/addons/calendar/ASC.Web.Calendar.csproj.user new file mode 100644 index 0000000000..db8622989d --- /dev/null +++ b/web/studio/ASC.Web.Studio/addons/calendar/ASC.Web.Calendar.csproj.user @@ -0,0 +1,6 @@ + + + + Debug|Any CPU + + \ No newline at end of file diff --git a/web/studio/ASC.Web.Studio/addons/calendar/Controls/DocumentsPopup/DocumentsPopup.ascx.cs b/web/studio/ASC.Web.Studio/addons/calendar/Controls/DocumentsPopup/DocumentsPopup.ascx.cs index 6741a976bf..80f4cf053b 100644 --- a/web/studio/ASC.Web.Studio/addons/calendar/Controls/DocumentsPopup/DocumentsPopup.ascx.cs +++ b/web/studio/ASC.Web.Studio/addons/calendar/Controls/DocumentsPopup/DocumentsPopup.ascx.cs @@ -16,11 +16,11 @@ using System; -using System.Web; using System.Web.UI; using ASC.Files.Core; using ASC.Web.Files; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls.Common.LoaderPage; diff --git a/web/studio/ASC.Web.Studio/addons/calendar/Default.aspx.cs b/web/studio/ASC.Web.Studio/addons/calendar/Default.aspx.cs index 641824f1ce..253b91be95 100644 --- a/web/studio/ASC.Web.Studio/addons/calendar/Default.aspx.cs +++ b/web/studio/ASC.Web.Studio/addons/calendar/Default.aspx.cs @@ -18,7 +18,7 @@ using System; using ASC.Web.Calendar.UserControls; -using ASC.Web.Studio; +using ASC.Web.Studio.Masters; using ASC.Web.Studio.Utility; namespace ASC.Web.Calendar diff --git a/web/studio/ASC.Web.Studio/addons/calendar/Properties/launchSettings.json b/web/studio/ASC.Web.Studio/addons/calendar/Properties/launchSettings.json new file mode 100644 index 0000000000..e3be430f1c --- /dev/null +++ b/web/studio/ASC.Web.Studio/addons/calendar/Properties/launchSettings.json @@ -0,0 +1,12 @@ +{ + "profiles": { + "ASC.Web.Calendar": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "http://localhost:64764" + } + } +} \ No newline at end of file diff --git a/web/studio/ASC.Web.Studio/addons/calendar/UserControls/CalendarControl.ascx.cs b/web/studio/ASC.Web.Studio/addons/calendar/UserControls/CalendarControl.ascx.cs index 8df928f950..d5a9e3783f 100644 --- a/web/studio/ASC.Web.Studio/addons/calendar/UserControls/CalendarControl.ascx.cs +++ b/web/studio/ASC.Web.Studio/addons/calendar/UserControls/CalendarControl.ascx.cs @@ -23,6 +23,7 @@ using ASC.Web.Calendar.Controls; using ASC.Web.Core.Utility; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.UserControls.Common; namespace ASC.Web.Calendar.UserControls diff --git a/web/studio/ASC.Web.Studio/addons/mail/ASC.Web.Mail.csproj b/web/studio/ASC.Web.Studio/addons/mail/ASC.Web.Mail.csproj index 1fa2a28e0a..345c8602fe 100644 --- a/web/studio/ASC.Web.Studio/addons/mail/ASC.Web.Mail.csproj +++ b/web/studio/ASC.Web.Studio/addons/mail/ASC.Web.Mail.csproj @@ -1,47 +1,21 @@ - - + + - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {1EF9C7D8-F92E-48B3-9A86-78E431ABC306} Library - Properties - ASC.Web.Mail - ASC.Web.Mail - v4.8 - - - - - 4.0 - ..\..\..\..\..\web\studio\ASC.Web.Studio\bin\ + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 - false ..\..\bin\ASC.Web.Mail.xml CS1591 none - true - TRACE - prompt - 4 - false + + + net48 + false + false @@ -227,118 +201,110 @@ - - - - + CommonSettingsPage.ascx ASPXCodeBehind - + CommonSettingsPage.ascx - + AccountsPage.ascx ASPXCodeBehind - + AccountsPage.ascx - + AdministrationPage.ascx ASPXCodeBehind - + AdministrationPage.ascx - + BlankModal.ascx ASPXCodeBehind - + BlankModal.ascx - + ContactsPage.ascx ASPXCodeBehind - + ContactsPage.ascx - + Filters.ascx ASPXCodeBehind - + Filters.ascx - + DocumentsPopup.ascx ASPXCodeBehind - + DocumentsPopup.ascx - + MailBox.ascx ASPXCodeBehind - + MailBox.ascx - + TagBox.ascx ASPXCodeBehind - + TagBox.ascx - + TagsPage.ascx ASPXCodeBehind - + TagsPage.ascx - + UserFoldersPage.ascx ASPXCodeBehind - + UserFoldersPage.ascx - + Default.aspx ASPXCodeBehind - + Default.aspx - + OAuth.aspx ASPXCodeBehind - + OAuth.aspx - + Download.ashx - + ContactPhoto.ashx - + EditDocument.ashx - - + ViewDocument.ashx - - - - - + True True MailScriptResource.resx @@ -390,7 +356,7 @@ MailAdministrationResource.resx - + Designer PublicResXFileCodeGenerator MailAdministrationResource.Designer.cs @@ -416,7 +382,7 @@ MailAdministrationResource.resx - + True True MailAdministrationResource.resx @@ -463,7 +429,7 @@ MailActionCompleteResource.resx - + Designer PublicResXFileCodeGenerator MailActionCompleteResource.Designer.cs @@ -489,7 +455,7 @@ MailActionCompleteResource.resx - + True True MailActionCompleteResource.resx @@ -539,7 +505,7 @@ MailApiErrorsResource.resx - + Designer PublicResXFileCodeGenerator MailApiErrorsResource.Designer.cs @@ -565,7 +531,7 @@ MailApiErrorsResource.resx - + True True MailApiErrorsResource.resx @@ -615,7 +581,7 @@ MailApiResource.resx - + Designer PublicResXFileCodeGenerator MailApiResource.Designer.cs @@ -641,7 +607,7 @@ MailApiResource.resx - + True True MailApiResource.resx @@ -688,7 +654,7 @@ MailAttachmentsResource.resx - + Designer PublicResXFileCodeGenerator MailAttachmentsResource.Designer.cs @@ -714,7 +680,7 @@ MailAttachmentsResource.resx - + True True MailAttachmentsResource.resx @@ -767,7 +733,7 @@ MailResource.resx - + Designer PublicResXFileCodeGenerator MailResource.Designer.cs @@ -793,7 +759,7 @@ MailResource.resx - + True True MailResource.resx @@ -846,7 +812,7 @@ MailScriptResource.resx - + Designer PublicResXFileCodeGenerator MailScriptResource.Designer.cs @@ -1079,54 +1045,231 @@ - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {3f6b420f-abd3-4b5a-9f4c-5d61ffbb01de} - ASC.Data.Storage - - - {49f07fff-98a5-47d2-a9e9-a46b98c41245} - ASC.Api.Core - - - {7080343d-fbe7-423a-9405-4f883f6e235b} - ASC.Mail - - - {481b0d9c-b2f8-4de9-8597-ba8d24585099} - ASC.FederatedLogin - False - - - {02c40a64-fe22-41d0-9037-69f0d6f787a9} - ASC.Web.Core - - - {e7be6ce8-f6b0-4b9b-831b-ba0c85c8d130} - ASC.Web.Studio - - - {48efb880-3d76-4b21-b31e-1007c0062b5c} - ASC.Web.CRM - - - {8c534af7-5696-4e68-9ff4-ffc311893c10} - ASC.Web.Files - + + + + + + + + + + 13.0.1 - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/web/studio/ASC.Web.Studio/addons/mail/Addon/MailAddon.cs b/web/studio/ASC.Web.Studio/addons/mail/Addon/MailAddon.cs index c20d4cab83..b4aa9da0aa 100644 --- a/web/studio/ASC.Web.Studio/addons/mail/Addon/MailAddon.cs +++ b/web/studio/ASC.Web.Studio/addons/mail/Addon/MailAddon.cs @@ -25,6 +25,7 @@ using ASC.Web.Core; using ASC.Web.Core.WebZones; using ASC.Web.Mail.Resources; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Mail { diff --git a/web/studio/ASC.Web.Studio/addons/mail/Controls/BlankModal/BlankModal.ascx.cs b/web/studio/ASC.Web.Studio/addons/mail/Controls/BlankModal/BlankModal.ascx.cs index e8320dba87..edc437c434 100644 --- a/web/studio/ASC.Web.Studio/addons/mail/Controls/BlankModal/BlankModal.ascx.cs +++ b/web/studio/ASC.Web.Studio/addons/mail/Controls/BlankModal/BlankModal.ascx.cs @@ -16,10 +16,10 @@ using System; -using System.Web; using ASC.Core; using ASC.Web.Core; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Mail.Controls { diff --git a/web/studio/ASC.Web.Studio/addons/mail/Controls/DocumentsPopup/DocumentsPopup.ascx.cs b/web/studio/ASC.Web.Studio/addons/mail/Controls/DocumentsPopup/DocumentsPopup.ascx.cs index dfb4197f83..b603ee7514 100644 --- a/web/studio/ASC.Web.Studio/addons/mail/Controls/DocumentsPopup/DocumentsPopup.ascx.cs +++ b/web/studio/ASC.Web.Studio/addons/mail/Controls/DocumentsPopup/DocumentsPopup.ascx.cs @@ -16,12 +16,12 @@ using System; -using System.Web; using System.Web.UI; using ASC.Files.Core; using ASC.Web.Files; using ASC.Web.Files.Classes; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls.Common.LoaderPage; diff --git a/web/studio/ASC.Web.Studio/addons/mail/Controls/MailBox/MailBox.ascx.cs b/web/studio/ASC.Web.Studio/addons/mail/Controls/MailBox/MailBox.ascx.cs index c884ee0f3e..eb2db80522 100644 --- a/web/studio/ASC.Web.Studio/addons/mail/Controls/MailBox/MailBox.ascx.cs +++ b/web/studio/ASC.Web.Studio/addons/mail/Controls/MailBox/MailBox.ascx.cs @@ -23,6 +23,8 @@ using ASC.Web.Files.Controls; using ASC.Web.Mail.Resources; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; +using ASC.Web.Studio.UserControls.Common.MediaViewer; namespace ASC.Web.Mail.Controls { @@ -62,7 +64,7 @@ protected void Page_Load(object sender, EventArgs e) "~/Products/Files/Controls/Tree/tree.less", "~/Products/Files/Controls/ConvertFile/confirmconvert.less"); } - ControlPlaceHolder.Controls.Add(LoadControl(Studio.UserControls.Common.MediaPlayer.Location)); + ControlPlaceHolder.Controls.Add(LoadControl(MediaPlayer.Location)); TagsPageHolder.Controls.Add(LoadControl(TagsPage.Location) as TagsPage); diff --git a/web/studio/ASC.Web.Studio/addons/mail/Default.aspx.cs b/web/studio/ASC.Web.Studio/addons/mail/Default.aspx.cs index f63ee8c6c9..94fa5f8141 100644 --- a/web/studio/ASC.Web.Studio/addons/mail/Default.aspx.cs +++ b/web/studio/ASC.Web.Studio/addons/mail/Default.aspx.cs @@ -40,10 +40,10 @@ using ASC.Web.Mail.Controls; using ASC.Web.Mail.Masters.ClientScripts; using ASC.Web.Mail.Resources; -using ASC.Web.Studio; using ASC.Web.Studio.Controls.Common; using ASC.Web.Studio.Core; using ASC.Web.Studio.Core.Users; +using ASC.Web.Studio.Masters; using ASC.Web.Studio.UserControls.Common.HelpCenter; using ASC.Web.Studio.UserControls.Common.InviteLink; using ASC.Web.Studio.UserControls.Common.LoaderPage; diff --git a/web/studio/ASC.Web.Studio/addons/talk/ASC.Web.Talk.csproj b/web/studio/ASC.Web.Studio/addons/talk/ASC.Web.Talk.csproj index fe3f13d699..a464aa420d 100644 --- a/web/studio/ASC.Web.Studio/addons/talk/ASC.Web.Talk.csproj +++ b/web/studio/ASC.Web.Studio/addons/talk/ASC.Web.Talk.csproj @@ -1,47 +1,20 @@ - - + + - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - Debug - AnyCPU - 9.0.30729 - 2.0 - {07AD1522-D100-4CE6-94FA-95CBE5822363} Library - Properties - ASC.Web.Talk - ASC.Web.Talk - v4.8 - - - - - 4.0 - ..\..\..\..\..\web\studio\ASC.Web.Studio\bin\ + Debug;MvcOnly;Release - true - full - false - DEBUG;TRACE - prompt - 4 - false ..\..\bin\ASC.Web.Talk.xml CS1591 none - true - TRACE - prompt - 4 - false + + + net48 + false @@ -82,73 +55,63 @@ - - - - + Default.aspx ASPXCodeBehind - + Default.aspx - - - - - + JabberClient.aspx ASPXCodeBehind - + JabberClient.aspx - - - + True True TalkOverviewResource.resx - + True True TalkResource.resx - - + ContactsContainer.ascx ASPXCodeBehind - + ContactsContainer.ascx - + TabsContainerPart.ascx ASPXCodeBehind - + TabsContainerPart.ascx - + MeseditorContainer.ascx ASPXCodeBehind - + MeseditorContainer.ascx - + RoomsContainer.ascx ASPXCodeBehind - + RoomsContainer.ascx - + TalkNavigationItem.ascx ASPXCodeBehind - + TalkNavigationItem.ascx @@ -235,7 +198,7 @@ TalkOverviewResource.resx - + Designer PublicResXFileCodeGenerator TalkOverviewResource.Designer.cs @@ -309,7 +272,7 @@ TalkResource.resx - + Designer PublicResXFileCodeGenerator TalkResource.Designer.cs @@ -424,30 +387,12 @@ - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {3f6b420f-abd3-4b5a-9f4c-5d61ffbb01de} - ASC.Data.Storage - - - {ae1a0e06-6cd4-4e1d-8209-22bbbd6d5652} - ASC.ElasticSearch - - - {02c40a64-fe22-41d0-9037-69f0d6f787a9} - ASC.Web.Core - - - {e7be6ce8-f6b0-4b9b-831b-ba0c85c8d130} - ASC.Web.Studio - + + + + + + @@ -470,9 +415,79 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/web/studio/ASC.Web.Studio/addons/talk/Addon/TalkSpaceUsageStatManager.cs b/web/studio/ASC.Web.Studio/addons/talk/Addon/TalkSpaceUsageStatManager.cs index 9f9b5b0097..2e5199c62f 100644 --- a/web/studio/ASC.Web.Studio/addons/talk/Addon/TalkSpaceUsageStatManager.cs +++ b/web/studio/ASC.Web.Studio/addons/talk/Addon/TalkSpaceUsageStatManager.cs @@ -28,6 +28,7 @@ using ASC.Core.Users; using ASC.Data.Storage; using ASC.Web.Core; +using ASC.Web.Studio.Core.Users; using ASC.Web.Studio.UserControls.Statistics; namespace ASC.Web.Talk.Addon diff --git a/web/studio/ASC.Web.Studio/addons/talk/Default.aspx.cs b/web/studio/ASC.Web.Studio/addons/talk/Default.aspx.cs index fa86899c3a..bf608c50ad 100644 --- a/web/studio/ASC.Web.Studio/addons/talk/Default.aspx.cs +++ b/web/studio/ASC.Web.Studio/addons/talk/Default.aspx.cs @@ -17,10 +17,10 @@ using System; using System.Configuration; -using System.Web; using ASC.Web.Core.Utility; -using ASC.Web.Studio; +using ASC.Web.Studio.Masters; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; using ASC.Web.Talk.Resources; diff --git a/web/studio/ASC.Web.Studio/addons/talk/JabberClient.aspx.cs b/web/studio/ASC.Web.Studio/addons/talk/JabberClient.aspx.cs index 3bbc7e4a4a..e21d66703d 100644 --- a/web/studio/ASC.Web.Studio/addons/talk/JabberClient.aspx.cs +++ b/web/studio/ASC.Web.Studio/addons/talk/JabberClient.aspx.cs @@ -30,8 +30,9 @@ using ASC.Web.Core; using ASC.Web.Core.Jabber; using ASC.Web.Core.Utility; -using ASC.Web.Studio; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Studio.Utility; using ASC.Web.Talk.Addon; using ASC.Web.Talk.ClientScript; diff --git a/web/studio/ASC.Web.Studio/addons/talk/UserControls/ContactsContainer.ascx.cs b/web/studio/ASC.Web.Studio/addons/talk/UserControls/ContactsContainer.ascx.cs index 8d15f967a1..a8168e5ae3 100644 --- a/web/studio/ASC.Web.Studio/addons/talk/UserControls/ContactsContainer.ascx.cs +++ b/web/studio/ASC.Web.Studio/addons/talk/UserControls/ContactsContainer.ascx.cs @@ -16,9 +16,8 @@ using System; -using System.Web; using System.Web.UI; - +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Talk.Addon; namespace ASC.Web.Talk.UserControls diff --git a/web/studio/ASC.Web.Studio/addons/talk/UserControls/MeseditorContainer.ascx.cs b/web/studio/ASC.Web.Studio/addons/talk/UserControls/MeseditorContainer.ascx.cs index d9784237c9..af728fc43d 100644 --- a/web/studio/ASC.Web.Studio/addons/talk/UserControls/MeseditorContainer.ascx.cs +++ b/web/studio/ASC.Web.Studio/addons/talk/UserControls/MeseditorContainer.ascx.cs @@ -20,6 +20,7 @@ using System.Web.UI; using ASC.Web.Core.Utility; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Talk.UserControls { diff --git a/web/studio/ASC.Web.Studio/addons/talk/UserControls/RoomsContainer.ascx.cs b/web/studio/ASC.Web.Studio/addons/talk/UserControls/RoomsContainer.ascx.cs index 35483922b8..80d08e09ea 100644 --- a/web/studio/ASC.Web.Studio/addons/talk/UserControls/RoomsContainer.ascx.cs +++ b/web/studio/ASC.Web.Studio/addons/talk/UserControls/RoomsContainer.ascx.cs @@ -19,6 +19,7 @@ using System.Text; using System.Web; using System.Web.UI; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Talk.UserControls { diff --git a/web/studio/ASC.Web.Studio/addons/talk/UserControls/TabsContainerPart.ascx.cs b/web/studio/ASC.Web.Studio/addons/talk/UserControls/TabsContainerPart.ascx.cs index 13cd0c1915..b872e3e4b2 100644 --- a/web/studio/ASC.Web.Studio/addons/talk/UserControls/TabsContainerPart.ascx.cs +++ b/web/studio/ASC.Web.Studio/addons/talk/UserControls/TabsContainerPart.ascx.cs @@ -16,11 +16,11 @@ using System; -using System.Web; using System.Web.UI; using ASC.Web.Core.WhiteLabel; using ASC.Web.Studio.Core; +using ASC.Web.Studio.Masters.MasterManagement; namespace ASC.Web.Talk.UserControls { diff --git a/web/studio/ASC.Web.Studio/addons/talk/UserControls/TalkNavigationItem.ascx.cs b/web/studio/ASC.Web.Studio/addons/talk/UserControls/TalkNavigationItem.ascx.cs index 69e4df8db7..43be505a14 100644 --- a/web/studio/ASC.Web.Studio/addons/talk/UserControls/TalkNavigationItem.ascx.cs +++ b/web/studio/ASC.Web.Studio/addons/talk/UserControls/TalkNavigationItem.ascx.cs @@ -22,6 +22,7 @@ using System.Web.UI; using ASC.Core; +using ASC.Web.Studio.Masters.MasterManagement; using ASC.Web.Talk.Addon; namespace ASC.Web.Talk.UserControls diff --git a/web/studio/ASC.Web.Studio/confirm.aspx.cs b/web/studio/ASC.Web.Studio/confirm.aspx.cs index 6491922462..362c04b615 100644 --- a/web/studio/ASC.Web.Studio/confirm.aspx.cs +++ b/web/studio/ASC.Web.Studio/confirm.aspx.cs @@ -33,6 +33,7 @@ using ASC.Web.Studio.Core.Notify; using ASC.Web.Studio.Core.SMS; using ASC.Web.Studio.Core.TFA; +using ASC.Web.Studio.Masters; using ASC.Web.Studio.PublicResources; using ASC.Web.Studio.UserControls.Management; using ASC.Web.Studio.Utility; diff --git a/web/studio/ASC.Web.Upload/ASC.Web.Upload.csproj b/web/studio/ASC.Web.Upload/ASC.Web.Upload.csproj index 8911b0c2c9..dd05906d0b 100644 --- a/web/studio/ASC.Web.Upload/ASC.Web.Upload.csproj +++ b/web/studio/ASC.Web.Upload/ASC.Web.Upload.csproj @@ -1,160 +1,49 @@ - - - + + - Debug - AnyCPU - 9.0.30729 - 2.0 - {69393DCE-0B48-40F6-908F-B30BDBDD9A79} - {349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc} Library - Properties - ASC.Web.Upload - ASC.Web.Upload - v4.8 - - - - - 4.0 - - false - - - - - - - - + Debug;MvcOnly;Release - true - full - false bin\ - DEBUG;TRACE - prompt - 4 - false bin\ASC.Web.Upload.xml CS1591 none - true bin\ - TRACE - prompt - 4 - false + + + net48 + false - - - - - - - - - - - - - - - - - - - - + Global.asax - - - - - - - - - - - - - {76de7717-3d4b-4a5b-b740-15b8913df0cb} - ASC.Common - - - {a51d0454-4afa-46de-89d4-b03d37e1816c} - ASC.Core.Common - - - {3f6b420f-abd3-4b5a-9f4c-5d61ffbb01de} - ASC.Data.Storage - - - {d51d3e43-6047-45dd-a0fa-321ce7c3885b} - ASC.Files.Thirdparty - - - {02c40a64-fe22-41d0-9037-69f0d6f787a9} - ASC.Web.Core - - - {48efb880-3d76-4b21-b31e-1007c0062b5c} - ASC.Web.CRM - - - {8c534af7-5696-4e68-9ff4-ffc311893c10} - ASC.Web.Files - - - {11acb4ca-a305-4caa-8546-392c6dafc7c4} - ASC.Web.Projects - + + + + + + + + - - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - - - False - True - 4983 - / - - - False - False - - - False - - - - 21.12.22.2 @@ -178,8 +67,9 @@ 1.6.7 - 2.0.9 + 3.1.0 + 8.0.32.1 @@ -195,10 +85,12 @@ 0.8.5 + + + + 3.1.47 - - \ No newline at end of file diff --git a/web/studio/ASC.Web.Upload/ASC.Web.Upload.csproj.user b/web/studio/ASC.Web.Upload/ASC.Web.Upload.csproj.user new file mode 100644 index 0000000000..db8622989d --- /dev/null +++ b/web/studio/ASC.Web.Upload/ASC.Web.Upload.csproj.user @@ -0,0 +1,6 @@ + + + + Debug|Any CPU + + \ No newline at end of file diff --git a/web/studio/ASC.Web.Upload/Properties/launchSettings.json b/web/studio/ASC.Web.Upload/Properties/launchSettings.json new file mode 100644 index 0000000000..6c5f8630f4 --- /dev/null +++ b/web/studio/ASC.Web.Upload/Properties/launchSettings.json @@ -0,0 +1,12 @@ +{ + "profiles": { + "ASC.Web.Upload": { + "commandName": "Project", + "launchBrowser": true, + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, + "applicationUrl": "http://localhost:64769" + } + } +} \ No newline at end of file