Commit Graph

11246 Commits

Author SHA1 Message Date
2be4b96ab4 Files: fix SetAceObjectAsync for current user 2023-07-17 14:29:05 +03:00
9b1e13309b Files: fixed leave room 2023-07-17 13:06:36 +03:00
8b82a9f2de Files: fixed cahnge owner method 2023-07-14 18:46:51 +03:00
3f27bb6ce5 Merge branch 'develop' into feature/public-room-backend 2023-07-12 14:37:37 +03:00
c45ae8d990 Files: FileShareDto: added expired property, disable expired link 2023-07-12 14:23:45 +03:00
d749508640 Files: ExternalShare: refactoring 2023-07-12 14:20:22 +03:00
66dcbb3e57 Files: ExternalLink: fixed expiration date converting 2023-07-12 14:19:58 +03:00
040377198f People: filter by employeeTypes 2023-07-12 13:10:47 +03:00
66042b88d4 Files: added docservice settings 2023-07-07 12:21:13 +03:00
7d1d1308e1 fix CompileQuery 2023-07-06 18:46:35 +03:00
59b9980fd1 Merge remote-tracking branch 'remotes/origin/develop' into feature/reassign-fixes
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
2023-07-05 16:09:00 +03:00
70055ba933
Merge pull request #1456 from ONLYOFFICE/feature/optimization-queries
Feature/optimization queries
2023-07-03 03:05:59 -07:00
9ceda80d78 Revert "refactoring"
This reverts commit d4e830a547.
2023-07-02 22:48:39 +03:00
d4e830a547 refactoring 2023-07-02 22:34:48 +03:00
df2b14a1da removed unused methods 2023-07-02 22:00:42 +03:00
4e95a973e0 fixed query 2023-06-30 17:44:48 +03:00
bed46a861b fixed query 2023-06-30 13:01:20 +03:00
a133048c07 ASC.People: Registering services for data data reassign task (FileStorageService) 2023-06-29 16:12:44 +03:00
3254c28429 fix 2023-06-29 14:33:45 +03:00
5f456f3ab6 fixed query 2023-06-29 14:23:48 +03:00
1e71f9f46b fix query 2023-06-29 13:33:15 +03:00
610345a595 fixed query 2023-06-29 13:31:47 +03:00
295c1948e2 fixed query 2023-06-29 13:24:41 +03:00
c8f453a5e9 fremoved unused method 2023-06-29 12:07:56 +03:00
c21ea30882 ASC.Files: ReassignStorageAsync refactoring (deletion of personal data, optimization of data reassignment) 2023-06-29 11:53:18 +03:00
0e91c423cf fix 2023-06-29 11:17:13 +03:00
95f86ddd1c fix query 2023-06-28 20:36:51 +03:00
00a88c9486 ASC.Files: ReassignItemsAsync refactoring 2023-06-28 16:12:23 +03:00
4bb1475ce9 fix query 2023-06-28 13:27:32 +03:00
bfb9a096e6 Merge branch 'develop' into feature/optimization-queries
# Conflicts:
#	common/ASC.Core.Common/Billing/License/LicenseReader.cs
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/Data/DbAzService.cs
#	common/ASC.Core.Common/Data/DbQuotaService.cs
#	common/ASC.Core.Common/Data/DbSubscriptionService.cs
#	common/ASC.Core.Common/Data/DbTenantService.cs
#	common/ASC.Core.Common/Data/DbUserService.cs
#	common/ASC.Data.Backup.Core/Core/DbHelper.cs
#	common/ASC.Feed/Data/FeedAggregateDataProvider.cs
#	common/ASC.Feed/Data/FeedReadedDataProvider.cs
#	common/ASC.IPSecurity/Data/IPRestrictionsRepository.cs
#	common/ASC.Webhooks.Core/DbWorker.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
2023-06-27 18:29:23 +03:00
26891975d8 Merge branch 'develop' into feature/move-to-selector 2023-06-27 13:30:52 +03:00
350626d795 Files: FilterTypeEnum: removed unnecessary 2023-06-27 12:59:18 +03:00
36463541d7 Files: added apply filter option 2023-06-27 12:54:22 +03:00
09bc9909d4
Merge pull request #1475 from ONLYOFFICE/feature/thumbnails-new-formats
Feature/thumbnails new formats
2023-06-27 02:45:21 -07:00
0bd332d2a9 fix migrations 2023-06-27 12:18:04 +03:00
0b9e19d95f Files: added FoldersDocuments/FoldersImages filters 2023-06-26 11:06:34 +03:00
ebe5553ec4 Thumbnails: new formats added according to conversion matrix https://api.onlyoffice.com/editors/conversionapi#text-matrix 2023-06-21 12:07:23 +03:00
949918202d Files: FileHandler: fixed media files downloading 2023-06-13 16:08:41 +03:00
1905566b90 refactoring 2023-06-09 14:28:49 +03:00
986561d4e9 Merge branch 'develop' into feature/delete-portal
# Conflicts:
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/Caching/CachedQuotaService.cs
#	common/ASC.Core.Common/Caching/CachedTenantService.cs
#	common/ASC.Core.Common/Context/Impl/TenantManager.cs
#	common/ASC.Core.Common/Core/ITenantService.cs
#	common/ASC.Core.Common/Data/DbAzService.cs
#	common/ASC.Core.Common/Data/DbQuotaService.cs
#	common/ASC.Core.Common/Data/DbSubscriptionService.cs
#	common/ASC.Core.Common/Data/DbTenantService.cs
#	common/ASC.Core.Common/Data/DbUserService.cs
#	common/ASC.Core.Common/HostedSolution.cs
#	common/ASC.Data.Backup.Core/Core/DbHelper.cs
#	common/ASC.Data.Storage/TenantQuotaController.cs
#	common/ASC.Feed/Data/FeedAggregateDataProvider.cs
#	common/ASC.Feed/Data/FeedReadedDataProvider.cs
#	common/ASC.IPSecurity/Data/IPRestrictionsRepository.cs
#	common/services/ASC.ApiSystem/Controllers/PeopleController.cs
#	migrations/mysql/FilesDbContext/FilesDbContextModelSnapshot.cs
#	migrations/postgre/FilesDbContext/FilesDbContextModelSnapshot.cs
#	products/ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
#	products/ASC.People/Server/Api/ThirdpartyController.cs
#	web/ASC.Web.Api/Api/AuthenticationController.cs
#	web/ASC.Web.Api/Api/ConnectionsController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/Settings/LicenseController.cs
#	web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
#	web/ASC.Web.Core/Sms/SmsManager.cs
#	web/ASC.Web.Core/Tfa/TfaManager.cs
2023-06-08 15:53:31 +03:00
f681105793 Files: ExternalLink: removed min links count rule, added max links count rule 2023-06-07 11:19:51 +03:00
14483efd34 Files: Rooms: fixed default access for public room invite link 2023-06-05 17:19:22 +03:00
1ea2778562 Files: ExternalShare: fixed link 2023-06-02 18:38:46 +03:00
80deac02c5 Merge branch 'develop' into feature/public-room-backend 2023-06-02 16:42:16 +03:00
f5620a3666 Merge branch 'develop' into feature/optimization-queries 2023-06-01 23:52:40 +03:00
f451bc51be Files: refactoring 2023-06-01 18:14:40 +03:00
2fe9912b06 Files: ExternalShare: added getting key from header 2023-06-01 18:14:28 +03:00
9b456a71ae fix 2023-06-01 15:59:17 +03:00
75ebc4ce65 fix await using 2023-06-01 14:27:27 +03:00
1dce9ba876 refactoring 2023-06-01 13:54:19 +03:00