Commit Graph

10778 Commits

Author SHA1 Message Date
3269d48e15 added new table 2023-02-21 14:22:34 +03:00
25859e5d4e refactoring 2023-02-17 15:56:40 +03:00
6d363d4abd Webhooks: settings 2023-02-08 14:46:33 +03:00
e58175f69e WebHooks: added resources, new methods and settings for disable webhook 2023-02-08 14:17:06 +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
604bc27e88 files: added logs 2023-02-07 00:35:13 +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
ed18a66a3f Converter: fix 2023-01-25 18:52:26 +03:00
d4cb3327b7 SocketIO: updateFolder, deleteFolder 2023-01-25 14:50:46 +03:00
80f9a69322 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-01-25 13:07:47 +03:00
75f5832407 Files: fixed creating thirdparty room 2023-01-25 13:06:59 +03:00
8a8143950d replace CreateScope() => CreateScopeAsync() 2023-01-24 20:33:27 +03:00
bc2b94b64e Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-01-24 19:23:43 +03:00
fb44d72af1 updateToVersion: refactoring 2023-01-24 19:23:39 +03:00
7af94acd8b Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-01-24 17:37:01 +03:00
6681cc86e5 Bug 60714 2023-01-24 17:36:52 +03:00
2adc84efe1 Bug 60497 2023-01-24 13:32:17 +03:00
4a8721d894 fix Bug 60627 2023-01-23 13:25:23 +03:00
10c4dec28f Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-01-23 12:49:19 +03:00
08fb297064 People: fixed adding user as activated 2023-01-23 12:49:04 +03:00
f65019a8e3 fixed download bytes range from StorageHandler 2023-01-20 21:04:13 +03:00
ea2ef90d5c fix Bug 60595 2023-01-20 19:39:57 +03:00
7f2101af12 Files: fixed form linking in my documents 2023-01-20 11:11:44 +03:00
667b10e874
Merge pull request #1149 from ONLYOFFICE/feature/dotnet7
Feature/dotnet7
2023-01-19 22:00:57 +03:00
4ddf7d521c update external dependency 2023-01-19 19:05:07 +03:00
9937ecccee fix 2023-01-19 18:32:37 +03:00
26834b6211 fix Bug 60466 2023-01-19 17:26:33 +03:00
8ad635ba25 merge from release/rc-v1.2.0. fixed problem and update dll 2023-01-19 15:47:09 +03:00
2b42383e89 Files: fixed rights for form 2023-01-19 15:00:31 +03:00
6e6ae80fda Files: fixed security check 2023-01-19 14:58:14 +03:00