IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,756 Commits 40 Branches 22 Tags 420 MiB
9ad33a34f9
Commit Graph

30 Commits

Author SHA1 Message Date
pavelbannov
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
pavelbannov
8d7219c0e0 async refactoring 2023-05-19 14:42:02 +03:00
Alexey Bannov
5df60b3a8b backend: using RemoteIpAddress method for get a client ip 2023-04-20 19:38:09 +03:00
Alexey Bannov
1711004cfb backend: using RemoteIpAddress method for get a client ip 2023-04-20 18:24:31 +03:00
SuhorukovAnton
07d847fdd1 Merge branch 'develop' into feature/optimization-ef 2023-04-06 17:24:05 +03:00
SuhorukovAnton
a3800de721 TenantDbContext -async part1 2023-03-20 19:16:00 +03:00
MaksimChegulov
bafbe2c81b fixed notification 2023-03-17 14:37:06 +03:00
MaksimChegulov
b735e3415a MessaginSystem: added root folder title in notification info 2023-03-17 14:34:22 +03:00
SuhorukovAnton
603fc8cc0f MessagesContext - async 2023-03-16 18:23:59 +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
pavelbannov
630250b439 fix tests 2022-06-30 12:07:30 +03:00
pavelbannov
9edcce8858 moved from ddf515b8 2022-06-09 15:11:45 +03:00
pavelbannov
a861268e4f moved from ddf515b8 2022-06-01 17:07:08 +03:00
pavelbannov
e7886aff2c Log: refactoring 2022-05-26 12:01:54 +03:00
SuhorukovAnton
5f75774729 add loggers 2022-05-13 13:47:01 +03:00
pavelbannov
89059cf32e Structured Logging 2022-04-28 12:15:33 +03:00
pavelbannov
13bbce8ea4 Custom logger replaced with Microsoft.Extensions.Logging 2022-04-26 20:53:48 +03:00
pavelbannov
97b45d3bd5 ILog: refactoring 2022-04-25 21:02:18 +03:00
pavelbannov
26947072c6 Merge branch 'feature/backend-refactor' into feature/warnings 
# Conflicts:
#	common/ASC.Common/Threading/DistributedTaskProgress.cs
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Core.Common/Configuration/AmiPublicDnsSyncService.cs
#	common/ASC.Core.Common/Notify/Engine/NotifyRequest.cs
#	common/ASC.Core.Common/Notify/Model/NotifyClientImpl.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/ASC.Data.Reassigns/QueueWorker.cs
#	common/ASC.Data.Reassigns/ReassignProgressItem.cs
#	common/ASC.Data.Reassigns/RemoveProgressItem.cs
#	common/ASC.Data.Storage/StaticUploader.cs
#	products/ASC.Files/Core/ApiModels/ResponseDto/FileDto.cs
#	products/ASC.Files/Core/ApiModels/ResponseDto/FolderDto.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoBase.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
#	products/ASC.Files/Core/HttpHandlers/docusignhandler.ashx.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperation.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	web/ASC.Web.Core/CollaboratorSettings.cs
#	web/ASC.Web.Core/CustomNavigationSettings.cs
#	web/ASC.Web.Core/EmailActivationSettings.cs
#	web/ASC.Web.Core/Notify/NotifyConfiguration.cs
#	web/ASC.Web.Core/Notify/SpamEmailSettings.cs
#	web/ASC.Web.Core/Notify/StudioNotifyHelper.cs
#	web/ASC.Web.Core/Notify/StudioNotifyService.cs
#	web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
#	web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
#	web/ASC.Web.Core/Notify/StudioWhatsNewNotify.cs
#	web/ASC.Web.Core/PersonalSettings.cs
#	web/ASC.Web.Core/PrivacyRoomSettings.cs
#	web/ASC.Web.Core/PromotionsSettings.cs
#	web/ASC.Web.Core/QuotaSync.cs
#	web/ASC.Web.Core/Sms/SmsSender.cs
#	web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
#	web/ASC.Web.Core/StudioAdminMessageSettings.cs
#	web/ASC.Web.Core/StudioDefaultPageSettings.cs
#	web/ASC.Web.Core/StudioTrustedDomainSettings.cs
#	web/ASC.Web.Core/TariffSettings.cs
#	web/ASC.Web.Core/Tfa/TfaAppAuthSettings.cs
#	web/ASC.Web.Core/Tfa/TfaAppUserSettings.cs
#	web/ASC.Web.Core/TipsSettings.cs
#	web/ASC.Web.Core/Users/CustomNamingPeople.cs
#	web/ASC.Web.Core/Users/UserHelpTourSettings.cs
#	web/ASC.Web.Core/Users/UserPhotoManager.cs
#	web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
#	web/ASC.Web.Core/Users/UserPhotoThumbnailSettings.cs
#	web/ASC.Web.Core/Utility/ColorThemesSettings.cs
#	web/ASC.Web.Core/Utility/PasswordSettings.cs
#	web/ASC.Web.Core/Utility/Settings/TenantAccessSettings.cs
#	web/ASC.Web.Core/Utility/Settings/WebItemSettings.cs
#	web/ASC.Web.Core/Utility/Settings/WizardSettings.cs
#	web/ASC.Web.Core/Utility/TenantExtra.cs
#	web/ASC.Web.Core/WhiteLabel/AdditionalWhiteLabelSettings.cs
#	web/ASC.Web.Core/WhiteLabel/CompanyWhiteLabelSettings.cs
#	web/ASC.Web.Core/WhiteLabel/TenantInfoSettings.cs
#	web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
 2022-04-14 15:21:06 +03:00
MaksimChegulov
abae61f2db IDE1006 2022-03-25 19:26:06 +03:00
Alexey Bannov
63e12f49ab merge from feature/backend-refactor 2022-03-23 14:56:18 +03:00
MaksimChegulov
62fbab1185 Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
SuhorukovAnton
568f427957 IDE1006 2022-03-17 19:57:02 +03:00
SuhorukovAnton
6a09cf47e9 IDE0044 2022-03-17 18:07:17 +03:00
Alexey Bannov
89beecde71 replaced IOptionsMonitor<ILog> => ILog 2022-03-17 13:13:52 +03:00
MaksimChegulov
65db98f65c added new license headers 2022-03-15 21:00:53 +03:00
MaksimChegulov
3d50d7977b removed past license headers 2022-03-15 19:59:24 +03:00
MaksimChegulov
e6f111f651 Merge branch 'feature/backend-refactor' into feature/asc-core-common-refactor 2022-02-25 20:16:00 +03:00
MaksimChegulov
9fe4971055 add mapping, project reorganization 2022-02-21 18:35:57 +03:00