Sergey Kirichenko
6e20d619d1
Mod socket proxy conf
2022-02-14 18:41:15 +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
2dac619d61
Fixed Bug 55248 - Mobile.Client.Profile. Fixed closing the profile save window on the avatar editor page
2022-02-14 16:32:39 +03:00
01f8f95556
Fixed Bug 55058 - Client.Profile. Fixed broken images in "Sample title" when zooming in on a profile picture in the "Edit Photo" window.
2022-02-14 15:54:38 +03:00
9ef0e03143
Fixed Bug 55330 - Client. Fixed header title.
2022-02-14 14:31:31 +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
Vashchuk Nikita
631dcdc2e8
Merge branch 'develop' into feature/async
...
# Conflicts:
# common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
# common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
# common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
# common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/DeletePortalTask.cs
# common/ASC.Data.Storage/CrossModuleTransferUtility.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/Extensions.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.Data.Storage/StorageHandler.cs
# common/services/ASC.ApiSystem/Controllers/PortalController.cs
# products/ASC.CRM/Server/Api/VoipController.cs
# products/ASC.CRM/Server/Core/Dao/RelationshipEventDao.cs
# products/ASC.CRM/Server/Utils/PdfCreator.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/HttpHandlers/SearchHandler.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceConnector.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.Files/Core/Utils/MailMergeTask.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# web/ASC.Web.Core/Files/DocumentService.cs
# web/ASC.Web.Core/Files/DocumentServiceLicense.cs
# web/ASC.Web.Core/Helpers/ApiSystemHelper.cs
# web/ASC.Web.Core/Recaptcha.cs
# web/ASC.Web.Core/Utility/UrlShortener.cs
2022-02-12 00:51:48 +03:00
Vashchuk Nikita
4fb0bf2e46
fix
2022-02-11 21:18:12 +03:00
6b8304304f
fixed starting services
2022-02-11 19:01:38 +03:00
a497f3ff19
Web: Files: fixed files fileStatus
2022-02-11 13:42:17 +03:00
Vashchuk Nikita
7164c54b44
fix
2022-02-10 21:25:40 +03:00
8a0aeda83c
Merge branch 'hotfix/v1.1.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.1.1
2022-02-10 19:50:30 +03:00
fecb7d5e37
Fix Bug 49777 - Docs. The version icon does not appear next to the file name after it has been created and edited.
2022-02-10 19:49:44 +03:00
2736a945dc
Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1
2022-02-10 18:57:21 +03:00
fc8afde327
Fixed Bug 55449 - Client.Files. Fixed copying of file opened in editor.
2022-02-10 18:57:11 +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
a060c5954d
WebL Files: Fix Bug 55397 - Client.Files. Open location menu on Folder
2022-02-10 17:19:21 +03:00
77e14da218
fixed tests
2022-02-10 16:24:55 +03:00
79532ea198
Merge branch 'hotfix/v1.1.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.1.1
2022-02-10 15:23:37 +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
50137b8c12
Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1
2022-02-10 11:25:12 +03:00
ef87651b3a
Fixed Bug 55254 - Client.Files. Fixed the change of the cursor to the "palm"
2022-02-10 11:25:00 +03:00
c9042a4417
Merge branch 'hotfix/v1.1.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.1.1
2022-02-10 11:11:24 +03:00
caa4db9790
add new lines (Files-Home)
2022-02-10 11:10:35 +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
5c9336d50b
Bugfix/update OneClickInstall ( #505 )
...
* Add document server image configuration
* Modify docker document server run config (#476 )
* Changing the files installation
* Add an update to Docker-1click
* Minor changes
* Fix mysql installation
* Change the kafka installation
* Update kafka version
* Download sql scripts
2022-02-10 10:37:09 +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
d2e4ecff45
Merge branch 'hotfix/v1.1.1' of https://github.com/ONLYOFFICE/AppServer into hotfix/v1.1.1
2022-02-09 17:57:08 +03:00
6510927b20
backup: add api method enableAutoBackup
2022-02-09 17:39:02 +03:00
8220d23a10
Files: fixed response
2022-02-09 17:34:09 +03:00
f8a748aae3
Web: files: Code simplification.
2022-02-09 17:25:40 +03:00
b81b34fc99
Web: Files: FilesStore: Fixed folder check for selector
2022-02-09 16:47:57 +03:00
804c9c9547
Web: Locales: EN: Added translation for menu categories
2022-02-09 16:46:28 +03:00
5e47e0c184
Web: Files: HOC: Added model for context menu. Added multilevel menu for desktop view.
2022-02-09 16:45:09 +03:00
e66cb3d716
Fixed Bug 55412 - Client.Files. ‘Uncaught (in promise) TypeError: Cannot read properties of undefined (reading 'slice')’ when converting a file.
2022-02-09 16:25:26 +03:00
be6602b22a
Fixed Bug 55242 - Mobile.Tablet.Client.Files. ‘Something went wrong’ when switching thumbnail view to normal view. Fixed table re-render
2022-02-09 15:46:38 +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
