Commit Graph

16134 Commits

Author SHA1 Message Date
6693d56846 refactoring: update globalUsings 2022-02-11 13:36:06 +03:00
05d0fd89ed Merge branch 'feature/backend-refactor' into feature/refactoring-healthChecks.UI 2022-02-11 13:35:38 +03:00
de6bc3da35
Merge pull request #508 from ONLYOFFICE/feature/asc-clear-events-refactor
Feature/asc clear events refactor
2022-02-10 18:35:23 +03:00
0a1c864c4e ClearEvents: fix dispose 2022-02-10 18:10:43 +03:00
ebcb6807ae Merge branch 'feature/backend-refactor' into feature/asc-clear-events-refactor
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/services/ASC.ClearEvents/ClearEventsServiceLauncher.cs
#	common/services/ASC.ClearEvents/Program.cs
2022-02-10 17:15:32 +03:00
9025dcc0a3 Merge branch 'develop' into feature/backend-refactor 2022-02-10 16:55:19 +03:00
77e14da218 fixed tests 2022-02-10 16:24:55 +03:00
946fea8098
Merge pull request #507 from ONLYOFFICE/feature/asc-api-core-refactor
Feature/asc api core refactor
2022-02-10 15:52:35 +03:00
599b5b9a73 ApiCore: removed 's' prefix 2022-02-10 15:10:27 +03:00
fca62cfa28 Merge branch 'feature/backend-refactor' into feature/asc-api-core-refactor 2022-02-10 14:01:51 +03:00
c20a470508 People: fix 2022-02-10 14:00:53 +03:00
5022501e58 Merge branch 'feature/backend-refactor' into feature/asc-api-core-refactor
# Conflicts:
#	common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
#	common/ASC.Api.Core/Auth/CookieAuthHandler.cs
#	common/ASC.Api.Core/Core/ApiContext.cs
#	common/ASC.Api.Core/Core/ApiDateTime.cs
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Api.Core/Core/CustomHealthCheck.cs
#	common/ASC.Api.Core/Middleware/ProductSecurityFilter.cs
#	common/ASC.Api.Core/Middleware/TenantStatusFilter.cs
#	common/ASC.Api.Core/Model/EmployeeWraperFull.cs
#	common/ASC.Api.Core/Routing/FormatRoute.cs
2022-02-10 13:56:54 +03:00
320a1f2250 Merge branch 'develop' into feature/backend-refactor
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Common/Caching/AscCache.cs
#	common/ASC.Common/Data/StreamExtension.cs
#	common/ASC.Common/Utils/RandomString.cs
#	common/ASC.Core.Common/Billing/CouponManager.cs
#	common/ASC.Core.Common/Billing/License/LicenseReader.cs
#	common/ASC.Core.Common/Core/UserGroupRef.cs
#	common/ASC.Core.Common/Data/DbTenantService.cs
#	common/ASC.Core.Common/Notify/Jabber/JabberServiceClientWcf.cs
#	common/ASC.Core.Common/Notify/Telegram/Dao/CachedTelegramDao.cs
#	common/ASC.Data.Backup.Core/Core/DbHelper.cs
#	common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
#	common/ASC.Data.Backup.Core/Tasks/Data/TableInfo.cs
#	common/ASC.Data.Storage/BaseStorage.cs
#	common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.Notify.Textile/JabberStyler.cs
#	common/ASC.Textile/Blocks/GlyphBlockModifier.cs
#	common/ASC.Textile/States/TableRowFormatterState.cs
#	common/services/ASC.ApiSystem/Classes/CommonMethods.cs
#	common/services/ASC.ApiSystem/Controllers/PortalController.cs
#	common/services/ASC.ClearEvents/Program.cs
#	common/services/ASC.TelegramService/Startup.cs
#	common/services/ASC.UrlShortener.Svc/Program.cs
#	products/ASC.Files/Core/Core/Entries/File.cs
#	products/ASC.Files/Core/Core/Entries/FileEntry.cs
#	products/ASC.Files/Core/Core/Entries/FileHelper.cs
#	products/ASC.Files/Core/Core/Entries/Folder.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
#	products/ASC.Files/Core/Helpers/ThirdpartyConfiguration.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceConnector.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	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/FileDataProvider.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Core/Files/DocumentService.cs
#	web/ASC.Web.Core/Files/DocumentServiceLicense.cs
#	web/ASC.Web.Core/QuotaSync.cs
#	web/ASC.Web.Core/Sms/SmsKeyStorage.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
#	web/ASC.Web.HealthChecks.UI/Program.cs
#	web/ASC.Web.Studio/Startup.cs
2022-02-10 13:16:33 +03:00
b6d98a8227
Merge pull request #516 from ONLYOFFICE/bugfix/U2U1100
Bugfix/u2u1100
2022-02-09 13:35:54 +03:00
147377ab65 bugfix: crash when string == null 2022-02-09 13:32:01 +03:00
e3e43669ee ClearEvents: add braces 2022-02-08 12:59:22 +03:00
60a4f7c9ab ClearEvents: fix 2022-02-08 12:07:07 +03:00
b1be9953ad fixed solution build 2022-02-07 22:15:32 +03:00
08c6040787
Merge pull request #503 from ONLYOFFICE/feature/analizators
Feature/analizators
2022-02-07 20:27:17 +03:00
b2079ccace fixed warnings 2022-02-07 20:19:58 +03:00
9f5a1f3ba7 Merge branch 'develop' into feature/analizators 2022-02-07 19:28:23 +03:00
179c8ddb84 ApiCore: single line expressions replaced by expressions with braces 2022-02-07 19:03:16 +03:00
37c88dad50 Analyzers: fix 2022-02-07 18:10:27 +03:00
812241a69a Analyzers: fix 2022-02-07 17:53:58 +03:00
bcb7005ce6 ClearEvents: add using 2022-02-07 17:07:48 +03:00
69c20291cc ClearEvents: add service 2022-02-07 17:07:36 +03:00
da19146381 ClearEvents: rename TimedClearEventsService to ClearEventsService 2022-02-07 17:07:22 +03:00
9e583e60cb add AuditEvents dbset and model configuration 2022-02-07 17:06:25 +03:00
e00657439d ClearEvents: add events context 2022-02-07 17:06:00 +03:00
42bcb87eeb fixed the inability to create a folder named data in projects 2022-02-07 17:05:12 +03:00
03f0eedf3a Merge branch 'feature/backend-refactor' into feature/asc-clear-events-refactor 2022-02-04 23:24:40 +03:00
a913fa4589 Merge branch 'feature/backend-refactor' into feature/asc-api-core-refactor 2022-02-04 23:16:18 +03:00
8a90ccc30b
Merge pull request #504 from ONLYOFFICE/feature/refactoring
Feature/refactoring
2022-02-04 22:42:16 +03:00
e16d75839a Merge branch 'develop' of github.com:ONLYOFFICE/CommunityServer-AspNetCore into develop 2022-02-04 21:00:05 +03:00
eed733b83c fixed user photo thumbnail generator 2022-02-04 20:59:58 +03:00
7fddbbcd93 ApiCore: rename private static fileds by microsoft convention 2022-02-04 11:34:32 +03:00
bd674080fe refactoring: healthChecks 2022-02-03 17:08:54 +03:00
487a55a99e ApiCore: used file-scope namespaces, fix conflicts 2022-02-03 16:19:48 +03:00
524fb32a0d Merge branch 'feauter/refactoring' into feauter/asc-api-core-refactor 2022-02-03 16:08:15 +03:00
19fb0a50da refactoring: delete rule 2022-02-03 15:19:53 +03:00
62c8f69f25 Merge branch 'feature/refactoring' into 'feature/asc-clear-events-refactor' 2022-02-03 15:16:05 +03:00
b5e4d68550 ClearEvents: used file-scope namespaces 2022-02-03 14:54:31 +03:00
9f670d2b25 ClearEvents: add waiting for the end of the timer 2022-02-03 14:53:23 +03:00
34dab043e0 Merge branch 'develop' into feature/analizators
# Conflicts:
#	common/ASC.Core.Common/ASC.Core.Common.csproj
2022-02-03 12:55:33 +03:00
4661ee96d0 Packages updated 2022-02-02 19:54:23 +03:00
bb28679fdf analizators: bugfix 2022-02-02 14:05:06 +03:00
c2d3d10ec5 refactoring : bugfix 2022-02-02 13:09:37 +03:00
f6620e34ae Merge branch 'develop' into feature/refactoring 2022-02-02 13:09:25 +03:00
5a71df17d3 refactoring: bugfix 2022-02-02 12:02:49 +03:00
084e3a8d30 ApiCore: IServiceProvider replaced by IServiceScopeFactory 2022-02-01 20:07:26 +03:00