40e7935d68
Merge pull request #1326 from ONLYOFFICE/feature/quota-via-websocket
...
Feature/quota via websocket
2023-04-07 21:51:32 +04:00
8d9b4404cf
fix Bug 61978
2023-04-07 16:53:30 +03:00
e35e8f1369
Merge branch 'release/v1.0.0' into feature/quota-via-websocket
2023-04-05 11:20:45 +04:00
NikitaVashchuk
1827dead7e
fix problems with notify about count paid users
2023-04-04 17:23:46 +05:00
Vashchuk Nikita
0db7c335bf
socket notification when archiving a room,
...
changed file_size id to total_size when added/deleted files,
fix notification when adding paid users,
fix notification when block/unblock users,
fix problem with change-quota-feature-value notification when updating quota
2023-04-03 16:31:14 +05:00
Vashchuk Nikita
604b67fa58
functionality for notification ASC.Socket.IO about quota changes
2023-03-30 19:13:13 +05:00
08d4050143
fix backup s3: split stream
2023-03-29 12:19:35 +03:00
a2c35b0a40
backend: ldap/s3: removed check mono
2023-03-17 18:02:19 +03:00
f053663499
fixed DeleteExpiredService
2023-03-10 22:32:30 +03:00
a835719980
bugfix 60194
...
first hash then download when backup in s3
2023-03-02 10:47:22 +03:00
ed66ee8b08
bugfix 60194
2023-03-01 13:25:46 +03:00
c77e960d70
add transform dictionary
2023-02-28 14:54:16 +03:00
03a4dc89dc
Settings: refactoring
2023-02-24 17:19:10 +03:00
a9960f0545
Merge pull request #1170 from ONLYOFFICE/bugfix/chunk-size
...
fix chunk size
2023-02-22 15:30:57 +03:00
c89b8ca427
Merge branch 'master' into develop
...
# Conflicts:
# common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
# common/ASC.Data.Backup.Core/Storage/BackupStorageFactory.cs
# common/ASC.Data.Backup.Core/Storage/DataStoreBackupStorage.cs
# common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
# common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
# common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
# products/ASC.Files/Core/ASC.Files.Core.csproj
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
2023-02-07 14:31:22 +03:00
85b20c6f72
fix chunk size when copy file in s3
2023-02-06 14:06:09 +03:00
06c9d6d7b7
StorageHandler: removed demand authorization for request with auth querystring
2023-02-01 20:50:41 +03:00
8a8143950d
replace CreateScope() => CreateScopeAsync()
2023-01-24 20:33:27 +03:00
1857e7b62f
StorageHandler: added DisableBuffering
2023-01-20 21:32:27 +03:00
f65019a8e3
fixed download bytes range from StorageHandler
2023-01-20 21:04:13 +03:00
4ddf7d521c
update external dependency
2023-01-19 19:05:07 +03:00
8ad635ba25
merge from release/rc-v1.2.0. fixed problem and update dll
2023-01-19 15:47:09 +03:00
44804e34db
fixed cache room logo/user photo
2022-12-29 11:31:22 +03:00
9f198ef31d
fixed user avatar/room logo cache
2022-12-27 18:20:05 +03:00
f687c16a6b
fixed StorageHandler class
2022-12-22 18:48:30 +03:00
e47d45c7fd
Merge branch 'release/rc-v1.2.0' into feature/cache-fix
2022-12-22 16:17:06 +03:00
fb7d17dfce
fix
2022-12-15 11:24:39 +03:00
02c9adc57b
chunk backup
2022-12-14 15:55:41 +03:00
426a11d080
Merge branch 'develop' into release/rc-v1.2.0
2022-12-12 19:33:41 +03:00
Vashchuk Nikita
38857366e1
Bug 59715 - Studio: Users. Аватарки пользователей не кешируются браузером
2022-12-12 14:09:29 +05:00
ffde2bf1c2
s3: fixed presigned url
2022-12-09 23:46:08 +03:00
143a4d01ec
removed unused variables
2022-12-09 17:47:46 +03:00
6e45bc5aa8
removed unused variables
2022-12-09 16:34:00 +03:00
b693486b46
merge from develop
2022-12-01 14:52:46 +03:00
5e253bb9c8
set region when start app
2022-11-30 19:03:44 +03:00
b9f45035b9
Merge branch 'release/rc-v1.2.0' into feature/migration_personal
...
# Conflicts:
# common/ASC.Data.Backup.Core/Contracts/IBackupService.cs
# common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
# common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
2022-11-29 13:07:12 +03:00
ee04a7a55c
removed unused dependencies
2022-11-24 14:40:13 +03:00
61b401d906
fix
2022-11-15 13:28:25 +03:00
9dfcd25033
backend: update dependency dll
2022-11-14 14:11:10 +03:00
aa0222f078
Merge branch 'develop' into feature/migration_personal
2022-11-11 15:05:26 +03:00
a4fd81b404
migrate from .net6 to .net7
2022-11-10 13:10:18 +03:00
789ab8f956
Merge branch 'develop' into feature/refactoring-saveUserInfo
...
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# products/ASC.Files/Core/GlobalUsings.cs
# products/ASC.Files/Service/Core/FilesModule.cs
# products/ASC.Files/Service/Core/FoldersModule.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Core/QuotaSync.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
2022-11-09 12:57:16 +03:00
ca85ef1d49
fix usings
2022-11-07 12:34:50 +03:00
14a64f4ad0
Merge branch 'develop' into feature/remove-waste
...
# Conflicts:
# common/services/ASC.ApiSystem/GlobalUsings.cs
# common/services/ASC.ApiSystem/Program.cs
# common/services/ASC.ApiSystem/Startup.cs
# products/ASC.CRM/Server/Classes/Global.cs
# products/ASC.Files/Server/ProductEntryPoint.cs
# web/ASC.Web.Core/QuotaSync.cs
2022-11-07 11:25:54 +03:00
34bda20eb0
Merge branch 'develop' into feature/recalculate-user-quota
...
# Conflicts:
# products/ASC.People/Server/Api/UserController.cs
2022-11-02 13:40:53 +03:00
141bed97b4
Merge branch 'develop' into feature/refactoring-saveUserInfo
2022-11-02 11:16:29 +03:00
624391ab26
Merge branch 'develop' into feature/migration_personal
...
# Conflicts:
# common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
# common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
# common/ASC.Data.Backup.Core/Storage/DataStoreBackupStorage.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.Backup.Core/Tasks/PortalTaskBase.cs
# common/ASC.Data.Backup.Core/Tasks/RestorePortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
# common/ASC.Data.Storage/Encryption/EncryptionOperation.cs
# common/ASC.Data.Storage/StorageFactory.cs
# common/ASC.Data.Storage/StorageUploader.cs
2022-10-31 21:15:23 +03:00
81b298cf72
fix
2022-10-31 13:03:02 +03:00
0baa36c1c0
GetDataStore tenant string to int
2022-10-28 15:23:51 +03:00
a414d68182
Merge branch 'develop' into feature/migration_personal
...
# Conflicts:
# common/ASC.Data.Backup.Core/Service/BackupWorker.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
# common/ASC.Data.Backup.Core/Tasks/Modules/CrmModuleSpecifics.cs
# common/ASC.Data.Storage/StorageFactory.cs
2022-10-28 12:16:36 +03:00