|
9025dcc0a3
|
Merge branch 'develop' into feature/backend-refactor
|
2022-02-10 16:55:19 +03:00 |
|
|
53237d8c6f
|
ElasticSearch: used file-scoped namespaces
|
2022-02-10 16:45:41 +03:00 |
|
|
cd879ed2a7
|
ElasticSearch: used TimedHostedService template
|
2022-02-10 16:34:47 +03:00 |
|
|
77e14da218
|
fixed tests
|
2022-02-10 16:24:55 +03:00 |
|
|
20bb3fb8ff
|
ElasticSearch: add braces
|
2022-02-10 16:24:25 +03:00 |
|
|
a5268d3d8f
|
ElasticSearch: reordered methods according to access modifier, cosmetic changes
|
2022-02-10 16:14:03 +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 |
|
|
45d7c1d44e
|
ElasticSearch: removed 's' prefix
|
2022-02-10 15:42:49 +03:00 |
|
|
359d5efe8d
|
Storage: removed 's' prefix
|
2022-02-10 15:34:26 +03:00 |
|
|
d1b9e56c5d
|
BackupCore: removed 's' prefix
|
2022-02-10 15:29:49 +03:00 |
|
|
a06903129e
|
Common: removed 's' prefix
|
2022-02-10 15:14:50 +03:00 |
|
|
599b5b9a73
|
ApiCore: removed 's' prefix
|
2022-02-10 15:10:27 +03:00 |
|
|
402dedb49b
|
ElasticSearch: private properties replaced by private fileds, used keyword readonly
|
2022-02-10 14:56:13 +03:00 |
|
|
d3d2f85c3b
|
Fix: removed empty space from people product id
|
2022-02-10 14:30:30 +03:00 |
|
|
eea871d58e
|
Fix: removed empty space from people product id
|
2022-02-10 14:29:18 +03:00 |
|
|
4fa4411bf5
|
Reassings: IServiceProvider replaced by IServiceScopeFactory
|
2022-02-10 14:28:03 +03:00 |
|
|
cc8b1ca7c5
|
Storage: used file-scoped namespaces
|
2022-02-10 14:24:16 +03:00 |
|
|
41832fbd73
|
Storage: IServiceProvider replaced by IServiceScopeFactory
|
2022-02-10 14:19:51 +03:00 |
|
|
9156b40eb0
|
Storage: private properties replaced by private fields
|
2022-02-10 14:08:44 +03:00 |
|
|
7a12c6cb13
|
Storage: add braces
|
2022-02-10 14:06:37 +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 |
|
|
460d054156
|
Storage: reordered methods according to access modifier, cosmetic changes
|
2022-02-10 13:43:28 +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 |
|
|
feb147590f
|
Storage: privare properties replaced by private fields, used keyword readonly
|
2022-02-10 12:36:42 +03:00 |
|
|
8866ec8496
|
Reassigns: cosmetic changes
|
2022-02-10 11:44:59 +03:00 |
|
|
48ca316b56
|
Reassigns: add braces
|
2022-02-10 11:42:03 +03:00 |
|
|
dfce1fea42
|
Reassigns: private property replaced by private fields, used readoonly keyword
|
2022-02-10 11:38:35 +03:00 |
|
|
fe80ccb0a4
|
BackupCore: removed unused fields
|
2022-02-10 10:49:04 +03:00 |
|
|
85f9055eb2
|
BackupCore: used file-scoped namespaces
|
2022-02-09 21:49:52 +03:00 |
|
|
0fc1f2f67b
|
BackupCore: IServiceProvider replaced by IServiceScopeFactory
|
2022-02-09 21:43:11 +03:00 |
|
|
bfbebf9733
|
BackupCore: cosmetic changes
|
2022-02-09 21:33:50 +03:00 |
|
|
dfce143db0
|
BackupCore: add braces
|
2022-02-09 19:46:09 +03:00 |
|
|
b3acf9ac9a
|
BackupCore: private properties replaced by with private fields, used keyword readonly
|
2022-02-09 19:29:19 +03:00 |
|
|
dd51f8ac36
|
BackupCore: removed empty lines
|
2022-02-09 18:27:14 +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 |
|
|
6314251a59
|
Common: add braces
|
2022-02-08 14:20:50 +03:00 |
|
|
3bf8c338f6
|
Common: delete unnecessary scopefactory
|
2022-02-08 14:20:37 +03:00 |
|
|
2e3837fc7d
|
Common: add braces
|
2022-02-08 14:07:28 +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 |
|