Commit Graph

11001 Commits

Author SHA1 Message Date
e5f733c771 fix Bug 61076 2023-03-10 11:39:54 +03:00
340e1d51d2 fix bug 61527 and bug 61526
now when move/copy folder markAsNew only files in this folders
2023-03-10 11:37:16 +03:00
61351f089f thubmnail: change resize alg 2023-03-10 00:54:17 +03:00
f1bfefe9c1 thubmnail: change resize alg 2023-03-09 22:16:15 +03:00
Vashchuk Nikita
f3f1cd1adc fix userName, added collaborator as portals Role resource 2023-03-09 20:57:21 +05:00
Vashchuk Nikita
492d8765cb added collaborator resources 2023-03-09 17:39:38 +05:00
7220d0227c thumbnailBuilder: removed replace background color 2023-03-09 14:58:05 +03:00
Vashchuk Nikita
8bbdeffa46 changed action 5002 to 5034, moved RoomRemoveUser to dailyFeed, fix createRoom action, fix RoomUpdateAccessForUser action, fix userName 2023-03-09 16:40:36 +05:00
Vashchuk Nikita
5860c24c84 enable RoomsActivity subscription for all new users 2023-03-08 21:01:44 +05:00
7d57ec8a1a thumbnails: optimization, refactoring 2023-03-08 14:34:09 +03:00
Vashchuk Nikita
4d95d7c848 added roomRemoved as instant action 2023-03-07 19:37:04 +05:00
Vashchuk Nikita
4f4b4c06c2 added check roomsActivity subscription when send mentions,
added check general notification settings to determine mute attribute
2023-03-07 15:23:07 +05:00
29abce027d Merge branch 'develop' into feature/notifications
# Conflicts:
#	packages/client/src/pages/Accounts.jsx
#	packages/client/src/store/FilesActionsStore.js
#	packages/common/constants/index.js
#	products/ASC.People/Server/Api/UserController.cs
2023-03-06 15:37:45 +03:00
6934ee79bc thumbnails: refactoring, optimization 2023-03-04 19:58:45 +03:00
f95c56198e thumbnail: bump ImageSharp from v2.0.0 to 3.0.0, optimization, refactoring 2023-03-03 22:49:36 +03:00
Vashchuk Nikita
c92be742cb Fix/modified sendWhatsNew, Added RoomCreateUser, Added RoomRemoveUser 2023-03-03 20:02:48 +05:00
ab716af522 InternalMoveFileAsync fixed 2023-03-02 13:15:35 +03:00
e73df55f3c Bug 61218 2023-03-01 20:32:44 +03:00
803f48d0ac fix search by title? 2023-03-01 19:05:17 +03:00
8b500ae37d
Merge pull request #1257 from ONLYOFFICE/bugfix/60605
bugfix/60605
2023-03-01 17:41:31 +03:00
Vashchuk Nikita
082c5f968c fix mentions letter format, added roomsNotificationSettings check 2023-03-01 19:15:35 +05:00
6c428d9bbb fix Bug 61111 2023-03-01 14:53:55 +03:00
308802eeb6 optional size in api method /people/${profileId}/photo/thumbnails.json 2023-03-01 14:46:26 +03:00
Vashchuk Nikita
07999f1997 fix method for getting users for mentions 2023-03-01 13:30:08 +05:00
887926f852 fixed ChunkedUploader with external uploader url 2023-02-28 22:32:56 +03:00
Vashchuk Nikita
d9dd2c6fcb modified the method for getting users for mentions 2023-03-01 00:11:24 +05:00
Vashchuk Nikita
b367233f32 fix the method for getting roomInfo 2023-03-01 00:04:12 +05:00
Vashchuk Nikita
7c8b0916b6 fix new attribute in rootMethod 2023-02-28 19:19:18 +05:00
18274f9a99
Merge pull request #1244 from ONLYOFFICE/feature/colloborator
Feature/colloborator
2023-02-28 17:27:05 +04:00
e1a6b2bd8d refactoring 2023-02-28 16:24:00 +03:00
27900054a0
Merge pull request #1242 from ONLYOFFICE/feature/ef-batch
EF: batch operations
2023-02-28 15:48:05 +03:00
c932d935fa Merge branch 'develop' into feature/colloborator 2023-02-28 13:48:08 +04:00
d6962eb442 Files: fixed room invitation 2023-02-28 11:02:16 +03:00
78a2e20edb refactoring 2023-02-27 18:38:01 +03:00
beb1834a0a EF: batch operations 2023-02-27 16:39:52 +03:00
75281090c7 fix merge 2023-02-27 15:41:53 +03:00
d847ac0827 Merge branch 'develop' into refactoring/generic-classes 2023-02-27 15:41:40 +03:00
Timofey Boyko
8e59451b4a Merge branch 'develop' into feature/colloborator 2023-02-27 15:22:21 +03:00
052728f969 refactoring thirdparty 2023-02-27 14:57:54 +03:00
ead94f371e Merge branch 'develop' into feature/notifications 2023-02-27 10:29:50 +03:00
2c140b97df refactoring thirdparty 2023-02-27 10:16:32 +03:00
03a4dc89dc Settings: refactoring 2023-02-24 17:19:10 +03:00
216a6480c8 Merge branch 'develop' into feature/notifications
# Conflicts:
#	packages/common/constants/index.js
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	yarn.lock
2023-02-22 15:50:55 +03:00
c8150ac4b0 People: fixed user type filter 2023-02-22 12:54:43 +03:00
a8a67d3180 fix build 2023-02-22 12:22:40 +03:00
38c28bce91 Merge branch 'develop' into bugfix/60994 2023-02-22 11:50:39 +03:00
ca2c9e8b57 Files: refactor 2023-02-21 19:39:00 +03:00
f1d98ce6fd Files: fixed invitation in room 2023-02-21 19:38:47 +03:00
abbd2b837e File: fixed user in room count 2023-02-21 19:38:26 +03:00
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
ca5d711c36 People: refactor 2023-02-21 16:53:48 +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
6f34d873ee People: refactor 2023-02-20 11:16:44 +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
2be40a9c50 People: refactor 2023-02-17 17:53:30 +03:00
07dc7dab20 People: refactor, added collaborator 2023-02-17 17:40:25 +03:00
25859e5d4e refactoring 2023-02-17 15:56:40 +03:00
10c637e822 Root folders renamed 2023-02-16 19:36:47 +03:00
858e0dc300 refactoring thirdParty 2023-02-16 18:16:41 +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
4f60d40e25 fix 2023-02-10 18:12:07 +03:00
9992f3ca5e files.service: thumbnail refactoring 2023-02-10 17:13:01 +03:00
3eda98f0c5 refactoring: add all in selectors 2023-02-10 17:11:10 +03:00
35a85a251b refactoring selectorFactory 2023-02-10 13:57:43 +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
57528afa94 refactoring thirdparty selectors 2023-02-09 13:50:09 +03:00
df93637449 fix SelectorFactory 2023-02-09 11:25:22 +03:00
cf14c60f08 fix merge 2023-02-08 19:54:43 +03:00
2e21ee42d5 Merge branch 'develop' into refactoring/generic-classes 2023-02-08 19:54:31 +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
fc9a199683 fix DisposableWrappers 2023-02-08 14:29:34 +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
27d9ee86d6 refactoring SelectorFactory 2023-02-08 14:00:17 +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
7ccc4811e2 refactoring securitydao 2023-02-07 12:25:34 +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
4fbe654ed5 People: fixed user type change 2023-01-31 12:52:51 +03:00
683b1ecd83 fix 2023-01-30 16:55:02 +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
07ad44edd7 fix 2023-01-27 19:29:05 +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
d90b37252f Merge branch 'develop' into refactoring/generic-classes
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
2023-01-26 23:00:02 +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