|
|
61ec4a18da
|
migrations moved to external projects
|
2022-07-24 16:02:00 +03:00 |
|
Vashchuk Nikita
|
b336eafa37
|
Merge branch 'feature/migrations-fix' of github.com:ONLYOFFICE/AppServer into feature/migrations-fix
# Conflicts:
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20220722192649_VoipDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/PostgreSqlVoipDbContextModelSnapshot.cs
|
2022-07-22 22:40:58 +03:00 |
|
Vashchuk Nikita
|
76cfe882a9
|
fix contexts
|
2022-07-22 22:33:19 +03:00 |
|
Vashchuk Nikita
|
8a1a8b809f
|
fix contexts
|
2022-07-22 22:31:42 +03:00 |
|
|
|
2c98ad88d8
|
fix
|
2022-07-20 19:25:59 +03:00 |
|
|
|
b98524532f
|
Merge branch 'develop' into feature/migrations-fix
# Conflicts:
# common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
# common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20220711152836_VoipDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/MySqlVoipDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/20220711152837_VoipDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/PostgreSqlVoipDbContextModelSnapshot.cs
|
2022-07-19 16:04:29 +03:00 |
|
|
|
d94904b6af
|
removed voip
|
2022-07-18 12:24:12 +03:00 |
|
Vashchuk Nikita
|
6507c4b999
|
Merge branch 'develop' into feature/migrations-fix
# Conflicts:
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
# web/ASC.Web.Core/GlobalUsings.cs
|
2022-07-14 11:56:07 +03:00 |
|
|
|
fd986320f2
|
Api: fixed maildomainsettings
|
2022-07-12 11:47:05 +03:00 |
|
Vashchuk Nikita
|
bc0ad53e8f
|
changed int type to tinyint(1) for bool
|
2022-07-11 18:31:00 +03:00 |
|
Vashchuk Nikita
|
f13263c75a
|
fix contexts after merge
|
2022-07-11 15:43:06 +03:00 |
|
Vashchuk Nikita
|
e49d082fa3
|
Merge branch 'develop' into feature/migrations-fix
# Conflicts:
# common/ASC.Core.Common/EF/Model/Core/Acl.cs
# common/ASC.Core.Common/GlobalUsings.cs
# common/ASC.Core.Common/Messaging/EventMessage.cs
# common/ASC.Core.Common/Messaging/LoginEvent.cs
# common/ASC.Core.Common/Messaging/MessageTarget.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20211012145322_UserDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20220708104402_UserDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/MySqlUserDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/PostgreSql/CoreDbContextPostgreSql/20211012145321_CoreDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/TenantDbContextPostgreSql/20211012145343_TenantDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20211012145323_UserDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20220708104403_UserDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/PostgreSqlUserDbContextModelSnapshot.cs
# common/ASC.Data.Backup.Core/Migrations/MySql/BackupsContextMySql/20220708104422_BackupsContextMySql.Designer.cs
# common/ASC.Data.Backup.Core/Migrations/PostgreSql/BackupsContextPostgreSql/20220708104423_BackupsContextPostgreSql.Designer.cs
# common/ASC.MessagingSystem/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
# common/ASC.MessagingSystem/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
# common/ASC.Resource.Manager/ResourceData.cs
# common/services/ASC.AuditTrail/GlobalUsings.cs
# products/ASC.Files/Core/Core/EF/DbFilesThirdpartyAccount.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
# products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/20211022170841_FilesDbContextPostgreSql.cs
# products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
# web/ASC.Web.Api/GlobalUsings.cs
|
2022-07-11 13:28:49 +03:00 |
|
Vashchuk Nikita
|
4628769136
|
fix Contexts,
fix migrations,
removed MailDbContext.cs,
moved ResourceDbContext.cs
|
2022-07-08 14:24:18 +03:00 |
|
Vashchuk Nikita
|
bdbd6bd65e
|
Recreating and fixing migrations
|
2022-07-01 14:27:28 +03:00 |
|
Vashchuk Nikita
|
71d7638340
|
added CustomMySqlMigrationsSqlGenerator
|
2022-07-01 13:57:40 +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 |
|
|
|
34bc4e143c
|
Push: helper, dao
|
2022-06-15 12:01:07 +03:00 |
|
|
|
9edcce8858
|
moved from ddf515b8
|
2022-06-09 15:11:45 +03:00 |
|
|
|
a861268e4f
|
moved from ddf515b8
|
2022-06-01 17:07:08 +03:00 |
|
|
|
fc94f2f445
|
moved from ddf515b8
|
2022-05-30 19:13:50 +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 |
|
|
|
7e6f8db8d9
|
telegram: update dependency
|
2022-05-17 18:27:34 +03:00 |
|
|
|
d0525e298c
|
thumbnails, notify, telegram: migrate from ICacheNotify to EventBus
|
2022-05-13 22:14:00 +03:00 |
|
|
|
8f1d3a0d1e
|
dbcontext: EnableRetryOnFailure for MySQL provider
|
2022-05-12 17:20:05 +03:00 |
|
|
|
100e581f1c
|
IDE1006
|
2022-03-25 17:54:34 +03:00 |
|
|
|
62fbab1185
|
Merge branch 'feature/backend-refactor' into feature/warnings
|
2022-03-22 13:20:43 +03:00 |
|
|
|
568f427957
|
IDE1006
|
2022-03-17 19:57:02 +03:00 |
|
|
|
6a09cf47e9
|
IDE0044
|
2022-03-17 18:07:17 +03:00 |
|
|
|
65db98f65c
|
added new license headers
|
2022-03-15 21:00:53 +03:00 |
|
|
|
fb83a54871
|
Merge branch 'feature/backend-refactor' into feature/refactoring-VoipService
|
2022-03-05 10:44:39 +03:00 |
|
|
|
4a61f9fce5
|
VoipService: refactor mapping
|
2022-03-04 19:35:12 +03:00 |
|
|
|
d7d7d18ec8
|
voipService: add autoMapper and fix method "GetCallsQuery"
|
2022-02-28 15:43:20 +03:00 |
|
|
|
e6f111f651
|
Merge branch 'feature/backend-refactor' into feature/asc-core-common-refactor
|
2022-02-25 20:16:00 +03:00 |
|
|
|
bdb7672aaf
|
Merge pull request #558 from ONLYOFFICE/feature/asc-notify-refactor
Feature/asc notify refactor
|
2022-02-25 18:19:06 +03:00 |
|
|
|
5a19f21902
|
Merge pull request #559 from ONLYOFFICE/feautre/asc-messaging-system-refactor
Feautre/asc messaging system refactor
|
2022-02-25 17:53:44 +03:00 |
|
|
|
6495da0d0b
|
Merge branch 'feature/backend-refactor' into feature/asc-messaging-system-refactor
|
2022-02-25 16:34:15 +03:00 |
|
|
|
b1e5a6e28b
|
Merge branch 'feature/backend-refactor' into feature/asc-feed-refactor
|
2022-02-25 16:16:56 +03:00 |
|
|
|
6925a83060
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Common/Caching/ICacheNotify.cs
# common/ASC.Common/Caching/KafkaCache.cs
# common/ASC.Common/Caching/MemoryCacheNotify.cs
# common/ASC.Common/Threading/DistributedTaskProgress.cs
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
# common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
# common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
# common/ASC.Data.Backup.Core/Storage/DataStoreBackupStorage.cs
# common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
# common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/DeletePortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/PortalTaskBase.cs
# common/ASC.Data.Backup.Core/Tasks/RestorePortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/TransferPortalTask.cs
# common/ASC.Data.Reassigns/RemoveProgressItem.cs
# common/ASC.Data.Storage/BaseStorage.cs
# common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSessionHolder.cs
# common/ASC.Data.Storage/CrossModuleTransferUtility.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/Encryption/EncryptionOperation.cs
# common/ASC.Data.Storage/Extensions.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/IDataStore.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.Data.Storage/S3/S3UploadGuard.cs
# common/ASC.Data.Storage/StaticUploader.cs
# common/ASC.Data.Storage/StorageHandler.cs
# common/ASC.Data.Storage/StorageUploader.cs
# common/ASC.Data.Storage/WebPath.cs
# common/services/ASC.ApiSystem/Controllers/PortalController.cs
# common/services/ASC.AuditTrail/AuditEventsRepository.cs
# common/services/ASC.AuditTrail/AuditReportCreator.cs
# common/services/ASC.AuditTrail/LoginEventsRepository.cs
# products/ASC.Files/Core/Configuration/FilesSpaceUsageStatManager.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/IFolderDao.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/ILinkDao.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/IProviderDao.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/IProviderInfo.cs
# products/ASC.Files/Core/Core/Dao/Interfaces/ITagDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/AbstractDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/LinkDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/Entries/ChunkedUploadSession.cs
# products/ASC.Files/Core/Core/Entries/EncryptionKeyPair.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/FilesIntegration.cs
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Core/Core/Security/IFileSecurity.cs
# products/ASC.Files/Core/Core/Security/ISecurityDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.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/Thirdparty/ProviderDao/ProviderTagDao.cs
# products/ASC.Files/Core/Core/Thirdparty/RegexDaoSelectorBase.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxProviderInfo.cs
# products/ASC.Files/Core/Helpers/DocuSignHelper.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/Helpers/PathProvider.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/HttpHandlers/SearchHandler.cs
# products/ASC.Files/Core/Model/FileEntryWrapper.cs
# products/ASC.Files/Core/Model/FileOperationWraper.cs
# products/ASC.Files/Core/Model/FileWrapper.cs
# products/ASC.Files/Core/Model/FolderContentWrapper.cs
# products/ASC.Files/Core/Model/FolderWrapper.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceConnector.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceHelper.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/NotifyService/NotifyClient.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/Utils/ChunkedUploadSessionHolder.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.Files/Core/Utils/FileShareLink.cs
# products/ASC.Files/Core/Utils/FileSharing.cs
# products/ASC.Files/Core/Utils/FileUploader.cs
# products/ASC.Files/Core/Utils/MailMergeTask.cs
# products/ASC.Files/Core/Utils/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Controllers/PrivacyRoomController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Api/Controllers/AuthenticationController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/BuildVersion.cs
# web/ASC.Web.Core/Files/DocumentService.cs
# web/ASC.Web.Core/Files/DocumentServiceLicense.cs
# web/ASC.Web.Core/Helpers/ApiSystemHelper.cs
# web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
# web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
# web/ASC.Web.Core/Recaptcha.cs
# web/ASC.Web.Core/Sms/SmsManager.cs
# web/ASC.Web.Core/Sms/SmsProvider.cs
# web/ASC.Web.Core/Sms/SmsSender.cs
# web/ASC.Web.Core/SpaceUsageStatManager.cs
# web/ASC.Web.Core/Utility/UrlShortener.cs
|
2022-02-23 22:42:34 +03:00 |
|
|
|
9fe4971055
|
add mapping, project reorganization
|
2022-02-21 18:35:57 +03:00 |
|
|
|
7ad1462b81
|
Merge branch 'feature/backend-refactor' into feature/asc-core-common-refactor
|
2022-02-21 12:51:45 +03:00 |
|
|
|
5b5ed4a4e3
|
Merge branch 'feature/backend-refactor' into feature/asc-feed-refactor
|
2022-02-18 18:55:59 +03:00 |
|
|
|
f079f77ab9
|
reorganize
|
2022-02-18 18:11:53 +03:00 |
|
|
|
b8cfef8d44
|
Notify: add mapping
|
2022-02-18 16:56:23 +03:00 |
|
|
|
226a38ad87
|
Core: added DbSet's to MessagesContext
|
2022-02-15 18:10:12 +03:00 |
|
|
|
84c44ea762
|
Core: removed unused property that caused the service to crash
|
2022-02-15 18:08:04 +03:00 |
|
|
|
5b57afe3ca
|
Core: fix
|
2022-02-15 16:49:12 +03:00 |
|
|
|
aa8e6aef3b
|
Core: intertnal properties replaced by fields
|
2022-02-15 15:30:54 +03:00 |
|
|
|
809359c85b
|
Core: used file-scoped namespaces
|
2022-02-15 14:52:43 +03:00 |
|
|
|
5cfd763fb1
|
Core: fix mapping
|
2022-02-15 14:01:23 +03:00 |
|
|
|
ca7140186d
|
Core: resolve properties for mapping, add mapping/projection
|
2022-02-15 13:30:05 +03:00 |
|
|
|
481581e424
|
Core: private properties replaced by private fields, add braces
|
2022-02-15 00:02:57 +03:00 |
|
Vashchuk Nikita
|
631dcdc2e8
|
Merge branch 'develop' into feature/async
# Conflicts:
# common/ASC.Data.Backup.Core/Core/FileBackupProvider.cs
# common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
# common/ASC.Data.Backup.Core/Storage/DocumentsBackupStorage.cs
# common/ASC.Data.Backup.Core/Tasks/BackupPortalTask.cs
# common/ASC.Data.Backup.Core/Tasks/DeletePortalTask.cs
# common/ASC.Data.Storage/CrossModuleTransferUtility.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/Extensions.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.Data.Storage/StorageHandler.cs
# common/services/ASC.ApiSystem/Controllers/PortalController.cs
# products/ASC.CRM/Server/Api/VoipController.cs
# products/ASC.CRM/Server/Core/Dao/RelationshipEventDao.cs
# products/ASC.CRM/Server/Utils/PdfCreator.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.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/Thirdparty/SharePoint/SharePointFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointProviderInfo.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/HttpHandlers/SearchHandler.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/FileMarkAsReadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.Files/Core/Utils/MailMergeTask.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# web/ASC.Web.Core/Files/DocumentService.cs
# web/ASC.Web.Core/Files/DocumentServiceLicense.cs
# web/ASC.Web.Core/Helpers/ApiSystemHelper.cs
# web/ASC.Web.Core/Recaptcha.cs
# web/ASC.Web.Core/Utility/UrlShortener.cs
|
2022-02-12 00:51:48 +03:00 |
|
|
|
37c1cd7d11
|
AuditTrail: removed Db prefix, added Dto ending
|
2022-02-11 12:27:08 +03:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
09e46f52d5
|
resolve property name for mapping
|
2022-02-08 03:04:33 +03:00 |
|
|
|
9e583e60cb
|
add AuditEvents dbset and model configuration
|
2022-02-07 17:06:25 +03:00 |
|
Vashchuk Nikita
|
5aa99ec811
|
Merge branch 'develop' into feature/async
# Conflicts:
# common/ASC.Common/Caching/KafkaCache.cs
# common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
# common/services/ASC.AuditTrail/AuditEventsRepository.cs
# common/services/ASC.AuditTrail/LoginEventsRepository.cs
# products/ASC.Files/Core/ASC.Files.Core.csproj
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
# products/ASC.Files/Core/Utils/MailMergeTask.cs
# products/ASC.Files/Server/ASC.Files.csproj
# products/ASC.Files/Service/Thumbnail/FileDataProvider.cs
|
2022-02-04 16:04:52 +03:00 |
|
|
|
1858db9132
|
rename db model
|
2022-02-04 12:15:54 +03:00 |
|
|
|
e6665bb8c9
|
Merge branch 'feature/refactoring' into feature/asc-audit-trail-refactor
|
2022-02-03 16:46:17 +03:00 |
|
|
|
0cc387a4b8
|
rename LoginEvents to LoginEvent
|
2022-02-03 14:15:42 +03:00 |
|
|
|
34ff334692
|
Merge branch 'develop' into feature/analizators
|
2022-01-31 14:35:16 +03:00 |
|
|
|
9bccfa3ade
|
refactoring: add globalUsing: core.common
|
2022-01-26 13:43:08 +03:00 |
|
|
|
f3cc581047
|
analizators/bugfix
|
2022-01-24 11:41:44 +03:00 |
|
|
|
8d0324ee2a
|
analizators/s2326
|
2022-01-21 16:59:17 +03:00 |
|
|
|
4be25479fd
|
used one dbcontext per service (per DAO). fixed error: System.InvalidOperationException: 'Cannot use multiple context instances within a single query execution. Ensure the query uses a single context instance.'
|
2022-01-21 16:45:50 +03:00 |
|
|
|
143f0a5dda
|
Analizators/s1854
|
2022-01-21 16:22:56 +03:00 |
|
|
|
728c1b896e
|
analizators/s1104
|
2022-01-21 12:19:57 +03:00 |
|
|
|
25050cb5fd
|
analizators/s2223
|
2022-01-19 17:16:15 +03:00 |
|
Vashchuk Nikita
|
c74da79ba2
|
Merge branch 'develop' into feature/async
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Core/Utils/FileUploader.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
|
2022-01-12 22:07:21 +03:00 |
|
|
|
66cf28ba29
|
analizators/U2U1100
|
2022-01-12 18:42:03 +03:00 |
|
|
|
50c0596eff
|
analizators/U2U1009
|
2022-01-11 18:37:19 +03:00 |
|
|
|
bedfad1ec5
|
Merge branch 'master' into develop
# Conflicts:
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/store/DialogsStore.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/EF/FilesDbContext.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
# products/ASC.Files/Server/DocStore
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Core/Tfa/TfaManager.cs
|
2021-12-28 18:21:44 +03:00 |
|
|
|
7b0707ba16
|
Merge branch 'develop' into feature/async
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
|
2021-12-17 10:48:44 +03:00 |
|
|
|
0bd39bfc19
|
Core: optimization
|
2021-12-08 22:18:04 +03:00 |
|
|
|
d181d43b36
|
Merge branch 'develop' into feature/async
# Conflicts:
# common/services/ASC.Data.Backup/ASC.Data.Backup.csproj
# products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Server/ASC.Files.csproj
|
2021-12-02 12:02:50 +03:00 |
|
|
|
197a360f45
|
Files: fixed files_convert data
|
2021-11-30 14:35:43 +03:00 |
|
|
|
8ca88e4620
|
Merge branch 'develop' into feature/net6
# Conflicts:
# common/ASC.Api.Core/Core/BaseStartup.cs
# common/ASC.Common/ASC.Common.csproj
# products/ASC.CRM/BackgroundTasks/ASC.CRM.BackgroundTasks.csproj
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Server/ASC.Files.csproj
# web/ASC.Web.HealthChecks.UI/ASC.Web.HealthChecks.UI.csproj
|
2021-11-23 16:40:50 +03:00 |
|
Vashchuk Nikita
|
35ceaf7997
|
Merge branch 'develop' into feature/async
|
2021-11-22 11:30:38 +03:00 |
|
|
|
26511d9fb7
|
Merge branch 'develop' into feature/webhooks
# Conflicts:
# ASC.Tests.sln
|
2021-10-29 13:18:57 +03:00 |
|
|
|
399377ff43
|
Merge branch 'develop' into feature/dbcontextmanager-optimization
|
2021-10-26 22:05:41 +03:00 |
|
|
|
cb8bc701ec
|
fix migrations
|
2021-10-26 16:14:40 +03:00 |
|
|
|
b1134d239c
|
Merge branch 'develop' into feature/auto-migrations
# Conflicts:
# common/ASC.Core.Common/EF/Context/UserDbContext.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioUservisit.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210309093101_AccountLinkContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210309093101_AccountLinkContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210803210910_AccountLinkContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210803210910_AccountLinkContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20211012145324_AccountLinkContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20211012145324_AccountLinkContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/MySqlAccountLinkContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210309093934_DbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210309093934_DbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210803211510_DbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210803211510_DbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20211012145326_DbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20211012145326_DbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/DbContextMySql/MySqlDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210309094059_FeedDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210309094059_FeedDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210803211718_FeedDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210803211718_FeedDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20211012145328_FeedDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20211012145328_FeedDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/MySqlFeedDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210309094212_FilesDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210309094212_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210803211941_FilesDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210803211941_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210309094321_MailDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210309094321_MailDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210803212237_MailDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210803212237_MailDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20211012145332_MailDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20211012145332_MailDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/MySqlMailDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20210803212546_MessagesContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/MySqlMessagesContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210309094710_NotifyDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210309094710_NotifyDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210803212728_NotifyDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210803212728_NotifyDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20211012145336_NotifyDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20211012145336_NotifyDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/MySqlNotifyDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210309094839_ResourceDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210309094839_ResourceDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210803212948_ResourceDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210803212948_ResourceDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20211012145338_ResourceDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20211012145338_ResourceDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/MySqlResourceDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210309095003_TelegramDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210309095003_TelegramDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210803213120_TelegramDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210803213120_TelegramDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20211012145340_TelegramDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20211012145340_TelegramDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/MySqlTelegramDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210803213311_TenantDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210803213311_TenantDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20211012145342_TenantDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20211012145342_TenantDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/MySqlTenantDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20210309095256_UserDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20210803213502_UserDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20211012145322_UserDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/MySqlUserDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210309095409_VoipDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210309095409_VoipDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210803213656_VoipDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210803213656_VoipDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20211012145344_VoipDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20211012145344_VoipDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/MySqlVoipDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210309100343_WebstudioDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210309100343_WebstudioDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210803213819_WebstudioDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210803213819_WebstudioDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20211012145346_WebstudioDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20211012145346_WebstudioDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/MySqlWebstudioDbContextModelSnapshot.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210309125119_FilesDbContextMySql.Designer.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210309125119_FilesDbContextMySql.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210804103345_FilesDbContextMySql.Designer.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210804103345_FilesDbContextMySql.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.Designer.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
|
2021-10-25 20:52:13 +03:00 |
|
|
|
e5e4a89e5b
|
Merge branch 'develop' into feature/net6
|
2021-10-22 16:10:37 +03:00 |
|
|
|
018c1939ab
|
replace type name with type
|
2021-10-22 13:08:09 +03:00 |
|
|
|
5eab8516f8
|
EF: removed unused class
|
2021-10-22 12:30:06 +03:00 |
|
|
|
36db823276
|
removed unused class
|
2021-10-22 11:54:45 +03:00 |
|
Vashchuk Nikita
|
4ef5b4c8e5
|
Added async in Asc.Files.Core(Dao)
|
2021-10-21 20:59:05 +03:00 |
|
|
|
9f12c95828
|
Merge branch 'feature/webhooks' of github.com:ONLYOFFICE/AppServer into feature/webhooks
|
2021-10-19 15:25:53 +03:00 |
|
|
|
735a9b60cf
|
net6: warning CA1416
also remove unnecessary usings
|
2021-10-13 11:07:03 +03:00 |
|
|
|
55da5e7c54
|
add postgresql model configuring
|
2021-10-12 13:24:19 +03:00 |
|
|
|
1ddbb41052
|
rename Postgre to PostgreSql
|
2021-10-12 13:23:20 +03:00 |
|
|
|
9541b9e6b4
|
optimization migration
|
2021-10-12 12:04:24 +03:00 |
|
|
|
8b4d793d78
|
remove unnecessary HasData
|
2021-10-11 17:23:39 +03:00 |
|
|
|
0066585554
|
replace DateTime.Now to fixed DateTime
|
2021-10-11 17:23:02 +03:00 |
|
|
|
8ced3a052a
|
change access modificator
|
2021-10-07 12:51:29 +03:00 |
|
|
|
040f3065c5
|
fix
|
2021-10-07 12:51:10 +03:00 |
|
|
|
6cc771bb87
|
fix
|
2021-10-07 12:50:57 +03:00 |
|
|
|
814fe65535
|
fix
|
2021-10-07 12:49:55 +03:00 |
|
diana-vahomskaya
|
a5e1609dac
|
two methods
|
2021-09-16 11:25:17 +03:00 |
|
|
|
ea4fa97838
|
Merge branch 'develop' into feature/wizard/migration
# Conflicts:
# ASC.Tests.sln
# common/ASC.Core.Common/EF/Model/Tenant/DbQuota.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
# common/ASC.Data.Backup.Core/Core/DbHelper.cs
# common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
# common/Tests/ASC.Common.Tests/ASC.Common.Tests.csproj
# common/Tests/ASC.Core.Common.Tests/ASC.Core.Common.Tests.csproj
# common/Tests/ASC.Notify.Textile.Tests/ASC.Notify.Textile.Tests.csproj
|
2021-09-15 15:52:13 +03:00 |
|
Vashchuk Nikita
|
3b4cb1dfc6
|
Added GlobalFilter, fix
|
2021-09-03 17:02:52 +03:00 |
|
|
|
2addb81adf
|
Quota: Price2 removed
|
2021-08-30 18:19:20 +03:00 |
|
|
|
91fd7615b3
|
Optimization
|
2021-08-20 10:52:52 +03:00 |
|
diana-vahomskaya
|
945739fe44
|
fix test ASC.Web.Api.Tests
|
2021-08-16 15:20:41 +03:00 |
|
diana-vahomskaya
|
af84cd6532
|
fix Context
|
2021-08-03 17:11:53 +03:00 |
|
diana-vahomskaya
|
bcfddd88d7
|
fix context
|
2021-08-02 17:49:36 +03:00 |
|
diana-vahomskaya
|
34c4161f08
|
Update migrations, fix Context with repetitive Models
|
2021-07-27 19:26:56 +03:00 |
|
diana-vahomskaya
|
3131c27d26
|
Merge remote-tracking branch 'remotes/origin/feature/wizard/migration' into develop
|
2021-07-27 17:39:29 +03:00 |
|
|
|
d88741962c
|
EF: optimize server version check
|
2021-07-16 11:48:30 +03:00 |
|
diana-vahomskaya
|
e02e833d31
|
fixed data to open wizard if magration true
|
2021-07-07 17:29:27 +03:00 |
|
|
|
b6b1c72769
|
core: added new ThenBy linq extension. crm: fixed sql
|
2021-06-30 19:08:41 +03:00 |
|
|
|
37a676cb5a
|
Tenant: removed Public, PublicVisibleProducts
|
2021-06-24 15:55:12 +03:00 |
|
|
|
c8c5b49d1c
|
Files: thumbnails. 2e37dcd0
|
2021-05-30 21:52:32 +03:00 |
|
|
|
a5c6ba5dcc
|
Common, db: moved from 08a01422
|
2021-05-17 14:35:00 +03:00 |
|
|
|
31752e64b4
|
fixed warnings
|
2021-05-14 15:26:18 +03:00 |
|
|
|
18a2c0a53d
|
Merge branch 'develop' into feature/dotnet5
# Conflicts:
# common/ASC.Core.Common/EF/Model/Audit/LoginEvents.cs
# common/ASC.Core.Common/EF/Model/CRM/CrmContact.cs
# common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
# common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioIndex.cs
# common/ASC.Core.Common/EF/Model/DbipLocation.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedAggregate.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedLast.cs
# common/ASC.Core.Common/EF/Model/Mail/Mailbox.cs
# common/ASC.Core.Common/EF/Model/Mail/ServerServer.cs
# common/ASC.Core.Common/EF/Model/Notify/NotifyInfo.cs
# common/ASC.Core.Common/EF/Model/Notify/NotifyQueue.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthors.cs
# common/ASC.Core.Common/EF/Model/Resource/ResCultures.cs
# common/ASC.Core.Common/EF/Model/Resource/ResData.cs
# common/ASC.Core.Common/EF/Model/Resource/ResFiles.cs
# common/ASC.Core.Common/EF/Model/Resource/ResReserve.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbTariff.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbTenantVersion.cs
# common/ASC.Core.Common/EF/Model/Tenant/TenantIpRestrictions.cs
# common/ASC.Core.Common/EF/Model/User/UserPhoto.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20201006100008_CoreDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs
# products/ASC.Files/Core/Core/EF/DbFilesTag.cs
# products/ASC.Files/Core/Core/EF/FilesDbContext.cs
|
2021-03-25 21:50:09 +03:00 |
|
|
|
91105e8cd0
|
EF: removed old column tariff_key
|
2021-03-17 12:09:49 +03:00 |
|
|
|
dccbe81002
|
DataAnnotations: fix
|
2021-02-25 21:18:27 +03:00 |
|
Diana
|
5c3f2975e8
|
fix NotMapped
|
2021-02-25 13:23:26 +03:00 |
|
Diana
|
f1091f409a
|
fix dataannotations
|
2021-02-25 12:00:53 +03:00 |
|
Diana
|
4ddd2cebec
|
delete dataannotations
|
2021-02-20 22:02:12 +03:00 |
|
|
|
e11a880956
|
Core: fix migrations
|
2021-01-25 15:31:28 +03:00 |
|
|
|
f222f4be0c
|
.net 5
|
2021-01-22 16:42:26 +03:00 |
|
|
|
f8be896241
|
Merge branch 'develop' into feature/dotnet5
# Conflicts:
# common/ASC.Common/ASC.Common.csproj
# common/ASC.Core.Common/ASC.Core.Common.csproj
# common/ASC.Core.Common/EF/Context/BaseDbContext.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
|
2021-01-22 16:34:40 +03:00 |
|
|
|
62cd0a6af0
|
Test: fix test migrate, drop test db
|
2020-12-25 13:48:04 +03:00 |
|
Diana
|
aa667a02ef
|
fix
|
2020-12-24 03:21:29 +03:00 |
|
Diana
|
e20b87447e
|
Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop
|
2020-12-24 03:18:47 +03:00 |
|
|
|
1891813132
|
fix save tenant
|
2020-12-23 18:36:05 +03:00 |
|
Diana
|
589c17ac95
|
fix
|
2020-12-22 02:27:10 +03:00 |
|
|
|
1675896294
|
Merge branch 'develop' into feature/dotnet5
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Services/WCFService/IFileStorageService.cs
|
2020-12-04 11:59:10 +03:00 |
|
|
|
b487adb9fc
|
Refactoting & optimization
|
2020-11-24 13:15:11 +03:00 |
|
|
|
eb6b54482e
|
fix warnings
|
2020-11-17 13:47:17 +03:00 |
|
|
|
1623241d8a
|
Code cleanup
|
2020-11-17 13:00:01 +03:00 |
|
|
|
d2a0d318f7
|
dotnet 5
|
2020-11-17 12:59:15 +03:00 |
|
|
|
3256a3dbc7
|
DI: fix
|
2020-10-28 23:02:03 +03:00 |
|
|
|
bff9629389
|
Scope: refactoring
|
2020-10-20 16:24:46 +03:00 |
|
|
|
830c73a134
|
Scope: refactoring
|
2020-10-19 18:53:15 +03:00 |
|
|
|
9fe6fc3832
|
Refactoring: scope
|
2020-10-19 10:19:32 +03:00 |
|
|
|
a4eb45f1ab
|
Scope: refactoring
|
2020-10-18 19:03:14 +03:00 |
|
|
|
18ef6e7cb6
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
|
2020-10-16 16:57:21 +03:00 |
|
|
|
5eed00dd28
|
Removed sq bugs and code smells
|
2020-10-16 16:21:59 +03:00 |
|
|
|
d50cf081ba
|
Merge branch 'master' into features/ASC.AuditTrail
|
2020-10-14 13:02:30 +03:00 |
|
|
|
70ff8c62ae
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
|
2020-10-14 13:00:37 +03:00 |
|
|
|
d41b12cdc8
|
DbTenant: fix
|
2020-10-14 12:59:37 +03:00 |
|
|
|
4a0a683c68
|
fix
|
2020-10-14 12:11:04 +03:00 |
|
|
|
f252ef2a7f
|
Merge branch 'master' into features/ASC.AuditTrail
# Conflicts:
# ASC.Web.sln
|
2020-10-13 18:17:59 +03:00 |
|
|
|
02f39a9c71
|
Merge branch 'master' into feature/files
# Conflicts:
# common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20201006101804_WebstudioDbContextMySql.cs
# common/ASC.Core.Common/Migrations/Npgsql/WebstudioDbContextNpgsql/20200929102646_WebstudioDbContextNpgsql.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# web/ASC.Web.Core/Files/FileUtility.cs
|
2020-10-13 12:52:28 +03:00 |
|
