Commit Graph

6363 Commits

Author SHA1 Message Date
29d3bb3fee Merge branch 'develop' into feature/get-thumbnail-from-thirdparty 2022-06-17 13:18:03 +03:00
597db4684e refactoring 2022-06-17 13:17:53 +03:00
0d1239af95 add thumbnails for video 2022-06-16 16:43:29 +03:00
59f50effc5
Merge branch 'develop' into bugfix/fix-private-room 2022-06-15 14:48:49 +03:00
c37af416da Files: fix 404 2022-06-15 10:41:59 +03:00
c2b7f99f16 refactoring get thumbnailFile 2022-06-14 10:45:52 +03:00
722f3568bb refactoring get ThumbnailFile 2022-06-14 10:28:57 +03:00
d43693acb2 get status Thumbnail.Created for thirdparty 2022-06-10 16:06:32 +03:00
d132f0d565 fileconverter: refactoring 2022-06-09 17:38:27 +03:00
22b341c942 fileconverter: added logs 2022-06-09 17:02:19 +03:00
7b1ea58cdf fileconverter: moved timer to separete worker service 2022-06-08 17:25:25 +03:00
720121f56e add google and onedrive 2022-06-06 17:28:51 +03:00
a0729a8084 thumbnail: first version
add from google and dropbox
2022-06-03 10:41:05 +03:00
3757174d08 fix test 2022-06-01 20:25:03 +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
e01858d2e8 merge from develop 2022-05-25 16:58:31 +03:00
e6d7979e92 dbcontext: EnableRetryOnFailure for MySQL provider 2022-05-25 16:55:38 +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
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
91c4e454c5 add loggers 2022-05-20 18:24:41 +03:00
75da995099 Merge branch 'develop' into feature/logger-refactoring 2022-05-20 17:01:51 +03:00
19d219ba84
Merge pull request #650 from ONLYOFFICE/feature/logger-Files.Core
Feature/logger files.core
2022-05-20 16:22:16 +03:00
be9c7ffd12 fix 2022-05-20 16:15:13 +03:00
f812c8e052
Merge pull request #652 from ONLYOFFICE/feature/logger-Files
Feature/logger files
2022-05-19 16:14:47 +03:00
36855d656f remove application/x-www-form-urlencoded 2022-05-17 12:29:24 +03:00
9ed3b1cb2f fix tests 2022-05-16 13:58:45 +03:00
d0525e298c thumbnails, notify, telegram: migrate from ICacheNotify to EventBus 2022-05-13 22:14:00 +03:00
f4727b411e Test: fix 2022-05-13 18:08:30 +03:00
14f25c2da7 Test: fix 2022-05-13 14:48:51 +03:00
c21898f2e0 add logger 2022-05-13 12:33:44 +03:00
969c037d3c Merge branch 'develop' into feature/fix-tests 2022-05-13 12:27:30 +03:00
122affb8a2 add loggers 2022-05-12 18:35:48 +03:00
a0f67cfe27 add loggers 2022-05-12 11:14:00 +03:00
84121f4451 fix 2022-04-29 17:26:21 +03:00
cf0e9c322d ElasticSearch: fix 2022-04-29 16:17:52 +03:00
31c289a26b fix-tests: change dir for log and products 2022-04-29 13:48:29 +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
e11fc2ff79 backend: updated packages version 2022-04-27 18:48:28 +03:00
36d914724d backend: updated packages version 2022-04-27 17:54:31 +03:00
93f637467b backend: updated packages version 2022-04-27 14:26:38 +03:00
19cf415898 backend: updated packages version 2022-04-27 13:02:17 +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
2a5aa715e4 fix tests 2022-04-25 11:09:51 +03:00
88b59b1c30 refactoring 2022-04-22 16:24:54 +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