IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,380 Commits 40 Branches 22 Tags 420 MiB
920d999052
Commit Graph

14 Commits

Author SHA1 Message Date
SuhorukovAnton
920d999052 backup: add "completed" in end restore and transfer 2022-02-10 11:02:28 +03:00
SuhorukovAnton
d429bcc731 Merge branch 'develop' into feature/backup 2022-02-09 12:40:16 +03:00
SuhorukovAnton
fd7528879d backup: bugfix 2022-02-07 13:57:00 +03:00
Tatiana Lopaeva
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
SuhorukovAnton
34ff334692 Merge branch 'develop' into feature/analizators 2022-01-31 14:35:16 +03:00
SuhorukovAnton
fb3a61d0d2 analizators/s3442 2022-01-24 12:57:01 +03:00
SuhorukovAnton
667697f933 analizators/s2259 2022-01-21 16:46:30 +03:00
SuhorukovAnton
fb65d3a09d analizators/1481 2022-01-21 16:15:15 +03:00
SuhorukovAnton
473259657e analizators/s1118 2022-01-21 13:47:56 +03:00
Alexey Bannov
07ebea5db8 backup: refactoring 2022-01-18 19:04:35 +03:00
SuhorukovAnton
32770e3f0c backup: set tenant before download backup file 2021-11-19 12:44:35 +03:00
Tatiana Lopaeva
ec40bcc828 Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup 2021-09-20 16:27:28 +03:00
Tatiana Lopaeva
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
SuhorukovAnton
8171563965 backup.core: move backup.core 2021-09-02 15:41:54 +03:00