-
Notifications
You must be signed in to change notification settings - Fork 94
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into feature/mobile-main-button
- Loading branch information
Showing
571 changed files
with
28,805 additions
and
20,222 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
|
|
||
| Microsoft Visual Studio Solution File, Format Version 12.00 | ||
| # Visual Studio Version 17 | ||
| VisualStudioVersion = 17.0.31815.197 | ||
| MinimumVisualStudioVersion = 10.0.40219.1 | ||
| Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.Core.Common", "common\ASC.Core.Common\ASC.Core.Common.csproj", "{A51D0454-4AFA-46DE-89D4-B03D37E1816C}" | ||
| EndProject | ||
| Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoMigrationCreator", "common\Tools\AutoMigrationCreator\AutoMigrationCreator.csproj", "{D779E2D7-1060-43D3-B8F2-F76A73CCFEBC}" | ||
| EndProject | ||
| Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.Files.Core", "products\ASC.Files\Core\ASC.Files.Core.csproj", "{B3D98EF4-B9A3-4082-AE78-7CF4C5CF5211}" | ||
| EndProject | ||
| Global | ||
| GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| Debug|Any CPU = Debug|Any CPU | ||
| Release|Any CPU = Release|Any CPU | ||
| EndGlobalSection | ||
| GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| {A51D0454-4AFA-46DE-89D4-B03D37E1816C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| {A51D0454-4AFA-46DE-89D4-B03D37E1816C}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| {A51D0454-4AFA-46DE-89D4-B03D37E1816C}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| {A51D0454-4AFA-46DE-89D4-B03D37E1816C}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| {D779E2D7-1060-43D3-B8F2-F76A73CCFEBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| {D779E2D7-1060-43D3-B8F2-F76A73CCFEBC}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| {D779E2D7-1060-43D3-B8F2-F76A73CCFEBC}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| {D779E2D7-1060-43D3-B8F2-F76A73CCFEBC}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| {B3D98EF4-B9A3-4082-AE78-7CF4C5CF5211}.Debug|Any CPU.ActiveCfg = Debug|Any CPU | ||
| {B3D98EF4-B9A3-4082-AE78-7CF4C5CF5211}.Debug|Any CPU.Build.0 = Debug|Any CPU | ||
| {B3D98EF4-B9A3-4082-AE78-7CF4C5CF5211}.Release|Any CPU.ActiveCfg = Release|Any CPU | ||
| {B3D98EF4-B9A3-4082-AE78-7CF4C5CF5211}.Release|Any CPU.Build.0 = Release|Any CPU | ||
| EndGlobalSection | ||
| GlobalSection(SolutionProperties) = preSolution | ||
| HideSolutionNode = FALSE | ||
| EndGlobalSection | ||
| GlobalSection(ExtensibilityGlobals) = postSolution | ||
| SolutionGuid = {3A1E5FB1-22F6-4394-BFF3-8733F4A23003} | ||
| EndGlobalSection | ||
| EndGlobal |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| { | ||
| "solution": { | ||
| "path": "ASC.Web.sln", | ||
| "projects": [ | ||
| "common\\ASC.Api.Core\\ASC.Api.Core.csproj", | ||
| "common\\ASC.Common\\ASC.Common.csproj", | ||
| "common\\ASC.Core.Common\\ASC.Core.Common.csproj", | ||
| "common\\ASC.Data.Backup.Core\\ASC.Data.Backup.Core.csproj", | ||
| "common\\ASC.Data.Reassigns\\ASC.Data.Reassigns.csproj", | ||
| "common\\ASC.Data.Storage\\ASC.Data.Storage.csproj", | ||
| "common\\ASC.FederatedLogin\\ASC.FederatedLogin.csproj", | ||
| "common\\ASC.Feed\\ASC.Feed.csproj", | ||
| "common\\ASC.IPSecurity\\ASC.IPSecurity.csproj", | ||
| "common\\ASC.MessagingSystem\\ASC.MessagingSystem.csproj", | ||
| "common\\ASC.Notify.Textile\\ASC.Notify.Textile.csproj", | ||
| "common\\ASC.Textile\\ASC.Textile.csproj", | ||
| "common\\ASC.VoipService\\ASC.VoipService.csproj", | ||
| "common\\ASC.Webhooks.Core\\ASC.Webhooks.Core.csproj", | ||
| "common\\services\\ASC.AuditTrail\\ASC.AuditTrail.csproj", | ||
| "common\\services\\ASC.ClearEvents\\ASC.ClearEvents.csproj", | ||
| "common\\services\\ASC.Data.Backup\\ASC.Data.Backup.csproj", | ||
| "common\\services\\ASC.ElasticSearch\\ASC.ElasticSearch.csproj", | ||
| "common\\services\\ASC.Feed.Aggregator\\ASC.Feed.Aggregator.csproj", | ||
| "common\\services\\ASC.Notify\\ASC.Notify.csproj", | ||
| "common\\services\\ASC.Studio.Notify\\ASC.Studio.Notify.csproj", | ||
| "common\\services\\ASC.TelegramService\\ASC.TelegramService.csproj", | ||
| "common\\services\\ASC.UrlShortener.Svc\\ASC.UrlShortener.Svc.csproj", | ||
| "common\\services\\ASC.Webhooks.Service\\ASC.Webhooks.Service.csproj", | ||
| "products\\ASC.Files\\Core\\ASC.Files.Core.csproj", | ||
| "products\\ASC.Files\\Server\\ASC.Files.csproj", | ||
| "products\\ASC.Files\\Service\\ASC.Files.Service.csproj", | ||
| "products\\ASC.People\\Server\\ASC.People.csproj", | ||
| "web\\ASC.Web.Api\\ASC.Web.Api.csproj", | ||
| "web\\ASC.Web.Core\\ASC.Web.Core.csproj", | ||
| "web\\ASC.Web.HealthChecks.UI\\ASC.Web.HealthChecks.UI.csproj", | ||
| "web\\ASC.Web.Studio\\ASC.Web.Studio.csproj" | ||
| ] | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,20 @@ | ||
| PUSHD %~dp0.. | ||
| dotnet build ASC.Web.sln /fl1 /flp1:LogFile=build/ASC.Web.log;Verbosity=Normal | ||
|
|
||
| dotnet build ASC.Web.slnf /fl1 /flp1:LogFile=build/ASC.Web.log;Verbosity=Normal | ||
| @echo off | ||
| echo. | ||
| echo Install nodejs projects dependencies... | ||
| echo. | ||
|
|
||
| if %errorlevel% == 0 ( | ||
| for /R "build\scripts\" %%f in (*.sh) do ( | ||
| echo "%%~nxf" | ||
| for /R "build\scripts\" %%f in (*.bat) do ( | ||
| echo Run script %%~nxf... | ||
| echo. | ||
| call build\scripts\%%~nxf | ||
| ) | ||
| ) | ||
| ) | ||
|
|
||
| echo. | ||
|
|
||
| if "%1"=="nopause" goto start | ||
| pause | ||
| :start |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,22 @@ | ||
| @echo off | ||
| PUSHD %~dp0 | ||
| setlocal EnableDelayedExpansion | ||
|
|
||
| call runasadmin.bat "%~dpnx0" | ||
|
|
||
| if %errorlevel% == 0 ( | ||
|
|
||
| call start\stop.bat | ||
| call start\stop.bat nopause | ||
|
|
||
| PUSHD %~dp0.. | ||
|
|
||
| echo "FRONT-END static" | ||
| call build\build.static.bat | ||
| call build\build.static.bat nopause | ||
|
|
||
| echo "BACK-END" | ||
| call build\build.backend.bat | ||
| call build\build.backend.bat nopause | ||
|
|
||
| start /b call build\start\start.bat | ||
| call build\start\start.bat nopause | ||
|
|
||
| pause | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| @echo "MIGRATIONS" | ||
| @echo off | ||
|
|
||
| PUSHD %~dp0..\common\Tools\AutoMigrationCreator | ||
| dotnet run --project AutoMigrationCreator.csproj |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,15 @@ | ||
| PUSHD %~dp0.. | ||
| call runasadmin.bat "%~dpnx0" | ||
| @echo off | ||
|
|
||
| PUSHD %~dp0..\.. | ||
| setlocal EnableDelayedExpansion | ||
|
|
||
| if %errorlevel% == 0 ( | ||
| for /R "run\" %%f in (*.bat) do ( | ||
| call nssm install Onlyoffice%%~nf "%%~f" | ||
| for /R "build\run\" %%f in (*.bat) do ( | ||
| call build\run\%%~nxf | ||
| echo service create "Onlyoffice%%~nf" | ||
| call sc create "Onlyoffice%%~nf" displayname= "ONLYOFFICE %%~nf" binPath= "!servicepath!" | ||
| ) | ||
| ) | ||
| ) | ||
|
|
||
| echo. | ||
| pause |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,15 @@ | ||
| @echo off | ||
|
|
||
| PUSHD %~dp0.. | ||
| call runasadmin.bat "%~dpnx0" | ||
|
|
||
| if %errorlevel% == 0 ( | ||
| for /R "run\" %%f in (*.bat) do ( | ||
| call nssm remove Onlyoffice%%~nf | ||
| echo Running service stop and delete "Onlyoffice%%~nf" | ||
| call sc stop "Onlyoffice%%~nf" | ||
| call sc delete "Onlyoffice%%~nf" | ||
| ) | ||
| ) | ||
| ) | ||
|
|
||
| echo. | ||
| pause |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,4 @@ | ||
| echo "RUN ASC.Backup" | ||
| call dotnet run --project ..\..\common\services\ASC.Data.Backup\ASC.Data.Backup.csproj --no-build --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=backup | ||
| @echo off | ||
|
|
||
| PUSHD %~dp0..\.. | ||
| set servicepath=%cd%\common\services\ASC.Data.Backup\bin\Debug\ASC.Data.Backup.exe urls=http://0.0.0.0:5012 $STORAGE_ROOT=%cd%\Data log:dir=%cd%\Logs log:name=backup pathToConf=%cd%\config core:products:folder=%cd%\products |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,4 @@ | ||
| echo "RUN ASC.ClearEvents" | ||
| call dotnet run --project ..\..\common\services\ASC.ClearEvents\ASC.ClearEvents.csproj --no-build --$STORAGE_ROOT=..\..\Data --log__dir=..\..\Logs --log__name=clearEvents | ||
| @echo off | ||
|
|
||
| PUSHD %~dp0..\.. | ||
| set servicepath=%cd%\common\services\ASC.ClearEvents\bin\Debug\ASC.ClearEvents.exe urls=http://0.0.0.0:5027 $STORAGE_ROOT=%cd%\Data pathToConf=%cd%\config log:dir=%cd%\Logs log:name=clearEvents core:products:folder=%cd%\products |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,4 @@ | ||
| echo "RUN ASC.Files" | ||
| call dotnet run --project ..\..\products\ASC.Files\Server\ASC.Files.csproj --no-build --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=files | ||
| @echo off | ||
|
|
||
| PUSHD %~dp0..\.. | ||
| set servicepath=%cd%\products\ASC.Files\Server\bin\Debug\ASC.Files.exe urls=http://0.0.0.0:5007 $STORAGE_ROOT=%cd%\Data log:dir=%cd%\Logs log:name=files pathToConf=%cd%\config core:products:folder=%cd%\products |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,4 @@ | ||
| echo "RUN ASC.Files" | ||
| call dotnet run --project ..\..\products\ASC.Files\Service\ASC.Files.Service.csproj --no-build --$STORAGE_ROOT=..\..\..\Data --log__dir=..\..\..\Logs --log__name=files | ||
| @echo off | ||
|
|
||
| PUSHD %~dp0..\.. | ||
| set servicepath=%cd%\products\ASC.Files\Service\bin\Debug\ASC.Files.Service.exe urls=http://0.0.0.0:5009 $STORAGE_ROOT=%cd%\Data log:dir=%cd%\Logs log:name=files.service pathToConf=%cd%\config core:products:folder=%cd%\products |
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.