|
|
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 |
|
|
|
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 |
|
|
|
93506010b8
|
ASC.AuditTrail: refactoring
|
2022-02-08 15:00:07 +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 |
|
|
|
45b6e59350
|
AuditTrail: add braces
|
2022-02-08 03:11:22 +03:00 |
|
|
|
d591a6e129
|
AuditTrail: add using
|
2022-02-08 03:08:46 +03:00 |
|
|
|
f094094abf
|
AuditTrail: change mapping, change select
|
2022-02-08 03:08:35 +03:00 |
|
|
|
797208c5e7
|
AuditTrail: model simplification
|
2022-02-08 03:07:55 +03:00 |
|
|
|
9fcf703c76
|
AuditTrail: change mapping
|
2022-02-08 03:07:34 +03:00 |
|
|
|
4e497e4764
|
AuditTrail: add events type converter
|
2022-02-08 03:05:45 +03:00 |
|
|
|
f7eda83bb0
|
AuditTrail: delete unnecessary
|
2022-02-08 03:05:25 +03:00 |
|
|
|
3c4cf0f62e
|
resolve property name for mapping
|
2022-02-08 03:04:49 +03:00 |
|
|
|
09e46f52d5
|
resolve property name for mapping
|
2022-02-08 03:04:33 +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 |
|
|
|
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 |
|
|
|
8c203b07c2
|
rename intermediate model
|
2022-02-04 12:18:22 +03:00 |
|
|
|
07bb12ac43
|
rename db model
|
2022-02-04 12:16:04 +03:00 |
|
|
|
1858db9132
|
rename db model
|
2022-02-04 12:15:54 +03:00 |
|
|
|
7fddbbcd93
|
ApiCore: rename private static fileds by microsoft convention
|
2022-02-04 11:34:32 +03:00 |
|
|
|
3ad4ba6c08
|
fix after merge
|
2022-02-03 16:53:34 +03:00 |
|
