Commit Graph

156 Commits

Author SHA1 Message Date
9b74f49359 refactoring 2023-08-10 16:19:48 +03:00
f5620a3666 Merge branch 'develop' into feature/optimization-queries 2023-06-01 23:52:40 +03:00
75ebc4ce65 fix await using 2023-06-01 14:27:27 +03:00
6c78438b75 Merge branch 'develop' into feature/optimization-ef
# Conflicts:
#	common/ASC.Api.Core/Middleware/WebhooksGlobalFilterAttribute.cs
#	common/ASC.Core.Common/Context/Impl/TenantManager.cs
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Core/RegionHelper.cs
#	common/ASC.Core.Common/Data/DbQuotaService.cs
#	common/ASC.Core.Common/GeolocationHelper.cs
#	common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Api/Api/ConnectionsController.cs
#	web/ASC.Web.Api/Api/PortalController.cs
#	web/ASC.Web.Api/Api/Settings/RadicaleController.cs
#	web/ASC.Web.Api/Api/Settings/TfaappController.cs
#	web/ASC.Web.Api/Core/QuotaHelper.cs
#	web/ASC.Web.Core/Notify/NotifyConfiguration.cs
#	web/ASC.Web.Core/Notify/StudioNotifyService.cs
#	web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
2023-05-30 14:13:02 +03:00
8d7219c0e0 async refactoring 2023-05-19 14:42:02 +03:00
5df60b3a8b backend: using RemoteIpAddress method for get a client ip 2023-04-20 19:38:09 +03:00
1711004cfb backend: using RemoteIpAddress method for get a client ip 2023-04-20 18:24:31 +03:00
dd2155e36d fix MessagesRepository 2023-04-10 14:02:57 +03:00
6ed8cebb5f fix 2023-04-10 11:41:12 +03:00
07d847fdd1 Merge branch 'develop' into feature/optimization-ef 2023-04-06 17:24:05 +03:00
138544c86c remove CreateExecutionStrategy 2023-04-05 19:30:35 +03:00
6309d9530c fix async 2023-03-30 15:11:45 +03:00
aac1896a0f remove CreateDbContextAsync and fix ExecuteAsync 2023-03-28 00:25:55 +03:00
a3800de721 TenantDbContext -async part1 2023-03-20 19:16:00 +03:00
bafbe2c81b fixed notification 2023-03-17 14:37:06 +03:00
b735e3415a MessaginSystem: added root folder title in notification info 2023-03-17 14:34:22 +03:00
603fc8cc0f MessagesContext - async 2023-03-16 18:23:59 +03:00
47e14d50fb async/await: added new instance dbcontext 2023-03-10 19:49:46 +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
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
c92be742cb Fix/modified sendWhatsNew, Added RoomCreateUser, Added RoomRemoveUser 2023-03-03 20:02:48 +05:00
a4fd81b404 migrate from .net6 to .net7 2022-11-10 13:10:18 +03:00
ca85ef1d49 fix usings 2022-11-07 12:34:50 +03:00
dba122eb96 Common, files: added dbcontext pool 2022-07-28 21:00:49 +03:00
Vashchuk Nikita
e49d082fa3 Merge branch 'develop' into feature/migrations-fix
# Conflicts:
#	common/ASC.Core.Common/EF/Model/Core/Acl.cs
#	common/ASC.Core.Common/GlobalUsings.cs
#	common/ASC.Core.Common/Messaging/EventMessage.cs
#	common/ASC.Core.Common/Messaging/LoginEvent.cs
#	common/ASC.Core.Common/Messaging/MessageTarget.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20211012145322_UserDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20220708104402_UserDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/MySqlUserDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/CoreDbContextPostgreSql/20211012145321_CoreDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/TenantDbContextPostgreSql/20211012145343_TenantDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20211012145323_UserDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20220708104403_UserDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/PostgreSqlUserDbContextModelSnapshot.cs
#	common/ASC.Data.Backup.Core/Migrations/MySql/BackupsContextMySql/20220708104422_BackupsContextMySql.Designer.cs
#	common/ASC.Data.Backup.Core/Migrations/PostgreSql/BackupsContextPostgreSql/20220708104423_BackupsContextPostgreSql.Designer.cs
#	common/ASC.MessagingSystem/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
#	common/ASC.MessagingSystem/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
#	common/ASC.Resource.Manager/ResourceData.cs
#	common/services/ASC.AuditTrail/GlobalUsings.cs
#	products/ASC.Files/Core/Core/EF/DbFilesThirdpartyAccount.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/20211022170841_FilesDbContextPostgreSql.cs
#	products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	web/ASC.Web.Api/GlobalUsings.cs
2022-07-11 13:28:49 +03:00
Vashchuk Nikita
dcd6faf781 fix for merge 2022-07-11 12:29:45 +03:00
Vashchuk Nikita
4628769136 fix Contexts,
fix migrations,
removed MailDbContext.cs,
moved ResourceDbContext.cs
2022-07-08 14:24:18 +03:00
Vashchuk Nikita
bdbd6bd65e Recreating and fixing migrations 2022-07-01 14:27:28 +03:00
Vashchuk Nikita
5a0acc8eaa Renaming folders for contexts and models 2022-07-01 14:23:07 +03:00
630250b439 fix tests 2022-06-30 12:07:30 +03:00
e68ac70005 Merge branch 'develop' into feature/docspace 2022-06-20 12:15:08 +03:00
8ea04bcc81 Merge branch 'develop' into feature/12.0
# Conflicts:
#	common/ASC.MessagingSystem/Data/MessagesRepository.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
2022-06-17 19:19:00 +03:00
9edcce8858 moved from ddf515b8 2022-06-09 15:11:45 +03:00
b693779ea1 Merge branch 'develop' into feature/docspace-pin 2022-06-08 16:38:16 +03:00
57df81aa76 Files: added logo audit, fix 2022-06-03 01:27:56 +03:00
a861268e4f moved from ddf515b8 2022-06-01 17:07:08 +03:00
3ebd67f444 merge from develop 2022-06-01 14:44:30 +03:00
e7886aff2c Log: refactoring 2022-05-26 12:01:54 +03:00
e6d7979e92 dbcontext: EnableRetryOnFailure for MySQL provider 2022-05-25 16:55:38 +03:00
664e718fa0 Files: added custom tags audit 2022-05-25 15:34:38 +03:00
d2a8ebf771 added force save, refactor 2022-05-16 20:19:41 +03:00
0b92150d57 added data check, added audit 2022-05-16 20:19:02 +03:00
025d13557d added a secure link to invite to the portal 2022-05-13 19:25:28 +03:00
5f75774729 add loggers 2022-05-13 13:47:01 +03:00
5d2946b47f Files: fix mapping 2022-05-11 17:16:23 +03:00
3d2c055551 Files: added audit for room 2022-04-29 14:15:22 +03:00
89059cf32e Structured Logging 2022-04-28 12:15:33 +03:00