Commit Graph

3178 Commits

Author SHA1 Message Date
Vashchuk Nikita
4d95d7c848 added roomRemoved as instant action 2023-03-07 19:37:04 +05:00
Vashchuk Nikita
ca8c737b4f small fix MessageAction after merge 2023-03-06 19:17:39 +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
f8af64e9d6 ASC.Common.Threading: extension for channel 2023-03-03 22:00:20 +03:00
Vashchuk Nikita
c92be742cb Fix/modified sendWhatsNew, Added RoomCreateUser, Added RoomRemoveUser 2023-03-03 20:02:48 +05:00
a835719980 bugfix 60194
first hash then download when backup in s3
2023-03-02 10:47:22 +03:00
e73df55f3c Bug 61218 2023-03-01 20:32:44 +03:00
4ecc81f8e7
Merge pull request #1249 from ONLYOFFICE/bugfix/set-quota-row
fix set quota row
2023-03-01 17:42:12 +03:00
ed66ee8b08 bugfix 60194 2023-03-01 13:25:46 +03:00
e2f90e5367 fix set quota row 2023-02-28 16:51:37 +03:00
18274f9a99
Merge pull request #1244 from ONLYOFFICE/feature/colloborator
Feature/colloborator
2023-02-28 17:27:05 +04:00
27900054a0
Merge pull request #1242 from ONLYOFFICE/feature/ef-batch
EF: batch operations
2023-02-28 15:48:05 +03:00
c77e960d70 add transform dictionary 2023-02-28 14:54:16 +03:00
c932d935fa Merge branch 'develop' into feature/colloborator 2023-02-28 13:48:08 +04:00
78a2e20edb refactoring 2023-02-27 18:38:01 +03:00
beb1834a0a EF: batch operations 2023-02-27 16:39:52 +03:00
Timofey Boyko
8e59451b4a Merge branch 'develop' into feature/colloborator 2023-02-27 15:22:21 +03:00
aa7cf93a74 Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop 2023-02-27 13:29:36 +03:00
ead94f371e Merge branch 'develop' into feature/notifications 2023-02-27 10:29:50 +03:00
03a4dc89dc Settings: refactoring 2023-02-24 17:19:10 +03:00
f66dfbc0a8 kafka: setup config 2023-02-22 21:07:29 +03:00
44250c4f2f fix 2023-02-22 17:39:33 +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
a9960f0545
Merge pull request #1170 from ONLYOFFICE/bugfix/chunk-size
fix chunk size
2023-02-22 15:30:57 +03:00
5a65b42177 Core: fixed invite 2023-02-21 19:00:25 +03:00
3401abb21a Merge branch 'develop' into feature/colloborator 2023-02-21 17:11:39 +03:00
582c6a602b Core: added new helper methods 2023-02-21 16:37:33 +03:00
0787427bce fix 2023-02-21 15:12:57 +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
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
0a5d19a8f4 nlog: refactoring. added tenant info when httpcontext exist 2023-02-20 23:13:18 +03:00
5e9f12a797 backend: refactoring 2023-02-20 23:10:49 +03:00
6fb4f73110 Api.Core: added IsCollaborator in user dto 2023-02-20 11:51:21 +03:00
b88203df33 Api.Core: refactor 2023-02-20 11:15:41 +03:00
e171ee44e5 Core: refactor 2023-02-20 11:15:18 +03:00
c7792abb1d Core: fixed sorting users by type 2023-02-17 18:46:43 +03:00
068004ed28 Core: fix 2023-02-17 18:11:02 +03:00
19899d14e9 Core: added collaborator, refactor 2023-02-17 17:53:18 +03:00
9801433fd0 Core: fix security 2023-02-17 16:30:48 +03:00
72b3b351da Common: refactor 2023-02-17 16:29:13 +03:00
25859e5d4e refactoring 2023-02-17 15:56:40 +03:00
b160e00dae Backup: added collaborator group 2023-02-17 11:27:48 +03:00
90fdd58d1c Core: added collaborator group and type 2023-02-17 11:27:27 +03:00
e9ed1cf5b2 Common: added collaborator role 2023-02-17 11:26:34 +03:00
d5d8373125 EnableSSLVerification is true by default 2023-02-15 15:06:22 +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