90fae33cb6
Csp: cdn for images
2023-08-25 16:35:41 +03:00
d2e23e3ed4
Merge remote-tracking branch 'remotes/origin/master' into feature/api-descriptions
...
# Conflicts:
# common/ASC.Core.Common/Tenants/TenantQuota.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
# products/ASC.Files/Server/Api/FoldersController.cs
# products/ASC.Files/Server/Api/OperationController.cs
# products/ASC.Files/Server/Api/SettingsController.cs
# web/ASC.Web.Api/Api/AuthenticationController.cs
# web/ASC.Web.Api/Api/CapabilitiesController.cs
# web/ASC.Web.Api/Api/PortalController.cs
# web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs
# web/ASC.Web.Api/Api/SmtpSettingsController.cs
# web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs
2023-08-01 11:39:57 +03:00
fcd56a9764
fix Bug 63301
2023-07-13 21:58:11 +03:00
680d75b213
s3: added support presigned cdn url for Media/Image viewer
2023-06-10 09:33:59 +03:00
6a4ebb9854
Files: exclude thumbnails from quota
2023-06-02 17:08:15 +03:00
1da3a38513
Revert "Revert "backend: removed X-REWRITER-URL header""
...
This reverts commit 39c1824162
.
2023-05-10 13:07:24 +03:00
39c1824162
Revert "backend: removed X-REWRITER-URL header"
...
This reverts commit 93ec325611
.
2023-04-27 22:35:00 +03:00
aa708c8877
added more descriptions and data types
2023-04-25 19:23:54 +03:00
93ec325611
backend: removed X-REWRITER-URL header
2023-04-24 16:23:42 +03:00
4af951856f
Merge remote-tracking branch 'remotes/origin/release/v1.0.0' into feature/api-descriptions
...
# Conflicts:
# products/ASC.People/Server/Api/PhotoController.cs
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/ApiModels/RequestDto/LinkAccountRequestDto.cs
# web/ASC.Web.Api/Api/AuthenticationController.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
2023-04-18 18:08:59 +05:00
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
aa1b712131
Merge remote-tracking branch 'remotes/origin/release/v1.0.0' into feature/api-descriptions
...
# Conflicts:
# products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
# products/ASC.Files/Server/Api/FoldersController.cs
# products/ASC.Files/Server/Api/SettingsController.cs
# products/ASC.Files/Server/Api/VirtualRoomsController.cs
# web/ASC.Web.Api/Api/AuthenticationController.cs
# web/ASC.Web.Api/Api/PortalController.cs
# web/ASC.Web.Api/Api/SecurityController.cs
# web/ASC.Web.Api/Api/Settings/MessageSettingsController.cs
# web/ASC.Web.Api/Api/Settings/WebhooksController.cs
# web/ASC.Web.Api/Api/Settings/WhitelabelController.cs
2023-03-29 19:28:15 +05:00
fe91eae377
Fix documentation warnings
2023-03-29 19:25:20 +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