Commit Graph

2405 Commits

Author SHA1 Message Date
0a27a98511 Merge branch 'develop' into feature/get-thumbnail-from-thirdparty 2022-06-21 10:52:53 +03:00
03e756277b fixed warnings 2022-06-20 17:01:59 +03:00
e68ac70005 Merge branch 'develop' into feature/docspace 2022-06-20 12:15:08 +03:00
e2cee2c2fc Merge branch 'release/v1.2' into develop
# Conflicts:
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
#	common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.FederatedLogin/OAuth20Token.cs
#	common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
#	common/ASC.Resource.Manager/Program.cs
#	common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
#	config/appsettings.json
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Security/ISecurityDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/ThumbnailSettings.cs
#	products/ASC.Files/Core/Helpers/Global.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
#	products/ASC.Files/Core/Model/SessionModel.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.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/FileDownloadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/IThirdPartyApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/Token.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.Files/Core/Utils/FileUploader.cs
#	products/ASC.Files/Core/Utils/SocketManager.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/DocStore
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.Files/Server/Startup.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.Files/Service/Thumbnail/Worker.cs
#	products/ASC.People/Server/ASC.People.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Core/PublicResources/CustomModeResource.Designer.cs
#	web/ASC.Web.Core/PublicResources/Resource.Designer.cs
#	web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs
#	web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
#	web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
#	web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
2022-06-19 22:44:48 +03:00
72b0a81f51 fix 2022-06-17 20:51:01 +03:00
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
945e9d8efe moved from ddf515b8 2022-06-17 18:46:16 +03:00
29d3bb3fee Merge branch 'develop' into feature/get-thumbnail-from-thirdparty 2022-06-17 13:18:03 +03:00
0fbe11ed1c Merge branch 'develop' into feature/docspace 2022-06-17 10:26:51 +03:00
b62ba1d729 fix tests 2022-06-17 10:17:17 +03:00
dad4b12985 Files: refactor 2022-06-16 18:35:54 +03:00
39e7b28005 Files: refactor 2022-06-16 18:26:53 +03:00
56ece27e1b moved from ddf515b8 2022-06-16 17:16:46 +03:00
c9fb0d3dac moved from ddf515b8 2022-06-16 11:13:53 +03:00
Vashchuk Nikita
c1097acbb8 fix static, braces, log 2022-06-15 15:39:37 +03:00
f3f3ed96ae moved from ddf515b8 2022-06-15 12:46:21 +03:00
35bebe49f9 moved from ddf515b8 2022-06-14 11:11:41 +03:00
4682001699 People: fix System.NullReferenceException 2022-06-10 22:28:50 +03:00
6624a7e7f6 Web: Translations: Added new excludes for DublicatesFilesByMD5HashTest 2022-06-10 12:33:17 +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
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
b693779ea1 Merge branch 'develop' into feature/docspace-pin 2022-06-08 16:38:16 +03:00
02b4031ba0 fix Bug 57463 2022-06-08 12:53:33 +03:00
Vashchuk Nikita
8410299051 modified logging 2022-06-08 12:42:49 +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
cd4540eaee update spellcheck-excludes.json 2022-06-03 16:32:35 +03:00
a0729a8084 thumbnail: first version
add from google and dropbox
2022-06-03 10:41:05 +03:00
57df81aa76 Files: added logo audit, fix 2022-06-03 01:27:56 +03:00
b6e82bd7c9 moved from ddf515b8 2022-06-02 19:24:28 +03:00
9bc7e84eab update spellcheck-excludes.json 2022-06-02 18:41:24 +03:00
6b2ba0d4ed moved from ddf515b8 2022-06-02 15:42:45 +03:00
a8f8ebdd48 update spellcheck-excludes.json 2022-06-02 13:20:53 +03:00
34370cf6e2 fix socketio 2022-06-01 20:24:50 +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
460d9e4ad5 update spellcheck-excludes.json 2022-05-31 18:36:08 +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
30b89d1ae0 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-30 17:18:53 +03:00
df35cef4a6 update spellcheck-excludes.json 2022-05-30 17:17:38 +03:00
bfdae07b28 Web: Translations: SpellCheck: Added support of additional dictionaries: lo_LA 2022-05-30 16:44:41 +03:00
d7967854d9 Web: Translations: SpellCheck: Added support of additional dictionaries: fi_FI 2022-05-30 15:45:31 +03:00
e4a8c11602 Merge branch 'develop' into feature/LDAP-new 2022-05-30 14:20:46 +03:00
883391eff0 update spellcheck-excludes.json 2022-05-27 17:25:53 +03:00
0208f8f39d update spellcheck-excludes.json 2022-05-27 16:13:35 +03:00
b0e8fd14dc update spellcheck-excludes.json 2022-05-27 14:07:53 +03:00
3f217af868 fix 57264 2022-05-26 22:00:09 +03:00
918449e650 update spellcheck-excludes.json 2022-05-26 19:21:10 +03:00
2b076f1c50 update spellcheck-excludes.json 2022-05-26 14:59:22 +03:00
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