Nikita
c662c59d41
added asyncEnumerable to GetEntriesAsync
2022-06-01 18:27:31 +03:00
Nikita
abaf1374ab
Merge branch 'feature/iasync-enumarable' into feature/async-fix
...
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/AbstractDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
2022-05-30 11:18:57 +03:00
1e10e23b0c
fix
2022-05-27 18:10:34 +03:00
ca7728f3b6
Merge branch 'develop' into feature/async-fix
...
# Conflicts:
# products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
2022-05-26 22:10:39 +03:00
Nikita
52e2925c8f
fix in @my
2022-05-26 13:24:12 +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
5599fc9809
Merge branch 'develop' into feature/remove-application/x-www-form-urlencoded
2022-05-24 17:09:33 +03:00
13ad4381f7
Api: removed CustomHttpMethodAttribute
...
added AllowNotPaymentAttribute
2022-05-23 18:48:23 +03:00
Nikita
4a0e61de7c
fixed a problem with DbContext in ASC.Files
2022-05-23 13:28:31 +03:00
6cb3ea538e
fix crm
2022-05-23 11:02:52 +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
52cdf0758e
fix crm
2022-05-19 18:47:59 +03:00
b0b7b19874
Merge pull request #656 from ONLYOFFICE/feature/logger-People
...
logger-People
2022-05-19 17:06:12 +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
5d3013f44d
add logger
2022-05-13 14:24:01 +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
78944a490e
Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme
2022-04-21 18:55:41 +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