Commit Graph

10801 Commits

Author SHA1 Message Date
f738a8b830 Merge branch 'develop' into feature/entries-trash-origin 2023-02-15 17:29:23 +03:00
2a12f4ca0a Files: added 30 days gap 2023-02-15 13:27:01 +03:00
8767b227e4 Files: fixed crash, refactor 2023-02-15 13:11:11 +03:00
b50cb78bf6 fix Bug 61155 2023-02-14 15:08:31 +03:00
66806facb4 thumbnails: added cache key to url. added crop image after resize. replace _ => hash key 2023-02-14 10:57:21 +03:00
9992f3ca5e files.service: thumbnail refactoring 2023-02-10 17:13:01 +03:00
0476363100 Merge branch 'develop' into feature/entries-trash-origin 2023-02-10 12:45:26 +03:00
8504155fe2 Files: optimization 2023-02-10 11:44:35 +03:00
a86d256ef1 Files: added precompiled query 2023-02-10 11:40:31 +03:00
9d79ba87d2 Files: fix 2023-02-10 11:38:07 +03:00
aefe06b98c Files: changed origin getting logic, removed unnecessary 2023-02-09 19:11:36 +03:00
40a25e7cc2 Files: fixed performance drop 2023-02-09 19:06:58 +03:00
e5e3925b00 Files: removed unnecessary 2023-02-09 19:05:57 +03:00
01125f54a8 Merge branch 'master' into feature/entries-trash-origin 2023-02-08 15:27:14 +03:00
f750a58988 Files: enabled auto cleaning trash by default 2023-02-08 15:01:05 +03:00
e48298195d Files: added auto deletion time 2023-02-08 14:03:19 +03:00
5a71927498 Files: refactor 2023-02-08 14:02:47 +03:00
91d1b4e422 Files: added sorting by origin room 2023-02-08 13:19:16 +03:00
b63bfc4de5 Files: added filter by origin room 2023-02-07 19:18:32 +03:00
084a2aeef1 Files: refactor 2023-02-07 16:50:21 +03:00
83c638b98a Files: added origin for folders 2023-02-07 16:21:31 +03:00
fd228caf8a Files: refactor 2023-02-07 16:12:46 +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
c3111eb8ae Files: fixed query 2023-02-07 13:51:18 +03:00
604bc27e88 files: added logs 2023-02-07 00:35:13 +03:00
1d6192d067 Files: added origin in trash for files 2023-02-06 18:35:07 +03:00
dbb81e3752 Files: added base mapping action 2023-02-06 18:24:50 +03:00
e7f7c81784 Files: added Origin tag 2023-02-06 18:18:49 +03:00
36b3192158 Files: added new method to remove tag links 2023-02-06 18:17:57 +03:00
17a625252b Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-02-05 12:59:31 +03:00
a82b390206 filessevice: added debug logs 2023-02-03 21:46:56 +03:00
480962405a files.service: fixed 2023-02-03 10:06:10 +03:00
406bbd81cc thumbnail: refactoring. replace concurrentdictionary to channel 2023-02-02 22:33:18 +03:00
1c6ff4c41b Files: added new error messages 2023-02-02 13:28:51 +03:00
1af4092bdc Files: fixed audit for room tags, refactor 2023-02-02 13:27:57 +03:00
943d0ab8ba Files: refactor 2023-02-02 13:24:47 +03:00
987d161ce9 Files: fixed room logo audit, refactor 2023-02-02 13:24:29 +03:00
8adde07aea fixed creation file 2023-02-02 13:20:31 +03:00
cb3c12b072 Files: changed message action 2023-02-02 11:32:00 +03:00
7bd27a7e20 fixed Bug 60148 2023-02-01 20:52:34 +03:00
66c1a2b3f6 Files: changed default link access 2023-02-01 18:23:35 +03:00
4fbe654ed5 People: fixed user type change 2023-01-31 12:52:51 +03:00
08d8f13af3 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-01-29 23:44:35 +03:00
ce8d3b3471 Files: optimized getting thirdparty rooms 2023-01-29 23:43:52 +03:00
e780a10311 Socket: delete folder 2023-01-27 17:42:21 +03:00
b85f012310 fix Bug 60861 2023-01-27 13:04:47 +03:00
32914b6413 Merge branch 'develop' into feature/chunk-backup 2023-01-26 21:28:53 +03:00
e2e73d7ced Files: autocleanup 2023-01-26 20:44:53 +03:00
cd137d9b4c Bug 60846 2023-01-26 12:42:21 +03:00
67768b680f Files: fixed thirdparty 2023-01-25 22:40:48 +03:00