|
|
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 |
|
|
|
ee5822ae00
|
removed radicale
|
2022-06-17 18:52:58 +03:00 |
|
|
|
945e9d8efe
|
moved from ddf515b8
|
2022-06-17 18:46:16 +03:00 |
|
|
|
b62ba1d729
|
fix tests
|
2022-06-17 10:17:17 +03:00 |
|
|
|
56ece27e1b
|
moved from ddf515b8
|
2022-06-16 17:16:46 +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 |
|
|
|
f2bcfb401a
|
Merge pull request #692 from ONLYOFFICE/bugfix/fix-private-room
bugfix/fix-private-room
|
2022-06-15 15:08:17 +03:00 |
|
|
|
59f50effc5
|
Merge branch 'develop' into bugfix/fix-private-room
|
2022-06-15 14:48:49 +03:00 |
|
|
|
f3f3ed96ae
|
moved from ddf515b8
|
2022-06-15 12:46:21 +03:00 |
|
|
|
20b85665e1
|
Merge pull request #691 from ONLYOFFICE/feature/refactoring-file-converter
fileconverter: moved timer to separete worker service
|
2022-06-15 13:32:59 +04: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 |
|
|
|
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 |
|
|
|
a9b826f8f5
|
moved from ddf515b8
|
2022-06-09 18:36:57 +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 |
|
|
|
9edcce8858
|
moved from ddf515b8
|
2022-06-09 15:11:45 +03:00 |
|
|
|
7b1ea58cdf
|
fileconverter: moved timer to separete worker service
|
2022-06-08 17:25:25 +03:00 |
|
|
|
cbd73be90b
|
moved from ddf515b8
|
2022-06-08 12:02:40 +03:00 |
|
|
|
c1d152becc
|
moved from ddf515b8
|
2022-06-07 21:00:08 +03:00 |
|
|
|
8c56de7a26
|
moved from ddf515b8
|
2022-06-05 18:44:37 +03:00 |
|
|
|
b6e82bd7c9
|
moved from ddf515b8
|
2022-06-02 19:24:28 +03:00 |
|
|
|
6b2ba0d4ed
|
moved from ddf515b8
|
2022-06-02 15:42:45 +03:00 |
|
|
|
3757174d08
|
fix test
|
2022-06-01 20:25:03 +03:00 |
|
|
|
34370cf6e2
|
fix socketio
|
2022-06-01 20:24:50 +03:00 |
|
|
|
27e3f061ef
|
Merge pull request #679 from ONLYOFFICE/feature/db_enable_retry_on_failure
Feature/db enable retry on failure
|
2022-06-01 19:30:22 +03:00 |
|
|
|
a861268e4f
|
moved from ddf515b8
|
2022-06-01 17:07:08 +03:00 |
|
|
|
3ebd67f444
|
merge from develop
|
2022-06-01 14:44:30 +03:00 |
|
|
|
427e8c5642
|
Merge pull request #684 from ONLYOFFICE/feature/crm-fix-api-and-logs
Feature/crm fix api and logs
|
2022-06-01 11:11:54 +03:00 |
|
|
|
8b92df64e4
|
crm: fix logs
|
2022-05-31 18:34:04 +03:00 |
|
|
|
ee7dddac5d
|
crm: fix crm api
|
2022-05-31 17:01:58 +03:00 |
|
|
|
f6d0b91898
|
Merge pull request #683 from ONLYOFFICE/feature/unified-config-style
unified config style
|
2022-05-31 16:25:43 +03:00 |
|
|
|
cc4f8a15b0
|
unified config style
|
2022-05-31 16:04:24 +03:00 |
|
|
|
fc94f2f445
|
moved from ddf515b8
|
2022-05-30 19:13:50 +03:00 |
|
|
|
cf8badeea3
|
Api: refactoring
|
2022-05-27 12:32:58 +03:00 |
|
|
|
7585aa898e
|
Merge pull request #672 from ONLYOFFICE/feature/logger-refactoring
Feature/logger refactoring
|
2022-05-26 12:22:44 +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 |
|
|
|
7ce16eeb3e
|
Merge pull request #676 from ONLYOFFICE/feature/nlog-5.0
update nlog
|
2022-05-24 21:58:59 +03:00 |
|
|
|
994bf92f06
|
Nlog: removed default settings.
Disabled Microsoft log except Microsoft.AspNetCore.Hosting.Diagnostics
|
2022-05-24 21:58:15 +03:00 |
|
|
|
426e14b243
|
Merge pull request #675 from ONLYOFFICE/feature/cluster-services
Feature/cluster services
|
2022-05-24 18:41:58 +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 |
|
|
|
bb600fc32e
|
Merge pull request #668 from ONLYOFFICE/feature/remove-application/x-www-form-urlencoded
remove application/x-www-form-urlencoded
|
2022-05-24 17:15:07 +03:00 |
|
|
|
5599fc9809
|
Merge branch 'develop' into feature/remove-application/x-www-form-urlencoded
|
2022-05-24 17:09:33 +03:00 |
|
|
|
e20370be5d
|
Merge pull request #673 from ONLYOFFICE/feature/fix-crm
Feature/fix crm
|
2022-05-24 17:07:18 +03:00 |
|
