|
|
7f38657ce6
|
Push: global usings
|
2022-08-23 13:10:37 +03:00 |
|
|
|
c8e4ea7cec
|
Push: Newtonsoft.Json -> System.Text.Json
|
2022-08-23 12:05:09 +03:00 |
|
|
|
1c7d7fee77
|
Push: fix
|
2022-08-23 10:42:49 +03:00 |
|
|
|
ce5009d0c6
|
Push: fixes
|
2022-08-15 14:27:54 +03:00 |
|
|
|
46caff0b0c
|
Push: post merge fixes
|
2022-08-15 01:00:11 +03:00 |
|
|
|
020fa7dcda
|
Merge branch 'develop' into feature/push
|
2022-08-11 17:15:37 +03:00 |
|
|
|
8d89d8e8f2
|
Common: added dbcontext pool
|
2022-07-28 15:29:03 +03:00 |
|
|
|
a5f4435b17
|
fix notify
|
2022-07-20 22:06:33 +03:00 |
|
|
|
d8980cc3a7
|
fix 57917
|
2022-07-14 20:00:43 +03:00 |
|
|
|
7af929fee8
|
Merge branch 'release/v1.2' into develop
# Conflicts:
# common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
# common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# products/ASC.People/Server/Models/MemberModel.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2022-07-07 17:41:41 +03:00 |
|
|
|
cac16ace79
|
Push: api
|
2022-07-07 14:46:35 +03:00 |
|
|
|
273854bf84
|
Push: fix FirebaseHelper
|
2022-07-05 15:55:46 +03:00 |
|
|
|
191e66a238
|
Notify: fix warning
|
2022-07-04 16:55:11 +03:00 |
|
|
|
a289f9594a
|
modified LdapNotifyHelper to BackgroundService
|
2022-07-01 14:49:59 +03:00 |
|
|
|
45cd9434f4
|
fix Bug 57888
|
2022-06-30 19:41:17 +03:00 |
|
|
|
74d238bde8
|
Merge branch 'release/v1.2' into develop
# Conflicts:
# common/ASC.Common/Caching/KafkaCache.cs
# common/ASC.Common/Logging/Log.cs
# common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
# common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
# common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
# common/ASC.Data.Backup.Core/BackupResource.Designer.cs
# common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSession.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
# common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
# products/ASC.Files/Core/ASC.Files.Core.csproj
# products/ASC.Files/Core/Core/Compress/CompressToArchive.cs
# products/ASC.Files/Core/Core/Compress/CompressToTarGz.cs
# products/ASC.Files/Core/Core/Compress/CompressToZip.cs
# products/ASC.Files/Core/Core/Compress/ICompress.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/Resources/FilesJSResource.Designer.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/FileMarkAsReadOperation.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
# web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
|
2022-06-30 16:13:31 +03:00 |
|
|
|
9e05dc641a
|
notify: temp logs
|
2022-06-28 23:32:33 +03:00 |
|
|
|
14404198c2
|
Push: fixed a sender sink
|
2022-06-27 13:36:38 +03:00 |
|
|
|
e2cee2c2fc
|
Merge branch 'release/v1.2' into develop
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.FederatedLogin/OAuth20Token.cs
# common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
# common/ASC.Resource.Manager/Program.cs
# common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
# config/appsettings.json
# products/ASC.Files/Core/ASC.Files.Core.csproj
# products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/ISecurityDao.cs
# products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/ThumbnailSettings.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
# products/ASC.Files/Core/Model/SessionModel.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
# products/ASC.Files/Core/ThirdPartyApp/IThirdPartyApp.cs
# products/ASC.Files/Core/ThirdPartyApp/Token.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.Files/Core/Utils/FileUploader.cs
# products/ASC.Files/Core/Utils/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/DocStore
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# products/ASC.People/Server/ASC.People.csproj
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Core/PublicResources/CustomModeResource.Designer.cs
# web/ASC.Web.Core/PublicResources/Resource.Designer.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
# web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
|
2022-06-19 22:44:48 +03:00 |
|
|
|
f59460405f
|
Push: push sender
|
2022-06-16 16:07:49 +03:00 |
|
|
|
1e47bf9bf3
|
Push: configuration
|
2022-06-15 17:25:23 +03:00 |
|
|
|
34bc4e143c
|
Push: helper, dao
|
2022-06-15 12:01:07 +03:00 |
|
|
|
a861268e4f
|
moved from ddf515b8
|
2022-06-01 17:07:08 +03:00 |
|
|
|
e7886aff2c
|
Log: refactoring
|
2022-05-26 12:01:54 +03:00 |
|
|
|
a66c03aa86
|
Merge branch 'develop' into feature/logger-refactoring
# Conflicts:
# common/ASC.Common/Caching/AscCache.cs
# common/ASC.Common/GlobalUsings.cs
# common/ASC.Core.Common/Notify/Telegram/TelegramHelper.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
# common/ASC.Data.Storage/GlobalUsings.cs
# common/services/ASC.Data.Backup.BackgroundTasks/GlobalUsings.cs
# common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupDeleteScheldureRequestedIntegrationEventHandler.cs
# common/services/ASC.Data.Backup.BackgroundTasks/Services/BackupSchedulerService.cs
# common/services/ASC.Notify/GlobalUsings.cs
# common/services/ASC.Notify/IntegrationEvents/EventHandling/NotifyInvokeSendMethodRequestedIntegrationEventHandler.cs
# common/services/ASC.Notify/Services/NotifySenderService.cs
# common/services/ASC.TelegramService/GlobalUsings.cs
# common/services/ASC.TelegramService/TelegramHandler.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/GlobalUsings.cs
# products/ASC.Files/Service/Thumbnail/IntegrationEvents/EventHandling/ThumbnailRequestedIntegrationEventHandler.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Api/Api/Settings/StorageController.cs
|
2022-05-24 23:13:57 +03:00 |
|
|
|
b525696b03
|
fix usings
|
2022-05-24 18:41:28 +03:00 |
|
|
|
addf33bf5a
|
telegram: remove cache from dao
|
2022-05-17 21:57:18 +03:00 |
|
|
|
16cc806615
|
telegram: separate integration event
|
2022-05-17 20:53:46 +03:00 |
|
|
|
7e6f8db8d9
|
telegram: update dependency
|
2022-05-17 18:27:34 +03:00 |
|
|
|
d0525e298c
|
thumbnails, notify, telegram: migrate from ICacheNotify to EventBus
|
2022-05-13 22:14:00 +03:00 |
|
|
|
bd7d9ba8cf
|
Web: Files: Added socket event ("s:modify-folder->update") on thumbnail creation on Server
|
2022-05-05 21:20:44 +03:00 |
|
|
|
b4ed3ecef4
|
add loggers in core.common
|
2022-05-05 17:13:47 +03:00 |
|
|
|
7280772aef
|
logging optimization
|
2022-04-28 18:53:28 +03:00 |
|
|
|
89059cf32e
|
Structured Logging
|
2022-04-28 12:15:33 +03:00 |
|
|
|
13bbce8ea4
|
Custom logger replaced with Microsoft.Extensions.Logging
|
2022-04-26 20:53:48 +03:00 |
|
|
|
97b45d3bd5
|
ILog: refactoring
|
2022-04-25 21:02:18 +03:00 |
|
|
|
9eba173a44
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Model/CreateFileModel.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Utils/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2022-04-21 22:36:29 +03:00 |
|
|
|
e603b26caa
|
refactoring
|
2022-04-15 13:27:48 +03:00 |
|
|
|
cb2580dd50
|
refactoring
|
2022-04-15 12:08:06 +03:00 |
|
|
|
6ecc8e7071
|
code cleanup
|
2022-04-14 22:42:15 +03:00 |
|
|
|
f138ff7c79
|
fixed warnings
|
2022-04-14 22:23:57 +03:00 |
|
|
|
5613f55ea6
|
fixed warnings
|
2022-04-14 16:52:51 +03:00 |
|
|
|
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 |
|
|
|
7d233d9a2d
|
Files: Fix s:stop-edit-file wrong file data (rootFolderType always SHARE)
|
2022-04-13 11:53:01 +03:00 |
|
|
|
b41682efaa
|
refactoring
|
2022-04-01 19:17:21 +03:00 |
|
|
|
e524ca03d1
|
Notify: removed scope class
|
2022-04-01 17:17:24 +03:00 |
|
|
|
49efbc9780
|
refactoring: remove IServiceProvider
|
2022-03-31 20:32:46 +03:00 |
|
|
|
cfad6e7ee7
|
removed IServiceProvider
|
2022-03-28 19:51:16 +03:00 |
|
|
|
f55a6cb6b2
|
Merge branch 'feature/backend-refactor' into feature/remove-serviceprovider
# Conflicts:
# common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
# web/ASC.Web.Core/Users/UserPhotoManager.cs
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
|
2022-03-28 17:45:42 +03:00 |
|
|
|
abae61f2db
|
IDE1006
|
2022-03-25 19:26:06 +03:00 |
|
