Commit Graph

1179 Commits

Author SHA1 Message Date
ba4059e8b0 fix quota 2023-03-24 15:07:08 +03:00
cab3582bcf
Merge pull request #1315 from ONLYOFFICE/bugfix/notification-image-format
Bugfix/notification image format
2023-03-24 12:39:32 +03:00
Vashchuk Nikita
bce9c8029d attachment as inline 2023-03-24 13:10:00 +05:00
0abe404476 invitation link: added tariff/quota/permissions check, refactoring 2023-03-23 16:22:01 +03:00
d1213f7b04 fix Bug 61712 2023-03-22 23:52:59 +03:00
b96030c0b2 Quota: fix 2023-03-20 15:39:35 +03:00
9175233546 payment emails added 2023-03-19 12:25:31 +03:00
2032329753 fix quota 2023-03-17 13:55:21 +03:00
5de3a26365 Quota: contentsearch 2023-03-16 12:24:56 +03:00
4d929ef43e Core: added new action audit messages 2023-03-13 18:57:14 +03:00
132bc6792b
Merge pull request #1297 from ONLYOFFICE/feature/notifications
Feature/notifications
2023-03-10 17:06:55 +03:00
722df36493 async: fixed 2023-03-10 16:09:32 +03:00
Vashchuk Nikita
2d92da7c0c Merge branch 'release/v1.0.0' into feature/notifications
# Conflicts:
#	web/ASC.Web.Api/GlobalUsings.cs
2023-03-10 17:39:47 +05:00
d2d67f5060 fix 2023-03-09 20:18:18 +03:00
05571943dc backend: refactoring. replace sync methods to async within ExecutionStrategy block 2023-03-09 14:42:18 +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
13a82767ac DbQuotaService: optimization work 2023-03-08 14:27:19 +03:00
30dc57380e fix Bug 60163 2023-03-07 20:53:31 +03:00
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
Vashchuk Nikita
c92be742cb Fix/modified sendWhatsNew, Added RoomCreateUser, Added RoomRemoveUser 2023-03-03 20:02:48 +05:00
e73df55f3c Bug 61218 2023-03-01 20:32:44 +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
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
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
5a65b42177 Core: fixed invite 2023-02-21 19:00:25 +03:00
582c6a602b Core: added new helper methods 2023-02-21 16:37:33 +03: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
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
90fdd58d1c Core: added collaborator group and type 2023-02-17 11:27:27 +03:00
5e76441b64 fix 2023-02-07 19:12:09 +03:00
f52f32a6af Merge branch 'develop' into feature/asc.apicache
# Conflicts:
#	common/ASC.Core.Common/EF/Context/BaseDbContext.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/BackupProgressItem.cs
#	common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.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/Tools/ASC.Migration.Creator/Program.cs
#	common/Tools/ASC.Migration.Runner/Program.cs
#	common/Tools/ASC.MigrationPersonalToDocspace/MigrationCreator.cs
#	common/Tools/ASC.MigrationPersonalToDocspace/MigrationRunner.cs
2023-02-07 17:07:20 +03:00
8577c9fa2f Common: changed message action for room invitation link 2023-02-02 11:31:27 +03:00
442e57c092 fix 2023-02-01 14:24:30 +03:00
dc71761710 Settings: TenantDomainValidator 2023-01-26 15:31:06 +03:00
4a79cc5174 Bug 60770 2023-01-25 15:58:30 +03:00
8a8143950d replace CreateScope() => CreateScopeAsync() 2023-01-24 20:33:27 +03:00
c51e7a189b fix 60214 2023-01-20 20:12:45 +03:00
5311005587 fix Bug 60606 2023-01-20 15:34:36 +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