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
430542b2ea
moved from ddf515b8
2022-06-16 11:35:24 +03:00
c9fb0d3dac
moved from ddf515b8
2022-06-16 11:13:53 +03:00
c37af416da
Files: fix 404
2022-06-15 10:41:59 +03:00
35bebe49f9
moved from ddf515b8
2022-06-14 11:11:41 +03:00
8c56de7a26
moved from ddf515b8
2022-06-05 18:44:37 +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
02570e12cf
Merge branch 'develop' into feature/cluster-services
2022-05-24 17:24:25 +03:00
13ad4381f7
Api: removed CustomHttpMethodAttribute
...
added AllowNotPaymentAttribute
2022-05-23 18:48:23 +03:00
75da995099
Merge branch 'develop' into feature/logger-refactoring
2022-05-20 17:01:51 +03:00
36855d656f
remove application/x-www-form-urlencoded
2022-05-17 12:29:24 +03:00
d0525e298c
thumbnails, notify, telegram: migrate from ICacheNotify to EventBus
2022-05-13 22:14:00 +03:00
a0f67cfe27
add loggers
2022-05-12 11:14:00 +03:00
4a773679e1
fix-tests: rework files tests
...
-rework tests (use httpClient)
-fix migration
-add description
-union similar tests
-add random port for asc.Files
-add time to db name
-change TestCaseSource to TestCase
2022-04-28 18:55:41 +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
1dff9e18c4
Merge branch 'develop' into feature/backend-refactor
...
# Conflicts:
# common/ASC.Api.Core/ASC.Api.Core.csproj
# common/ASC.Api.Core/Core/CustomHealthCheck.cs
# common/ASC.Api.Core/Middleware/IpSecurityFilter.cs
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.IPSecurity/IPRestrictionsRepository.cs
# common/ASC.IPSecurity/IPRestrictionsService.cs
# common/ASC.IPSecurity/IPSecurity.cs
# common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.Files/Core/Utils/FileSharing.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
2022-04-21 17:51:31 +03:00
3380e87811
Files: oforms gallery manager
2022-04-20 10:34:33 +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
Timofey Boyko
792bd7065f
Merge branch 'develop' into feature/virtual-rooms-1.2
2022-04-13 10:22:20 +03:00
4828678e03
merge from feature/backend-refactor
2022-04-12 22:04:10 +03:00
900d33b2d1
fix copyas
2022-04-12 18:31:50 +03:00
1ea6058232
fixed owner method
2022-04-12 13:21:39 +03:00
387119f6f2
remove waste
2022-04-11 10:58:18 +03:00
6dfb0d86d5
filter of files
...
add searchInContent in filesController's methods
2022-04-06 14:32:15 +03:00
a150b59fd9
Merge branch 'develop' into feature/virtual-rooms-1.2
2022-04-05 12:16:27 +03:00
49abfdf84a
fix docxf templates
2022-04-05 12:07:46 +03:00
c44ff9a190
fix
2022-04-01 17:14:14 +03:00
1e13f42c9c
Merge branch 'feature/backend-refactor' into feature/remove-serviceprovider
...
# Conflicts:
# products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
# products/ASC.Files/Server/Api/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
2022-04-01 15:17:46 +03:00
49efbc9780
refactoring: remove IServiceProvider
2022-03-31 20:32:46 +03:00
90623263e9
merge from feature/backend-refactor
2022-03-29 23:29:03 +03:00
df8b7182b6
merge feature/backend-refactor
2022-03-29 16:12:36 +03:00
4fe34215c9
Merge pull request #580 from ONLYOFFICE/feature/files-mapping
...
Feature/files mapping
2022-03-29 16:59:43 +04:00
cfad6e7ee7
removed IServiceProvider
2022-03-28 19:51:16 +03:00
81f3a1fb09
DistributedTaskQueue refactoring. set MaxThreadsCount to 1
2022-03-26 16:31:13 +03:00
1ee814a2ef
Merge branch 'feature/backend-refactor' into feature/files-controller-refactoring
...
# Conflicts:
# common/ASC.Api.Core/GlobalUsings.cs
# products/ASC.Files/Server/GlobalUsings.cs
2022-03-24 17:11:33 +03:00
cb4d39e427
refactor
2022-03-23 19:23:25 +03:00
a857089ee6
renamed
2022-03-23 17:33:43 +03:00
079618e4e2
refactor
2022-03-23 16:08:27 +03:00
244e345ac6
Merge 'feature/backend-refactor' into feature/builder-extensions
2022-03-22 15:57:46 +03:00
82c96d160f
Merge branch 'feature/backend-refactor' into feature/files-mapping
2022-03-22 12:09:41 +03:00
172eaa8985
Merge pull request #589 from ONLYOFFICE/feature/update-packages
...
Feature/update packages
2022-03-21 22:24:11 +04:00
b4c44d1b09
Merge branch 'feature/backend-refactor' into feature/files-controller-refactor
2022-03-21 19:03:57 +03:00
cf8c1ba3ff
Merge branch 'feature/backend-refactor' into feature/files-mapping
2022-03-21 18:52:09 +03:00
a6f111463b
refactor
2022-03-21 18:11:26 +03:00
