Commit Graph

16923 Commits

Author SHA1 Message Date
d139c407d9 BackapCore: remove empty lines 2022-02-16 13:14:00 +03:00
43892a29c6 Merge branch 'feature/backend-refactor' into feature/asc-storage-refactor
# Conflicts:
#	common/ASC.Data.Storage/BaseStorage.cs
#	common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSession.cs
#	common/ASC.Data.Storage/Configuration/StorageSettings.cs
#	common/ASC.Data.Storage/Constants.cs
#	common/ASC.Data.Storage/CrossModuleTransferUtility.cs
#	common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
#	common/ASC.Data.Storage/Encryption/EncryptionOperation.cs
#	common/ASC.Data.Storage/Encryption/EncryptionServiceClient.cs
#	common/ASC.Data.Storage/Encryption/EncryptionWorker.cs
#	common/ASC.Data.Storage/Extensions.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	common/ASC.Data.Storage/Migration/MigrateServiceClient.cs
#	common/ASC.Data.Storage/PathUtils.cs
#	common/ASC.Data.Storage/ProgressStream.cs
#	common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.Data.Storage/StaticUploader.cs
#	common/ASC.Data.Storage/StorageFactory.cs
#	common/ASC.Data.Storage/StorageHandler.cs
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/ASC.Data.Storage/TenantPath.cs
#	common/ASC.Data.Storage/TenantQuotaController.cs
#	common/ASC.Data.Storage/WebPath.cs
#	common/ASC.Data.Storage/Wildcard.cs
2022-02-16 12:47:11 +03:00
288377db17 Core: remove Find 2022-02-16 12:13:30 +03:00
5322ed2cec Fixed Bug 55530 - Client.Files. Fixed the display of the file name when renaming. 2022-02-16 12:03:22 +03:00
fbd01bc585 MessaginSystem: IServiceProvider replaced by IServiceScopeFactory 2022-02-16 11:49:19 +03:00
26fdc40f84 Files: used file-scoped namespaces 2022-02-16 11:46:31 +03:00
7a610d5ad2 MessagingSystem: private properties replaced by private fields, add braces 2022-02-16 11:34:26 +03:00
7ff7a449f7 Merge branch 'feature/backend-refactor' into feature/asc-reassigns-refactor
# Conflicts:
#	common/ASC.Data.Reassigns/QueueWorker.cs
2022-02-16 11:18:57 +03:00
a76ad4c2a1 Merge branch 'feature/backend-refactor' into feature/asc-backup-core-refactor
# Conflicts:
#	common/ASC.Data.Backup.Core/ActionInvoker.cs
#	common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
#	common/ASC.Data.Backup.Core/Core/DbBackupProvider.cs
#	common/ASC.Data.Backup.Core/Core/DbHelper.cs
#	common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
#	common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
#	common/ASC.Data.Backup.Core/Core/ZipOperator.cs
#	common/ASC.Data.Backup.Core/Exceptions/ThrowHelper.cs
#	common/ASC.Data.Backup.Core/Extensions/EnumerableExtensions.cs
#	common/ASC.Data.Backup.Core/Service/BackupWorker.cs
#	common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
#	common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/ColumnMapper.cs
#	common/ASC.Data.Backup.Core/Tasks/Data/DataRowInfo.cs
#	common/ASC.Data.Backup.Core/Tasks/Data/TableInfo.cs
#	common/ASC.Data.Backup.Core/Tasks/DeletePortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/KeyHelper.cs
#	common/ASC.Data.Backup.Core/Tasks/Modules/MailModuleSpecifics.cs
#	common/ASC.Data.Backup.Core/Tasks/Modules/ModuleProvider.cs
#	common/ASC.Data.Backup.Core/Tasks/Modules/ModuleSpecificsBase.cs
#	common/ASC.Data.Backup.Core/Tasks/Modules/ProjectsModuleSpecifics.cs
#	common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
#	common/ASC.Data.Backup.Core/Tasks/RestoreDbModuleTask.cs
#	common/ASC.Data.Backup.Core/Tasks/RestorePortalTask.cs
#	common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
2022-02-15 19:56:43 +03:00
697dd5dd39 fix 53348 2022-02-15 19:30:27 +03:00
73933162d5 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-15 19:16:20 +03:00
c1541d7901 Fixed Bug 55248 - Mobile.Client.Profile. Fixed closing the profile save window on the avatar editor page 2022-02-15 19:16:14 +03:00
b9234fedb1 IpSecurity: fix 2022-02-15 18:57:45 +03:00
2f197c6313 Merge branch 'feature/backend-refactor' into feature/asc-ipsecurity-refactor 2022-02-15 18:53:38 +03:00
5e12bf583c Fix Bug 54825 - Client.Clouds.‘Uncaught (in promise) undefined’ 2022-02-15 18:39:14 +03:00
794f021914 FeedAggregator: IServiceProvider replaced by IServiceScopeFactory 2022-02-15 18:34:01 +03:00
76c422d3c0 FilesService: fixed starting service 2022-02-15 18:25:25 +03:00
4ac03079ca Merge branch 'feature/backend-refactor' into feature/asc-feed-aggreagator-refactor 2022-02-15 18:21:53 +03:00
cb972e5498 ClearEvents: changed context 2022-02-15 18:11:08 +03:00
2b81fabd9c ClearEvents: removе unnecessary using 2022-02-15 18:10:54 +03:00
a98a397e79 ClearEvents: changed context 2022-02-15 18:10:31 +03:00
226a38ad87 Core: added DbSet's to MessagesContext 2022-02-15 18:10:12 +03:00
65a9c19e7e ClearEvents: removed unnecessary context 2022-02-15 18:09:10 +03:00
84c44ea762 Core: removed unused property that caused the service to crash 2022-02-15 18:08:04 +03:00
a67773bf6d
Merge pull request #535 from ONLYOFFICE/feature/refactoring-files-formats
Web: Files: removed FormatsStore, added getting file formats from Set…
2022-02-15 18:04:47 +03:00
7f4d29da03 Web: Editor: fixed canConvert 2022-02-15 16:57:32 +03:00
5b57afe3ca Core: fix 2022-02-15 16:49:12 +03:00
ead3820e66 Merge branch 'feature/refactoring-files-formats' of github.com:ONLYOFFICE/AppServer into feature/refactoring-files-formats 2022-02-15 16:33:00 +03:00
51a9e48a1b Web: Files: fixed encryptionUploadDialog 2022-02-15 16:32:21 +03:00
1aa99f3802 Web: Files: removed TODO 2022-02-15 16:31:57 +03:00
Vashchuk Nikita
b17119b711 refactoring async methods 2022-02-15 16:20:06 +03:00
b04b6d897d Merge branch 'hotfix/v1.1.1' into feature/refactoring-files-formats 2022-02-15 16:13:52 +03:00
7acd63421c Core: 'Where' replaced by 'Find' 2022-02-15 16:06:22 +03:00
ccc0838269 Web: Files: removed FormatsStore, added getting file formats from SettingsStore 2022-02-15 15:58:31 +03:00
fd64f84b1b Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-15 15:57:40 +03:00
fb5edcf627 Fixed Bug 51725 - Client.Clouds.Changed title of third party folder. 2022-02-15 15:57:11 +03:00
fe8d377e87 Core: fix 2022-02-15 15:31:28 +03:00
aa8e6aef3b Core: intertnal properties replaced by fields 2022-02-15 15:30:54 +03:00
809359c85b Core: used file-scoped namespaces 2022-02-15 14:52:43 +03:00
264b3a8764 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-15 14:10:44 +03:00
ce048a9646 Web: Components: fix avatar resize 2022-02-15 14:10:28 +03:00
2f5feb4041 Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-15 14:03:41 +03:00
c710545bdd Fixed Bug 55331 - Added default cursor for modal dialog. 2022-02-15 14:02:52 +03:00
5cfd763fb1 Core: fix mapping 2022-02-15 14:01:23 +03:00
ca7140186d Core: resolve properties for mapping, add mapping/projection 2022-02-15 13:30:05 +03:00
d64fe81e5e Merge branch 'hotfix/v1.1.1' of github.com:ONLYOFFICE/AppServer into hotfix/v1.1.1 2022-02-15 13:29:36 +03:00
af51658493 Web: Campaigns: init example 2022-02-15 13:09:44 +03:00
2ba6962e8c Fix Bug 55527 - Client.Files. Badge ‘New’ on Save as/Create a copy/Upload. 2022-02-15 13:01:37 +03:00
Vashchuk Nikita
41d994ca32 fix 2022-02-15 12:42:47 +03:00
b9f6ec6615 Web: Components: fix banner loader 2022-02-15 11:58:12 +03:00