|
d1f7d41a57
|
Merge branch 'feature/backend-refactor' into feature/asc-audit-trail-refactor
# Conflicts:
# common/ASC.Api.Core/GlobalUsings.cs
# common/ASC.Core.Common/EF/Context/MessagesContext.cs
# common/ASC.MessagingSystem/DbSender/MessagesRepository.cs
# common/services/ASC.AuditTrail/AuditEventsRepository.cs
# common/services/ASC.AuditTrail/LoginEventsRepository.cs
# common/services/ASC.AuditTrail/Mappers/AuditActionMapper.cs
# common/services/ASC.AuditTrail/Mappers/CrmActionMapper.cs
# common/services/ASC.AuditTrail/Mappers/DocumentsActionMapper.cs
# common/services/ASC.AuditTrail/Mappers/LoginActionMapper.cs
# common/services/ASC.AuditTrail/Mappers/OthersActionMapper.cs
# common/services/ASC.AuditTrail/Mappers/PeopleActionMapper.cs
# common/services/ASC.AuditTrail/Mappers/ProjectsActionMapper.cs
# common/services/ASC.AuditTrail/Mappers/SettingsActionMapper.cs
# common/services/ASC.ClearEvents/ClearEventsServiceLauncher.cs
|
2022-02-10 21:54:45 +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 |
|
|
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 |
|
|
812241a69a
|
Analyzers: fix
|
2022-02-07 17:53:58 +03:00 |
|
|
c67c5e80e2
|
Merge branch 'feature/backend-refactor' into feature/asc-audit-trail-refactor
|
2022-02-04 23:20:49 +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 |
|
|
3ad4ba6c08
|
fix after merge
|
2022-02-03 16:53:34 +03:00 |
|
|
e6665bb8c9
|
Merge branch 'feature/refactoring' into feature/asc-audit-trail-refactor
|
2022-02-03 16:46:17 +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 |
|
|
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 |
|
|
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 |
|
|
55a9310744
|
refactoring: add globalusings: web.api
|
2022-01-31 18:13:08 +03:00 |
|
|
7ab885b2e2
|
refactoring: bugfix
|
2022-01-31 16:56:30 +03:00 |
|
|
17cb4a647b
|
analizators: bugfix
|
2022-01-31 14:35:59 +03:00 |
|
|
34ff334692
|
Merge branch 'develop' into feature/analizators
|
2022-01-31 14:35:16 +03:00 |
|
|
01831ad0b6
|
refactoring: add globalusings: web.studio
|
2022-01-31 11:33:18 +03:00 |
|
|
0f6ec5f532
|
refactoring: add globalusings: web.healthChecks.ui
|
2022-01-31 11:31:43 +03:00 |
|
|
cefa25a391
|
refactoring: add globalusings: web.core
|
2022-01-31 11:30:08 +03:00 |
|
|
1908af64f0
|
cache: return support kafka. refactoring
|
2022-01-27 15:20:51 +03:00 |
|
|
445f03097d
|
Fix content-type header
|
2022-01-24 22:44:18 +03:00 |
|
|
fce8d26cef
|
analizators/ca1507
|
2022-01-24 13:49:00 +03:00 |
|
|
fb3a61d0d2
|
analizators/s3442
|
2022-01-24 12:57:01 +03:00 |
|
|
667697f933
|
analizators/s2259
|
2022-01-21 16:46:30 +03:00 |
|
|
510bd4d731
|
analizators/s2219
|
2022-01-21 16:42:02 +03:00 |
|
|
f3d8b8d17a
|
analizators/s1854
|
2022-01-21 16:36:36 +03:00 |
|
|
2f5a70e6ef
|
analizators/s1940
|
2022-01-21 16:27:09 +03:00 |
|
|
fb65d3a09d
|
analizators/1481
|
2022-01-21 16:15:15 +03:00 |
|
|
3d635a4824
|
analizators/1643
|
2022-01-21 16:12:05 +03:00 |
|
|
2029c34f9c
|
analizators/s1121
|
2022-01-21 14:02:17 +03:00 |
|
|
cd12b41cc6
|
analizators/s1125
|
2022-01-21 14:01:52 +03:00 |
|
|
473259657e
|
analizators/s1118
|
2022-01-21 13:47:56 +03:00 |
|
|
32c398c044
|
Web: Tests: Added opportunity to sort translation files by Key with new Configurations -> SORT in VS
|
2022-01-21 12:53:29 +03:00 |
|
|
728c1b896e
|
analizators/s1104
|
2022-01-21 12:19:57 +03:00 |
|
|
bf3b0395a5
|
analizators/s1116
|
2022-01-21 11:04:08 +03:00 |
|
|
5f78b37e25
|
analizators/U2U1000
|
2022-01-20 12:28:48 +03:00 |
|
|
eb9a33c660
|
analizators/s3218
|
2022-01-20 11:36:56 +03:00 |
|
|
3f28dfe78a
|
analizators/s3237
|
2022-01-20 11:36:42 +03:00 |
|
|
f2e33fa4aa
|
analizators/s2365
|
2022-01-19 18:16:59 +03:00 |
|
|
25050cb5fd
|
analizators/s2223
|
2022-01-19 17:16:15 +03:00 |
|
|
85f1660b39
|
analizators/U2U1203
|
2022-01-19 13:46:21 +03:00 |
|
|
20b60958a8
|
analizators/U2U1022
|
2022-01-19 13:24:11 +03:00 |
|
|
fbb50e676e
|
analizators/U2U1202
|
2022-01-19 12:51:30 +03:00 |
|