|
|
4946e04390
|
update spellcheck-excludes.json
|
2022-05-26 13:23:43 +03:00 |
|
|
|
9342b4e651
|
update spellcheck-excludes.json
|
2022-05-26 13:16:12 +03:00 |
|
|
|
e7886aff2c
|
Log: refactoring
|
2022-05-26 12:01:54 +03:00 |
|
|
|
6ad9a334ac
|
update spellcheck-excludes.json
|
2022-05-25 18:39:04 +03:00 |
|
|
|
83e6b48501
|
update spellcheck-excludes.json
|
2022-05-25 17:51:13 +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 |
|
|
|
664e718fa0
|
Files: added custom tags audit
|
2022-05-25 15:34: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 |
|
|
|
1936498713
|
update spellcheck-excludes.json
|
2022-05-24 18:40:49 +03:00 |
|
|
|
a84cf572e4
|
update spellcheck-excludes.json
|
2022-05-24 18:27:49 +03:00 |
|
|
|
02570e12cf
|
Merge branch 'develop' into feature/cluster-services
|
2022-05-24 17:24:25 +03:00 |
|
|
|
344d46ddae
|
update spellcheck-excludes.json
|
2022-05-24 16:01:12 +03:00 |
|
|
|
6e401cb7f9
|
update spellcheck-excludes.json
|
2022-05-24 14:59:50 +03:00 |
|
Nikita
|
1d2521c399
|
fix
|
2022-05-24 12:59:04 +03:00 |
|
|
|
4507ca6549
|
update nlog
|
2022-05-24 10:41:07 +03:00 |
|
Nikita
|
55a702bd2a
|
fix
|
2022-05-23 23:44:45 +03:00 |
|
|
|
2a673036ff
|
encryption service: migrate from ICacheNotify to RabbitMQ
|
2022-05-23 22:06:22 +03:00 |
|
|
|
4adc4ce5b6
|
Web: Translations: Added new SingleKeyFilesTest
|
2022-05-23 21:34:14 +03:00 |
|
|
|
dade86cb3e
|
Web: Translations: Commented annoying TranslationsEncodingTest (too many false alarms)
|
2022-05-23 21:33:05 +03:00 |
|
|
|
13ad4381f7
|
Api: removed CustomHttpMethodAttribute
added AllowNotPaymentAttribute
|
2022-05-23 18:48:23 +03:00 |
|
|
|
5510a18e58
|
update spellcheck-excludes.json
|
2022-05-23 18:19:26 +03:00 |
|
|
|
78423fc7ca
|
update spellcheck-excludes.json
|
2022-05-23 18:09:47 +03:00 |
|
Nikita
|
a7b9b77613
|
fix
|
2022-05-23 16:38:05 +03:00 |
|
|
|
79b713804e
|
telegram: refactoring
|
2022-05-23 12:21:04 +03:00 |
|
|
|
91c4e454c5
|
add loggers
|
2022-05-20 18:24:41 +03:00 |
|
|
|
a585a425bc
|
fix
|
2022-05-20 17:02:09 +03:00 |
|
|
|
75da995099
|
Merge branch 'develop' into feature/logger-refactoring
|
2022-05-20 17:01:51 +03:00 |
|
|
|
f5baafdfa2
|
Merge pull request #649 from ONLYOFFICE/feature/logger-Feed.Aggregator
Feature/logger feed.aggregator
|
2022-05-20 16:21:18 +03:00 |
|
|
|
cc807b3ba0
|
Merge pull request #647 from ONLYOFFICE/feature/logger-Data.Backup.Core
Feature/logger data.backup.core
|
2022-05-20 16:20:39 +03:00 |
|
|
|
ac9b82dba4
|
Merge pull request #645 from ONLYOFFICE/feature/logger-ClearEvents
Feature/logger clear events
|
2022-05-20 16:18:59 +03:00 |
|
|
|
3911d4837b
|
fix
|
2022-05-20 16:07:47 +03:00 |
|
|
|
a47c33f950
|
fix
|
2022-05-20 15:53:38 +03:00 |
|
|
|
7bc2d18b79
|
fix
|
2022-05-20 15:47:32 +03:00 |
|
|
|
cb525d4929
|
Merge pull request #654 from ONLYOFFICE/feature/logger-MessagingSystem
logger-MessagingSystem
|
2022-05-19 17:20:04 +03:00 |
|
|
|
d6eed4b8d7
|
Merge pull request #644 from ONLYOFFICE/feature/logger-AuditTrail
Feature/logger audit trail
|
2022-05-19 15:57:06 +03:00 |
|
|
|
0096efcd04
|
Merge pull request #657 from ONLYOFFICE/feature/logger-TelegramService
Feature/logger telegram service
|
2022-05-19 15:54:30 +03:00 |
|
|
|
d9da7c8773
|
Merge pull request #643 from ONLYOFFICE/feature/logger-Api.Core
logger-Api.Core
|
2022-05-19 15:49:36 +03:00 |
|
|
|
f94409cc7c
|
Merge pull request #655 from ONLYOFFICE/feature/logger-Notify
logger-Notify
|
2022-05-19 14:47:16 +03:00 |
|
|
|
8d25b80ce0
|
Merge pull request #653 from ONLYOFFICE/feature/logger-IPSecurity
Feature/logger ip security
|
2022-05-19 14:07:52 +03:00 |
|
|
|
e602d183ab
|
Merge pull request #646 from ONLYOFFICE/feature/logger-Data.Backup.BackgroundTasks
Feature/logger data.backup.background tasks
|
2022-05-19 13:41:57 +03:00 |
|
|
|
f0fc4cce50
|
Merge pull request #648 from ONLYOFFICE/feature/logger-EventBus.RabbitMQ
Feature/logger event bus.rabbit mq
|
2022-05-19 13:24:25 +03:00 |
|
|
|
cff4f0188b
|
migrate from MemoryCache.Default to IMemoryCache
|
2022-05-18 19:07:09 +03:00 |
|
Nikita
|
bb23b167a0
|
fix
|
2022-05-18 14:32:42 +03:00 |
|
Nikita
|
b1ad63cdac
|
fix
|
2022-05-18 13:54:13 +03:00 |
|
Nikita
|
77e435ede3
|
fix
|
2022-05-18 13:50:39 +03:00 |
|
Nikita
|
b76b97af89
|
Merge branch 'develop' into feature/LDAP-new
|
2022-05-18 13:38:00 +03:00 |
|
Nikita
|
6451ac6329
|
fix
|
2022-05-18 13:36:35 +03:00 |
|
|
|
addf33bf5a
|
telegram: remove cache from dao
|
2022-05-17 21:57:18 +03:00 |
|
|
|
16cc806615
|
telegram: separate integration event
|
2022-05-17 20:53:46 +03:00 |
|
|
|
7e6f8db8d9
|
telegram: update dependency
|
2022-05-17 18:27:34 +03:00 |
|
|
|
36855d656f
|
remove application/x-www-form-urlencoded
|
2022-05-17 12:29:24 +03:00 |
|
|
|
2e33540486
|
Merge branch 'feature/docspace' into feature/docspace-links
|
2022-05-17 11:53:37 +03:00 |
|
|
|
6c45bb0632
|
Merge branch 'develop' into feature/docspace
|
2022-05-17 11:50:56 +03:00 |
|
|
|
92f5ccba89
|
fix
|
2022-05-17 11:49:25 +03:00 |
|
|
|
d2a8ebf771
|
added force save, refactor
|
2022-05-16 20:19:41 +03:00 |
|
|
|
0b92150d57
|
added data check, added audit
|
2022-05-16 20:19:02 +03:00 |
|
|
|
46e164d490
|
added config settings
|
2022-05-16 20:18:25 +03:00 |
|
|
|
693083a607
|
refactor
|
2022-05-16 20:18:15 +03:00 |
|
|
|
be97647bf6
|
Merge branch 'feature/logger-refactoring' into feature/logger-Webhooks.Service
|
2022-05-16 14:35:24 +03:00 |
|
|
|
2691046623
|
Merge branch 'feature/logger-refactoring' into feature/logger-TelegramService
|
2022-05-16 14:25:58 +03:00 |
|
|
|
6c21c4f3a5
|
Merge branch 'feature/logger-refactoring' into feature/logger-MessagingSystem
|
2022-05-16 14:24:18 +03:00 |
|
|
|
deb81c8549
|
Merge branch 'feature/logger-refactoring' into feature/logger-Notify
|
2022-05-16 14:22:29 +03:00 |
|
|
|
e6fbb9754c
|
Merge branch 'feature/logger-refactoring' into feature/logger-IPSecurity
|
2022-05-16 14:00:49 +03:00 |
|
|
|
8cd7379267
|
Merge branch 'feature/logger-refactoring' into feature/logger-Feed.Aggregator
|
2022-05-16 13:54:13 +03:00 |
|
|
|
2debdb8002
|
Merge branch 'feature/logger-refactoring' into feature/logger-EventBus.RabbitMQ
|
2022-05-16 13:52:38 +03:00 |
|
|
|
d2cb785f9c
|
Merge branch 'feature/logger-refactoring' into feature/logger-ClearEvents
|
2022-05-16 13:42:54 +03:00 |
|
|
|
b689a80f72
|
Merge branch 'feature/logger-refactoring' into feature/logger-AuditTrail
|
2022-05-16 13:41:22 +03:00 |
|
|
|
3707071b63
|
Merge branch 'feature/logger-refactoring' into feature/logger-Api.Core
|
2022-05-16 13:37:20 +03:00 |
|
|
|
e1d1b88ff1
|
Merge branch 'feature/logger-refactoring' into feature/logger-Data.Backup.BackgroundTasks
|
2022-05-16 13:18:33 +03:00 |
|
|
|
e0805749ad
|
fix
|
2022-05-16 13:13:07 +03:00 |
|
|
|
223218627f
|
Merge branch 'feature/logger-refactoring' into feature/logger-Data.Backup.Core
|
2022-05-16 13:12:42 +03:00 |
|
|
|
901e82b3af
|
add warnings
|
2022-05-16 13:12:11 +03:00 |
|
|
|
ab4fdcc367
|
add loggers
|
2022-05-16 11:11:20 +03:00 |
|
|
|
018e77258f
|
added room inviting
|
2022-05-15 23:19:03 +03:00 |
|
|
|
b8ab214ad0
|
Api: added access
|
2022-05-15 18:33:42 +03:00 |
|
|
|
d820284491
|
Api: added query parsing
|
2022-05-15 18:13:23 +03:00 |
|
|
|
d0525e298c
|
thumbnails, notify, telegram: migrate from ICacheNotify to EventBus
|
2022-05-13 22:14:00 +03:00 |
|
|
|
df001101d3
|
Web: Translations: Add exception for windows-1250
|
2022-05-13 19:40:01 +03:00 |
|
|
|
95891a21dd
|
Web: Translations: Add exception for FormGallery.json
|
2022-05-13 19:37:52 +03:00 |
|
|
|
025d13557d
|
added a secure link to invite to the portal
|
2022-05-13 19:25:28 +03:00 |
|
|
|
f4727b411e
|
Test: fix
|
2022-05-13 18:08:30 +03:00 |
|
|
|
fdcdefc0ea
|
Web: Translations: Fix TranslationsEncodingTest issues (iso-8859-13)
|
2022-05-13 14:49:08 +03:00 |
|
|
|
14f25c2da7
|
Test: fix
|
2022-05-13 14:48:51 +03:00 |
|
|
|
5d9fc17f6a
|
add loggers
|
2022-05-13 14:35:39 +03:00 |
|
|
|
c9c6506060
|
ASC.Data.Backup.BackgroundTasks: refactoring
|
2022-05-13 14:34:57 +03:00 |
|
|
|
c8caf631e9
|
add logger
|
2022-05-13 14:02:39 +03:00 |
|
|
|
5f75774729
|
add loggers
|
2022-05-13 13:47:01 +03:00 |
|
|
|
41e8bd87ce
|
add loggers
|
2022-05-13 13:36:04 +03:00 |
|
|
|
969c037d3c
|
Merge branch 'develop' into feature/fix-tests
|
2022-05-13 12:27:30 +03:00 |
|
Nikita
|
787a1ba172
|
fix
|
2022-05-13 12:20:28 +03:00 |
|
|
|
d13ec55287
|
ResourceManager: fix
|
2022-05-12 18:34:43 +03:00 |
|
|
|
e9be6684ae
|
Resources: fixed projects
|
2022-05-12 18:32:39 +03:00 |
|
|
|
8f1d3a0d1e
|
dbcontext: EnableRetryOnFailure for MySQL provider
|
2022-05-12 17:20:05 +03:00 |
|
|
|
df1654ac3f
|
Audit: Resources
|
2022-05-12 13:40:23 +03:00 |
|
|
|
e172f1b818
|
Notify: Resources
|
2022-05-12 13:33:04 +03:00 |
|
|
|
40fd24a257
|
Resources: backup
|
2022-05-12 13:22:59 +03:00 |
|
|
|
4ff9fcd55a
|
add loggers
|
2022-05-11 18:45:37 +03:00 |
|
|
|
5d2946b47f
|
Files: fix mapping
|
2022-05-11 17:16:23 +03:00 |
|
|
|
6e39488231
|
add loggers
|
2022-05-11 16:06:29 +03:00 |
|
|
|
bcb7e9c3e7
|
add loggers
|
2022-05-06 18:49:06 +03:00 |
|
|
|
62ff18ef7d
|
public to internal
|
2022-05-06 14:02:53 +03:00 |
|
|
|
41926b6de8
|
public to internal
|
2022-05-06 14:02:16 +03:00 |
|
|
|
525967672b
|
add loggers
|
2022-05-06 13:38:26 +03:00 |
|
|
|
2156e1f847
|
add loggers
|
2022-05-06 12:40:38 +03:00 |
|
|
|
fe6fc6ad16
|
add logger
|
2022-05-06 11:41:33 +03:00 |
|
|
|
89d43fa927
|
add loggers
|
2022-05-06 11:35:07 +03:00 |
|
|
|
f195f7113c
|
add loggers
|
2022-05-06 11:23:18 +03:00 |
|
|
|
92c6844810
|
fix
|
2022-05-06 10:58:15 +03:00 |
|
|
|
bd7d9ba8cf
|
Web: Files: Added socket event ("s:modify-folder->update") on thumbnail creation on Server
|
2022-05-05 21:20:44 +03:00 |
|
|
|
0b63b5eba6
|
replace commonLogger
|
2022-05-05 17:53:14 +03:00 |
|
|
|
b4ed3ecef4
|
add loggers in core.common
|
2022-05-05 17:13:47 +03:00 |
|
|
|
ca3a49c25b
|
fix 56849
|
2022-05-05 17:07:24 +03:00 |
|
Vashchuk Nikita
|
11ac66a1e0
|
refactoring
|
2022-05-05 16:23:05 +03:00 |
|
|
|
68f949f2e7
|
Files: added link generation
|
2022-05-05 15:31:04 +03:00 |
|
|
|
07909736c3
|
Merge branch 'develop' into feature/docspace
|
2022-04-29 16:49:18 +03:00 |
|
|
|
cf0e9c322d
|
ElasticSearch: fix
|
2022-04-29 16:17:52 +03:00 |
|
|
|
3d2c055551
|
Files: added audit for room
|
2022-04-29 14:15:22 +03:00 |
|
|
|
7280772aef
|
logging optimization
|
2022-04-28 18:53:28 +03:00 |
|
|
|
503672e6b2
|
Merge branch 'develop' into feature/docspace
|
2022-04-28 15:45:09 +03:00 |
|
|
|
b6fe254379
|
Files: docspace default enabled
|
2022-04-28 12:40:17 +03:00 |
|
|
|
89059cf32e
|
Structured Logging
|
2022-04-28 12:15:33 +03:00 |
|
Vashchuk Nikita
|
4cab782bc8
|
Merge branch 'develop' into feature/LDAP-new
# Conflicts:
# ASC.Web.sln
# common/ASC.Common/Security/Cryptography/InstanceCrypto.cs
# common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Api/Controllers/AuthenticationController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Program.cs
# web/ASC.Web.Api/Startup.cs
|
2022-04-28 09:41:09 +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 |
|
|
|
fe39f4d398
|
fix namespaces
|
2022-04-26 21:34:27 +03:00 |
|
|
|
13bbce8ea4
|
Custom logger replaced with Microsoft.Extensions.Logging
|
2022-04-26 20:53:48 +03:00 |
|
Vashchuk Nikita
|
a4e9cae742
|
changed work with disturbedTask
|
2022-04-26 17:03:41 +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 |
|
|
|
fd9dc93fe6
|
Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
# config/kafka.json
|
2022-04-21 18:54:28 +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 |
|
|
|
301e70e605
|
Api: added continue, suspend, delete portal methods
|
2022-04-21 12:35:51 +03:00 |
|
Timofey Boyko
|
00df2ec2b6
|
Merge branch 'develop' into feature/virtual-rooms-1.2
|
2022-04-20 17:27:27 +03:00 |
|
|
|
6c28b6777d
|
added DarkThemeSettings
|
2022-04-20 17:19:06 +03:00 |
|
|
|
3e4e293775
|
Api: downgrade AspNetCore.HealthChecks.Elasticsearch, because we need to use Nest 7.10
|
2022-04-19 13:48:11 +03:00 |
|
|
|
01d7a7c095
|
CustomHealthCheck: try, catch
|
2022-04-19 11:35:00 +03:00 |
|
|
|
6614b67b3d
|
Merge branch 'develop' into feature/virtual-rooms-1.2
|
2022-04-15 17:44:17 +03:00 |
|
|
|
9f1e7cc3b0
|
IPRestrictionsRepository: fix cache
|
2022-04-15 16:58:41 +03:00 |
|
Timofey Boyko
|
bde27048dc
|
Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-15 13:42:50 +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 |
|
|
|
5613f55ea6
|
fixed warnings
|
2022-04-14 16:52:51 +03:00 |
|
