-
Notifications
You must be signed in to change notification settings - Fork 95
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/backup
# Conflicts: # common/ASC.Data.Backup.Core/EF/BackupsContext.cs # common/ASC.Data.Backup.Core/Service/BackupWorker.cs # common/services/ASC.Data.Backup/Controllers/BackupController.cs # common/services/ASC.Data.Backup/Startup.cs # packages/asc-web-common/components/PageLayout/sub-components/section-header.js # products/ASC.Files/Client/public/locales/en/OperationsPanel.json # products/ASC.Files/Client/public/locales/en/Settings.json # products/ASC.Files/Client/public/locales/ru/Settings.json # products/ASC.Files/Client/src/components/SimpleFileInput/StyledSimpleFileInput.js # products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js # products/ASC.Files/Client/src/components/panels/SelectFolderInput/StyledSelectFolderInput.js # products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js # products/ASC.Files/Client/src/components/panels/StyledPanels.js # products/ASC.Files/Client/webpack.config.js # web/ASC.Web.Client/public/locales/en/Settings.json # web/ASC.Web.Client/public/locales/ru/Settings.json # web/ASC.Web.Client/webpack.config.js
- Loading branch information
Showing
3,524 changed files
with
85,051 additions
and
46,112 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,3 +16,4 @@ Logs/ | |
| .eslintcache | ||
| build/deploy/ | ||
| /public/debuginfo.md | ||
| TestsResults/ | ||
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
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
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
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,11 +1,33 @@ | ||
| PUSHD %~dp0.. | ||
| dotnet build ASC.Web.sln /fl1 /flp1:LogFile=build/ASC.Web.log;Verbosity=Normal | ||
|
|
||
| @echo off | ||
|
|
||
| echo Start build backend... | ||
| echo. | ||
|
|
||
| cd /D "%~dp0" | ||
| call runasadmin.bat "%~dpnx0" | ||
|
|
||
| if %errorlevel% == 0 ( | ||
| for /R "build\scripts\" %%f in (*.sh) do ( | ||
| echo "%%~nxf" | ||
| call build\scripts\%%~nxf | ||
| ) | ||
| ) | ||
| call start\stop.bat nopause | ||
| dotnet build ..\asc.web.slnf /fl1 /flp1:logfile=asc.web.log;verbosity=normal | ||
| echo. | ||
|
|
||
| call start\start.bat nopause | ||
|
|
||
| echo install nodejs projects dependencies... | ||
| echo. | ||
|
|
||
|
|
||
| for /R "scripts\" %%f in (*.bat) do ( | ||
| echo Run script %%~nxf... | ||
| echo. | ||
| call scripts\%%~nxf | ||
| ) | ||
|
|
||
| echo. | ||
|
|
||
| if "%1"=="nopause" goto end | ||
| pause | ||
|
|
||
| ) | ||
|
|
||
| :end |
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,27 @@ | ||
| @echo off | ||
|
|
||
| echo "##########################################################" | ||
| echo "######### Start build and deploy #######################" | ||
| echo "##########################################################" | ||
|
|
||
| echo. | ||
|
|
||
| PUSHD %~dp0 | ||
| call runasadmin.bat "%~dpnx0" | ||
| if %errorlevel% == 0 ( | ||
|
|
||
| call start\stop.bat | ||
| if %errorlevel% == 0 ( | ||
|
|
||
| PUSHD %~dp0.. | ||
| call start\stop.bat nopause | ||
|
|
||
| echo "FRONT-END (for start run command 'yarn start' inside the root folder)" | ||
| call build\build.frontend.bat | ||
| call build.frontend.bat nopause | ||
|
|
||
| echo "BACK-END" | ||
| call build\build.backend.bat | ||
| call build.backend.bat nopause | ||
|
|
||
| call start\start.bat nopause | ||
|
|
||
| start /b call build\start\start.bat | ||
| 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,4 +1,6 @@ | ||
| PUSHD %~dp0.. | ||
|
|
||
| REM call yarn wipe | ||
| call yarn install | ||
| call yarn install | ||
|
|
||
| POPD |
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
Oops, something went wrong.