Commit Graph

16400 Commits

Author SHA1 Message Date
4b06ae5f0e Web: Files: Common: Added redirect to preparation portal. 2022-02-18 10:01:55 +03:00
f978cb657d Web: files: AutoBackup: Optimization saving process. 2022-02-16 11:24:12 +03:00
b5ebbef616 Web: files: AutoBackup: Delete useless code. 2022-02-16 10:11:08 +03:00
879a027055 Web: Files: AutoBackup: Optimization modules. 2022-02-15 18:22:55 +03:00
853d2280b6 Web: Files: RestoreBackup: Hidden elements of header. 2022-02-15 09:24:44 +03:00
4a6ad133b0 Web: files: Changed styles for preparation portal. 2022-02-14 17:46:27 +03:00
6ba390ea62 Web: Files: AutoBackup: optimization, refactoring. 2022-02-14 17:06:26 +03:00
206ed1a04b Backup: Added request to exception. 2022-02-14 11:52:15 +03:00
70b3231756 Merge branch 'develop' into feature/backup 2022-02-14 10:51:38 +03:00
6b8304304f fixed starting services 2022-02-11 19:01:38 +03:00
4fbf3177b5 Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup 2022-02-10 18:17:43 +03:00
099d7049e3 Web: files: Fixed enabling of auto backup/restore. 2022-02-10 18:17:34 +03:00
77e14da218 fixed tests 2022-02-10 16:24:55 +03:00
e1116276eb backup: fix GetTasks 2022-02-10 14:12:28 +03:00
214df42f57 Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup 2022-02-10 13:16:52 +03:00
6ee61695be Web: files: added start restore. 2022-02-10 13:16:46 +03:00
73f82b1f2a backup: bugfix: link = null 2022-02-10 13:05:36 +03:00
0d083c90af Merge branch 'feature/backup' of https://github.com/ONLYOFFICE/AppServer into feature/backup 2022-02-10 11:02:35 +03:00
920d999052 backup: add "completed" in end restore and transfer 2022-02-10 11:02:28 +03:00
1acf512f87 backup: add in startup backupFileUpload.ashx 2022-02-10 11:01:51 +03:00
038178b05b Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup 2022-02-10 09:03:32 +03:00
6f9d9e4617 backup: bugfix 2022-02-09 18:39:44 +03:00
0069c6e7d4 Web: Files: RestoreBackup: Fixed timer. 2022-02-09 18:30:36 +03:00
ddd2e7182f Web: Files: Backup: Added method to check if automatic backup is available, refactoring. 2022-02-09 18:16:07 +03:00
6510927b20 backup: add api method enableAutoBackup 2022-02-09 17:39:02 +03:00
f8a748aae3 Web: files: Code simplification. 2022-02-09 17:25:40 +03:00
e8c2ce8294 Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup 2022-02-09 15:29:14 +03:00
a7337f6580 Web: Files: ManualBackup: Optimization, refactoring. 2022-02-09 15:08:48 +03:00
f354775332 Merge branch 'develop' into feature/backup 2022-02-09 13:42:11 +03:00
b6d98a8227
Merge pull request #516 from ONLYOFFICE/bugfix/U2U1100
Bugfix/u2u1100
2022-02-09 13:35:54 +03:00
147377ab65 bugfix: crash when string == null 2022-02-09 13:32:01 +03:00
d429bcc731 Merge branch 'develop' into feature/backup 2022-02-09 12:40:16 +03:00
783d5bd95e Web: files: restoreBackup: Optimization. 2022-02-08 17:53:17 +03:00
0dbf561def Web: Files: AutoBackup: changed schedule styles. 2022-02-08 11:11:08 +03:00
0c73b7f366 Web: Files: AutoBackup: Changed styles. 2022-02-08 11:06:53 +03:00
7d4069a559 WEb: files: ManualBackup: Changed styles. 2022-02-08 10:52:00 +03:00
aac83608a2 Web: Files: SelectFolderDialog: Added missing prop. 2022-02-08 10:32:51 +03:00
d2dfac2ed3 Web: RestoreBackup: Changed styles. 2022-02-08 10:32:20 +03:00
b1be9953ad fixed solution build 2022-02-07 22:15:32 +03:00
08c6040787
Merge pull request #503 from ONLYOFFICE/feature/analizators
Feature/analizators
2022-02-07 20:27:17 +03:00
b2079ccace fixed warnings 2022-02-07 20:19:58 +03:00
9f5a1f3ba7 Merge branch 'develop' into feature/analizators 2022-02-07 19:28:23 +03:00
37c88dad50 Analyzers: fix 2022-02-07 18:10:27 +03:00
812241a69a Analyzers: fix 2022-02-07 17:53:58 +03:00
87b0931f54 Web: Files: RestoreBackup: Refactoring. 2022-02-07 17:27:07 +03:00
0f714ebd15 WEb: Files: RestoreBackup: Added logic for third party storage. 2022-02-07 16:37:05 +03:00
fd7528879d backup: bugfix 2022-02-07 13:57:00 +03:00
b47e1f0215 Web: files: Fixed upload method. 2022-02-07 13:22:19 +03:00
a3ffeadafe Web: Files: Added upload method. 2022-02-07 13:02:35 +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