Commit Graph

8446 Commits

Author SHA1 Message Date
3401abb21a Merge branch 'develop' into feature/colloborator 2023-02-21 17:11:39 +03:00
071456c9f3 Files: refactor, fixed for docspace admin 2023-02-21 17:09:28 +03:00
be2bd8d1ac Files: fixed rights for docspace admin 2023-02-21 17:08:26 +03:00
6d3cda4b7f Files: refactor 2023-02-21 16:53:35 +03:00
fafc8b567d Files: added collaborator role 2023-02-21 16:34:06 +03:00
306f08b123 Files: added collaborator role, added rights rules, refactor 2023-02-21 16:33:41 +03:00
24178d9a13 Files: changed error message 2023-02-21 16:23:50 +03:00
007733dfeb Files: removed unnecessary 2023-02-21 16:23:28 +03:00
cb398c0a51 Files: changed error message 2023-02-21 16:20:44 +03:00
1c3d3bf132 Merge branch 'develop' into feature/fix-webhooks-second
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
2023-02-21 14:33:26 +03:00
3269d48e15 added new table 2023-02-21 14:22:34 +03:00
Vashchuk Nikita
d84d7aa430 fix notification filtration 2023-02-21 14:21:30 +05:00
Vashchuk Nikita
cc77f6d2f4 added mute security attribute 2023-02-21 14:20:29 +05:00
Vashchuk Nikita
9e0a5e91cb fix letter format, mute attribute, tags counter 2023-02-21 14:19:26 +05:00
Vashchuk Nikita
efa04ae8ba added functionality for notifying users about events via AuditEvent,
fix notifyEngine,
edited letter format,
added method for getting roomsId and roomsTitle from a file/folder inside the room,
added method for getting sharing info from foldersIds and userGuid
2023-02-21 13:35:01 +05:00
5e9f12a797 backend: refactoring 2023-02-20 23:10:49 +03:00
bcc0866830 Files: ban on creating rooms fro collaborator 2023-02-20 12:12:29 +03:00
c32ab68e63 Files: refactor 2023-02-20 11:16:37 +03:00
047df24bf4 fix Bug 60994 2023-02-20 09:47:40 +03:00
25859e5d4e refactoring 2023-02-17 15:56:40 +03:00
10c637e822 Root folders renamed 2023-02-16 19:36:47 +03:00
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
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
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
ca2906ebee Merge branch 'develop' into feature/notifications
# Conflicts:
#	packages/client/src/store/FilesStore.js
2023-02-08 12:44:15 +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
Vashchuk Nikita
b928966550 added settings for configure RoomsNotification, added mute field for files and folders 2023-02-06 16:15:51 +05: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
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
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
9e4c0f93e6 add token and filetype in fileReference 2023-01-19 14:24:24 +03:00
22a5fc81a4 fix Bug 60623 - Rooms.Archived. 2023-01-19 11:44:54 +03:00
cf4d6b3138 fixed file converter 2023-01-18 20:11:13 +03:00
8ba37860c8 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-01-18 18:53:23 +03:00
bff2128b5f Resources renamed 2023-01-18 18:53:09 +03:00
0d46e034e7 Files.Service: added users module for feed aggregator 2023-01-18 18:36:06 +03:00
4caf51e3d5 Files: fixed for MyRooms folder, changed for implicit members 2023-01-17 19:15:22 +03:00
f18a8735e6 Files: fixed new tag for room owner 2023-01-17 19:03:08 +03:00
e5fbbdb38c feed: refactoring 2023-01-14 22:32:51 +03:00
48d525970d fixed file converter 2023-01-14 17:58:19 +03:00
d1a109648d Bug 60562 2023-01-13 17:15:51 +03:00
ee19865cf0 fix 60180 2023-01-13 16:27:21 +03:00
c1da97ee69 Bug 60351 2023-01-13 15:26:03 +03:00
1bc8f3ab1f Files: optimized receipt tenants for feed 2023-01-13 14:01:31 +03:00
b7b7222040 Files: timeout for CommandRequestAsync to documentserver 2023-01-12 13:37:17 +03:00
49799127da Files: fixed files counter for trash folder 2023-01-12 13:07:30 +03:00
6e5d43f84c fix Bug 60259 2023-01-12 10:58:10 +03:00
9e3763739d Bug 60435 2023-01-11 17:25:37 +03:00
aa893910d6 add semaphore when createIfNotExists folder 2023-01-10 17:43:12 +03:00
c215f6ff15 Files: fixed tag new 2022-12-30 15:15:16 +03:00
3dfb0ce753 Bug 60379 2022-12-30 13:18:04 +03:00
03c8891827 Bug 60406 2022-12-29 17:53:34 +03:00
9d258d5801 Bug 60379 2022-12-29 14:29:07 +03:00
97629e80e5 Bug 60168 2022-12-29 14:20:25 +03:00
ad4ae24191 fix migration
add skip tables
add default value for files_folder.private
2022-12-29 11:36:40 +03:00
44804e34db fixed cache room logo/user photo 2022-12-29 11:31:22 +03:00
13cd6508f6 Bug 60182, 60201, 60351, 60343 2022-12-28 18:20:05 +03:00
79934ae1db Files: changed rights to unlock file 2022-12-28 12:45:49 +03:00
9f198ef31d fixed user avatar/room logo cache 2022-12-27 18:20:05 +03:00
065b1d7308 Files: added socket notification when linking form 2022-12-27 13:50:59 +03:00
b1f65a94cb Files: returned Shared 2022-12-27 12:51:34 +03:00
109d6df303 Files: changed check 2022-12-27 12:36:20 +03:00
c494e872d7 Files: fixed file type check 2022-12-26 18:13:17 +03:00
0dd582ef8e Files: fixed file type check 2022-12-26 17:38:29 +03:00
ea430c6181 Merge branch 'release/rc-v1.2.0' into feature/form-links 2022-12-26 17:13:51 +03:00
3abab4fa44 Files: removed unnecessary 2022-12-26 13:49:33 +03:00
37656cd274 Files: added username to form title for provider entry 2022-12-26 13:35:53 +03:00
c528b83dd2 Files: refactor 2022-12-26 12:32:08 +03:00
846aa53583 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-26 12:19:54 +03:00
1ae54147ce Files: added warning message, added demotion on invitation 2022-12-26 12:19:37 +03:00
59fc0dd457 fix bug 60245 2022-12-25 19:22:14 +03:00
9f8ad6fb2a fix bug 60225 2022-12-25 19:05:03 +03:00
00b32e638a fix Bug 60214 2022-12-23 21:00:05 +03:00
8b3363bfd1 Merge branch 'release/rc-v1.2.0' into feature/form-links 2022-12-22 17:02:34 +03:00
91e7e20474 Files: removed unnecessary 2022-12-22 16:44:50 +03:00
333dceb146 Files: added option for forms 2022-12-22 15:49:09 +03:00
740684004a Files refactor 2022-12-22 15:48:34 +03:00
0d20a33102 Files: removed unnecessary 2022-12-22 15:48:11 +03:00
ae952b6d75 Files: fixing field names for referenceData 2022-12-22 15:37:25 +03:00
b21b933cbc Files: fix title 2022-12-22 14:53:27 +03:00
d0fe06052e Db: optimization 2022-12-21 15:57:32 +03:00
41408df33b Files: fixed mapping 2022-12-20 18:16:48 +03:00
d75301fe6e Files: fix security 2022-12-20 13:16:53 +03:00
324a10f5b0 Files: fix 2022-12-20 13:16:32 +03:00
8e83ebfd7d Files: my documents folder changed to current location 2022-12-20 00:30:12 +03:00