|
a289f9594a
|
modified LdapNotifyHelper to BackgroundService
|
2022-07-01 14:49:59 +03:00 |
|
|
329ec57aa2
|
Merge branch 'develop' into feature/LDAP-new
|
2022-07-01 13:15:52 +03:00 |
|
|
7e34e45371
|
ElasticSearch: disabled by default
|
2022-07-01 12:53:18 +03:00 |
|
|
f24fc8e19e
|
fix
|
2022-06-30 17:12:49 +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 |
|
|
630250b439
|
fix tests
|
2022-06-30 12:07:30 +03:00 |
|
|
75be0827d7
|
Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
# Conflicts:
# products/ASC.Files/Service/GlobalUsings.cs
|
2022-06-29 20:01:27 +03:00 |
|
|
35ab5a3531
|
fix order
|
2022-06-29 19:43:29 +03:00 |
|
|
d78509993f
|
fixed Bug 53280
|
2022-06-29 18:40:35 +03:00 |
|
|
5f6851253f
|
fix bug 57725
|
2022-06-29 15:10:56 +03:00 |
|
|
9e05dc641a
|
notify: temp logs
|
2022-06-28 23:32:33 +03:00 |
|
|
e483177f24
|
fixed: Bug 57693
|
2022-06-28 19:42:13 +03:00 |
|
|
fa815c6254
|
fix order endpoints
|
2022-06-28 15:53:06 +03:00 |
|
|
f9f73f733f
|
fixed log path
|
2022-06-28 15:50:13 +03:00 |
|
|
83bb63ff0c
|
remove waste
|
2022-06-28 15:33:22 +03:00 |
|
|
d1063df40c
|
Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
|
2022-06-28 15:32:06 +03:00 |
|
|
e17f49e344
|
Merge branch 'develop' into feature/LDAP-new
# Conflicts:
# ASC.Web.sln
# common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Api/GlobalUsings.cs
|
2022-06-28 14:30:40 +03:00 |
|
|
dd52a695e5
|
fix build
|
2022-06-27 23:18:23 +03:00 |
|
|
6d98440200
|
az resources
|
2022-06-27 14:00:23 +03:00 |
|
|
4ad4c34b34
|
fix
|
2022-06-24 16:23:56 +03:00 |
|
|
fef096b0a5
|
fix generating thumbnails for video
|
2022-06-24 16:22:52 +03:00 |
|
|
c9eaeed719
|
Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
# Conflicts:
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
|
2022-06-23 12:09:13 +03:00 |
|
|
5bcbae5711
|
fix
|
2022-06-23 11:48:31 +03:00 |
|
|
f2da6fc55c
|
Merge pull request #693 from ONLYOFFICE/feature/docspace
Feature/docspace
|
2022-06-22 11:55:36 +04:00 |
|
|
aad8a92b4c
|
RoomInvite replaced by LinkInvite
|
2022-06-21 20:33:05 +03:00 |
|
|
5e491a6849
|
Common: fix
|
2022-06-21 20:32:29 +03:00 |
|
|
5aef5524f1
|
fix Bug 57641
|
2022-06-21 18:19:55 +03:00 |
|
|
1aadf26fe2
|
Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
|
2022-06-21 17:05:04 +03:00 |
|
|
b78feb8ae9
|
refactoring
|
2022-06-21 12:57:20 +03:00 |
|
|
0a27a98511
|
Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
|
2022-06-21 10:52:53 +03:00 |
|
|
03e756277b
|
fixed warnings
|
2022-06-20 17:01:59 +03:00 |
|
|
e68ac70005
|
Merge branch 'develop' into feature/docspace
|
2022-06-20 12:15:08 +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 |
|
|
72b0a81f51
|
fix
|
2022-06-17 20:51:01 +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 |
|
|
945e9d8efe
|
moved from ddf515b8
|
2022-06-17 18:46:16 +03:00 |
|
|
29d3bb3fee
|
Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
|
2022-06-17 13:18:03 +03:00 |
|
|
0fbe11ed1c
|
Merge branch 'develop' into feature/docspace
|
2022-06-17 10:26:51 +03:00 |
|
|
b62ba1d729
|
fix tests
|
2022-06-17 10:17:17 +03:00 |
|
|
dad4b12985
|
Files: refactor
|
2022-06-16 18:35:54 +03:00 |
|
|
39e7b28005
|
Files: refactor
|
2022-06-16 18:26:53 +03:00 |
|
|
56ece27e1b
|
moved from ddf515b8
|
2022-06-16 17:16:46 +03:00 |
|
|
c9fb0d3dac
|
moved from ddf515b8
|
2022-06-16 11:13:53 +03:00 |
|
Vashchuk Nikita
|
c1097acbb8
|
fix static, braces, log
|
2022-06-15 15:39:37 +03:00 |
|
|
f3f3ed96ae
|
moved from ddf515b8
|
2022-06-15 12:46:21 +03:00 |
|
|
35bebe49f9
|
moved from ddf515b8
|
2022-06-14 11:11:41 +03:00 |
|
|
4682001699
|
People: fix System.NullReferenceException
|
2022-06-10 22:28:50 +03:00 |
|
|
6624a7e7f6
|
Web: Translations: Added new excludes for DublicatesFilesByMD5HashTest
|
2022-06-10 12:33:17 +03:00 |
|
|
46ba74cc6f
|
moved from ddf515b8
|
2022-06-09 20:33:08 +03:00 |
|
|
a3fec128b5
|
log: fixed character case
|
2022-06-09 19:37:59 +03:00 |
|