Commit Graph

1238 Commits

Author SHA1 Message Date
Vashchuk Nikita
bce9c8029d attachment as inline 2023-03-24 13:10:00 +05:00
63ee0ca117 UserDbContext - async 2023-03-24 10:53:49 +03: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
fc78a0508d TenantDbContext -async part2 2023-03-22 11:27:01 +03:00
18cc3d09c6 fix async 2023-03-21 17:28:06 +03:00
a3800de721 TenantDbContext -async part1 2023-03-20 19:16:00 +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
dde9cac96e TelegramDbContext - async 2023-03-17 11:47:17 +03:00
7d6feae7cd NotifyDbContext- async 2023-03-17 11:32:55 +03:00
603fc8cc0f MessagesContext - async 2023-03-16 18:23:59 +03:00
5de3a26365 Quota: contentsearch 2023-03-16 12:24:56 +03:00
71073f4e88 InstanceRegistrationContext - async 2023-03-15 18:59:19 +03:00
e5749eb986 FirebaseDbContext - async 2023-03-15 16:39:41 +03:00
e98784fd42 CustomDbContext - async 2023-03-15 12:22:30 +03:00
405ed839bb CoreDbContext -async 2023-03-14 23:44:44 +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
8ad635ba25 merge from release/rc-v1.2.0. fixed problem and update dll 2023-01-19 15:47:09 +03:00
9cc90a4789 People: refactor 2023-01-19 13:27:23 +03:00
0d46e034e7 Files.Service: added users module for feed aggregator 2023-01-18 18:36:06 +03:00
2f29eb444f fix 60163 2023-01-13 14:28:44 +03:00
29e0ef45b9 fix 60163 2023-01-13 14:26:12 +03:00
1ab804e4a0 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-01-12 22:48:30 +03:00
92f786c572 fix 60163 2023-01-12 12:09:01 +03:00
070475af5b running ActivePassiveHostedService in singletone mode as default 2023-01-11 00:31:12 +03:00
0090561fb6 Merge branch 'release/rc-v1.2.0' into feature/asc.apicache 2023-01-10 14:47:27 +03:00
44804e34db fixed cache room logo/user photo 2022-12-29 11:31:22 +03:00
e6c1991c39 fix Bug 60187 2022-12-25 19:44:37 +03:00
aa447f3384 fix key 2022-12-23 13:27:49 +03:00
62cec7b7c5 Merge branch 'release/rc-v1.2.0' into feature/asc.apicache 2022-12-22 14:17:24 +03:00
84aec69091 fix backup files_thirdparty_account 2022-12-21 18:34:23 +03:00
d0fe06052e Db: optimization 2022-12-21 15:57:32 +03:00
a1daacb4d0 fix 2022-12-21 12:38:47 +03:00
d31e341ff9 add async and AddBaseDbContext with settings 2022-12-20 10:27:55 +03:00
d1c436ea11 add migration to Teamlabsite 2022-12-19 18:01:57 +03:00
db951d00e6 asc.apicache 2022-12-16 15:41:09 +03:00
6c112da511 Core: fixed user status change 2022-12-14 14:38:40 +03:00
cd684de7cc Core: fixed permissions checking 2022-12-13 14:11:37 +03:00
426a11d080 Merge branch 'develop' into release/rc-v1.2.0 2022-12-12 19:33:41 +03:00
ffde2bf1c2 s3: fixed presigned url 2022-12-09 23:46:08 +03:00
143a4d01ec removed unused variables 2022-12-09 17:47:46 +03:00
6e45bc5aa8 removed unused variables 2022-12-09 16:34:00 +03:00
153c68b3bd Merge branch 'develop' into release/rc-v1.2.0 2022-12-09 13:05:08 +03:00
8d1393ba8e Core: changed singleton to scope 2022-12-09 12:23:26 +03:00
966364da9e Merge branch 'develop' into release/rc-v1.2.0 2022-12-09 12:14:48 +03:00
4fa41aa273 fixed updating ownerId 2022-12-08 18:50:50 +03:00
cd0de88e6c Core.Common: fix getting user groups 2022-12-08 14:55:05 +03:00
4affc5f58f Merge branch 'develop' into release/rc-v1.2.0 2022-12-07 18:50:14 +03:00
a03b50bd7c Merge branch 'develop' into release/rc-v1.2.0 2022-12-07 16:20:29 +03:00
ea1f2ba1b7 Merge branch 'develop' into feature/socket-newtag 2022-12-07 16:16:59 +03:00
61f7765a4f Merge branch 'develop' into feature/api-origin 2022-12-06 21:47:56 +03:00
7d0cc5a396
Merge pull request #1099 from ONLYOFFICE/bugfix/room-admin-permissions
Bugfix/room admin permissions
2022-12-06 15:22:47 +03:00
346c8d08e3 Core.Common: changed permissions validation logic 2022-12-06 01:57:45 +03:00
1596b4392b Core.Common: added rules matching support 2022-12-06 01:55:33 +03:00
3ee45f256b Core.Common: added new secuirty objects 2022-12-06 01:55:13 +03:00
6202e65932 Core.Common: added default rules 2022-12-06 01:54:35 +03:00
cd23ed5efc Core.Common: added rule 2022-12-06 01:54:18 +03:00
5e026445f5 Core.Common: added check for default rules 2022-12-06 01:49:57 +03:00