Commit Graph

195 Commits

Author SHA1 Message Date
1acf512f87 backup: add in startup backupFileUpload.ashx 2022-02-10 11:01:51 +03:00
6510927b20 backup: add api method enableAutoBackup 2022-02-09 17:39:02 +03:00
d429bcc731 Merge branch 'develop' into feature/backup 2022-02-09 12:40:16 +03:00
b2079ccace fixed warnings 2022-02-07 20:19:58 +03:00
fd7528879d backup: bugfix 2022-02-07 13:57:00 +03:00
40d56075f1 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
2022-02-07 12:40:50 +03:00
34ff334692 Merge branch 'develop' into feature/analizators 2022-01-31 14:35:16 +03:00
1908af64f0 cache: return support kafka. refactoring 2022-01-27 15:20:51 +03:00
afb1f56641 backup: fixed startup backup as WindowsService https://github.com/dotnet/AspNetCore.Docs/issues/23387 2022-01-21 16:40:55 +03:00
473259657e analizators/s1118 2022-01-21 13:47:56 +03:00
7e13b3a031 backup: refactoring 2022-01-19 19:25:10 +03:00
07ebea5db8 backup: refactoring 2022-01-18 19:04:35 +03:00
84638feaf0 analizators/U2U1202 2022-01-18 16:54:24 +03:00
d3c1dfde9f backup: refactoring 2022-01-18 09:59:49 +03:00
ee8cb969bf backup: refactoring 2022-01-17 18:03:28 +03:00
a9da66f2b5 backup: refactoring 2022-01-17 14:15:46 +03:00
48897308d7 refactoring 2022-01-13 22:17:56 +03:00
6d250efffa add *.dll for support redis + update Grpc.* dll 2021-12-23 16:17:31 +03:00
384e012c5f net 6: remove TryUseWindowsService 2021-11-25 16:48:08 +03:00
b74e4ccfd1 Removed unused dependencies. Fixed tests 2021-11-24 12:39:39 +03:00
8ca88e4620 Merge branch 'develop' into feature/net6
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Common/ASC.Common.csproj
#	products/ASC.CRM/BackgroundTasks/ASC.CRM.BackgroundTasks.csproj
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Server/ASC.Files.csproj
#	web/ASC.Web.HealthChecks.UI/ASC.Web.HealthChecks.UI.csproj
2021-11-23 16:40:50 +03:00
2cba76f838 backup: add "backupFileUpload.ashx" 2021-11-19 12:43:54 +03:00
957aa8bd81 fixed started services 2021-10-26 20:09:19 +03:00
403388fbf1 Added solution filter
Removed unused services
replaced sh with bat
start service from source
2021-10-25 14:29:36 +03:00
e5e4a89e5b Merge branch 'develop' into feature/net6 2021-10-22 16:10:37 +03:00
f6f317ec42 net6: refactoring and bugfix 2021-10-21 16:23:26 +03:00
735a9b60cf net6: warning CA1416
also remove unnecessary usings
2021-10-13 11:07:03 +03:00
aa6c02b190 Merge branch 'develop' into feature/backup
# Conflicts:
#	common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
#	common/ASC.Data.Backup.Core/Service/BackupWorker.cs
#	common/services/ASC.Data.Backup/Controllers/BackupController.cs
#	packages/asc-web-common/api/settings/index.js
#	packages/asc-web-common/components/PrivateRoute/index.js
#	packages/asc-web-common/store/SettingsStore.js
#	products/ASC.Files/Client/public/locales/en/SelectFile.json
#	products/ASC.Files/Client/public/locales/ru/SelectFile.json
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileInput/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.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.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Client/src/Shell.jsx
2021-09-20 16:26:34 +03:00
d099326e7f Merge branch 'develop' into feature/backup.core
# Conflicts:
#	common/services/ASC.Data.Backup/Program.cs
2021-09-05 12:50:05 +03:00
d78195aa5a Added notify 2021-09-03 18:04:06 +03:00
c5b135afbe backup.core: remove waste 2021-09-02 16:11:41 +03:00
8171563965 backup.core: move backup.core 2021-09-02 15:41:54 +03:00
d8654444c6 backup.core: fix 2021-08-31 16:59:32 +03:00
115d752582 backup.core: fix 2021-08-31 15:43:40 +03:00
4b3cb1b4fb backup.core: first version 2021-08-31 12:40:28 +03:00
b791586252 net6 2021-08-25 18:26:13 +03:00
cf87addaa3 Security: added new method 2021-08-18 17:04:16 +03:00
9aafaa21ea
Merge pull request #319 from ONLYOFFICE/feature/log
Feature/log
2021-08-12 15:00:53 +03:00
39f77c5352 Backup: fix 2021-08-10 11:36:07 +03:00
546c1872a3 Added asp logging 2021-08-08 16:19:54 +03:00
2d75554b0d DbContext: optimization 2021-07-15 13:07:47 +03:00
ad57feecd8 Log: fix configuring 2021-07-13 21:17:18 +03:00
d04484a2eb backup: add api "enablerestore" 2021-06-30 16:33:49 +03:00
f340924612 Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup 2021-06-18 20:19:56 +03:00
ae17671043 Merge branch 'develop' into feature/backup
# Conflicts:
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/src/store/SettingsSetupStore.js
2021-06-18 18:08:38 +03:00
b6b88b2506 bug fix: exception when call "getbackuphistory" 2021-06-17 16:48:20 +03:00
01639a56cc RazorCompileOnBuild:false<
GenerateMvcApplicationPartsAssemblyAttributes:false
2021-06-16 20:08:26 +03:00
6db87a3907 Backup: Fixed after merge. 2021-06-08 15:32:28 +03:00
3ef16948fc Merge branch 'develop' into feature/backup
# Conflicts:
#	common/services/ASC.Data.Backup/Core/NotifyHelper.cs
#	products/ASC.Files/Client/public/locales/en/OperationsPanel.json
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Server/DocStore
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
2021-06-08 15:03:49 +03:00
43de25b62a Merge branch 'develop' into feature/remove-unused-dep
# Conflicts:
#	common/ASC.Data.Storage/ASC.Data.Storage.csproj
#	common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
2021-06-03 12:52:21 +03:00