1e10e23b0c
fix
2022-05-27 18:10:34 +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
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
073ee2dc36
Merge branch 'develop' into feature/virtual-rooms-1.2
2022-04-21 12:07:18 -04:00
05609787f2
Files: fix async
2022-04-21 18:55:49 +03:00
Timofey Boyko
e2f8f40086
Web:Files:SharingPanel: add truncate for sharing panel header
2022-04-21 18:15:34 +03:00
Timofey Boyko
796e3448bc
Web:Files:SharingPanel: add access rights translate
2022-04-21 18:10:19 +03:00
Timofey Boyko
bf8ac30f6f
Web:Files:add new key 'AccessRights' for EN and RU locales
2022-04-21 18:07:58 +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
d6feda992b
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
2022-04-21 17:33:16 +03:00
f8088cfbd2
Web: Files: fixed gallery translations, refactoring
2022-04-21 17:18:01 +03:00
a9a528ab84
Web: Files: createFormFromTemplate replaced with createFile
2022-04-21 16:57:44 +03:00
8b2114aea3
Web: Files: fixed FORM_GALLERY_URL
2022-04-21 16:42:27 +03:00
17cdd4b655
Web: Files: changed oforms loader
2022-04-21 16:37:32 +03:00
00b2c032e4
Web: Files: fixed MainButton options
2022-04-21 16:15:20 +03:00
03c8921293
Web: Files: fixed FromGallery loader
2022-04-21 16:01:49 +03:00
9a204b536a
Web: Files: fixed MainButton formActions
2022-04-21 15:41:17 +03:00
ebbd473ecf
Web: fixed getOforms language
2022-04-21 15:33:48 +03:00
fe0db050ff
Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery
2022-04-21 14:49:18 +03:00