IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,045 Commits 38 Branches 22 Tags 359 MiB
e4d379c411
Commit Graph

2437 Commits

Author SHA1 Message Date
pavelbannov
5021a7c95e fix logs 2022-07-21 17:21:56 +03:00
pavelbannov
a5f4435b17 fix notify 2022-07-20 22:06:33 +03:00
pavelbannov
2c98ad88d8 fix 2022-07-20 19:25:59 +03:00
pavelbannov
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
pavelbannov
40a5fb35df fixed audit/login/last 2022-07-19 14:59:36 +03:00
pavelbannov
a2037eb91d fix build 2022-07-18 18:30:08 +03:00
pavelbannov
3bde5f83c9 removed ASC.Thumbnails.Svc 
fix ASC.Data.Storage.Encryption
fixed ASC.Projects
 2022-07-18 14:25:25 +03:00
pavelbannov
ccbac1d3fa consolidated packages 2022-07-18 13:50:05 +03:00
pavelbannov
d94904b6af removed voip 2022-07-18 12:24:12 +03:00
pavelbannov
e2b1e48fa9 removed voip service 2022-07-15 18:46:52 +03:00
Vashchuk Nikita
3d814ac78c small fix 2022-07-15 15:17:06 +03:00
Vashchuk Nikita
a9c60af9b7 small fix 2022-07-15 15:15:25 +03:00
Vashchuk Nikita
47d6e0ca1d moved connectionString to config and added functionality for entering connectionString from console 2022-07-15 14:53:21 +03:00
Vashchuk Nikita
e78be607ce small fix 2022-07-15 13:36:58 +03:00
Vashchuk Nikita
aa162790a7 Merge branch 'feature/migrations-fix' of github.com:ONLYOFFICE/AppServer into feature/migrations-fix 
# Conflicts:
#	common/Tools/AutoMigrationCreator/AutoMigrationCreator.csproj
#	common/Tools/AutoMigrationCreator/Program.cs
#	common/Tools/AutoMigrationCreator/Utils/Options.cs
 2022-07-15 13:35:56 +03:00
Vashchuk Nikita
56e52f807b modified argsParser 2022-07-15 13:33:34 +03:00
pavelbannov
b72f441029 AutoMigrationCreator: fixed project type 2022-07-15 13:14:09 +03:00
pavelbannov
317a72898a refactoring 2022-07-15 12:48:15 +03:00
pavelbannov
d8980cc3a7 fix 57917 2022-07-14 20:00:43 +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
pavelbannov
2aec92c2e0 fix 2022-07-13 18:15:29 +03:00
pavelbannov
595cfcc2d2 fixed loginevent 2022-07-13 15:15:13 +03:00
pavelbannov
ed7ef58b53 Api: fixed loginevent 2022-07-13 14:21:25 +03:00
pavelbannov
04603f1314 Merge branch 'develop' into bugfix/Bug53348 2022-07-13 13:42:24 +03:00
pavelbannov
c1be6ecb61 Settings: ignore id 2022-07-12 15:33:46 +03:00
pavelbannov
c9f7e95d5c fixed iprestrictions method 2022-07-12 12:06:38 +03:00
pavelbannov
fd986320f2 Api: fixed maildomainsettings 2022-07-12 11:47:05 +03:00
Vashchuk Nikita
5cfb69ae48 recreated all migrations 2022-07-11 18:33:57 +03:00
Vashchuk Nikita
bc0ad53e8f changed int type to tinyint(1) for bool 2022-07-11 18:31:00 +03:00
SuhorukovAnton
70a8100235 Bug 53348 - Client.Account termination. Account deletion confirmation page when following an invalid link. 2022-07-11 15:58:13 +03:00
Vashchuk Nikita
f13263c75a fix contexts after merge 2022-07-11 15:43:06 +03:00
Vashchuk Nikita
ab5279ae4c fix Backup Context 2022-07-11 13:37:20 +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
dcd6faf781 fix for merge 2022-07-11 12:29:45 +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
841dd52eac fix AutoMigrationCreator 2022-07-08 14:19:13 +03:00
pavelbannov
7af929fee8 Merge branch 'release/v1.2' into develop 
# Conflicts:
#	common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
#	common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.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.People/Server/Controllers/PeopleController.cs
#	products/ASC.People/Server/Models/MemberModel.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
 2022-07-07 17:41:41 +03:00
pavelbannov
baa72db316 removed referencies 2022-07-06 18:47:16 +03:00
SuhorukovAnton
aeac8613a8 Merge branch 'develop' into features/enum_generator 2022-07-05 17:22:43 +03:00
Vashchuk Nikita
5f7b346334 added functionality for applying migrations 2022-07-05 17:20:36 +03:00
SuhorukovAnton
1218d31a42 enum generator 2022-07-05 16:58:11 +03:00
pavelbannov
468d0d569e EmployeeDtoHelper: user cache 2022-07-05 12:55:19 +03:00
pavelbannov
191e66a238 Notify: fix warning 2022-07-04 16:55:11 +03:00
pavelbannov
02653c3568 fix payment 2022-07-04 14:54:24 +03:00
Maria-Sukhova
fb09f62881 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-07-04 11:39:38 +03:00
Maria-Sukhova
0f901bf6e3 added hy-AM 2022-07-04 11:38:57 +03:00
pavelbannov
5d4715e674 fix 2022-07-01 17:37:09 +03:00
pavelbannov
a289f9594a modified LdapNotifyHelper to BackgroundService 2022-07-01 14:49:59 +03:00
Vashchuk Nikita
bdbd6bd65e Recreating and fixing migrations 2022-07-01 14:27:28 +03:00
Vashchuk Nikita
5a0acc8eaa Renaming folders for contexts and models 2022-07-01 14:23:07 +03:00
Vashchuk Nikita
71d7638340 added CustomMySqlMigrationsSqlGenerator 2022-07-01 13:57:40 +03:00
pavelbannov
329ec57aa2 Merge branch 'develop' into feature/LDAP-new 2022-07-01 13:15:52 +03:00
pavelbannov
7e34e45371 ElasticSearch: disabled by default 2022-07-01 12:53:18 +03:00
pavelbannov
45cd9434f4 fix Bug 57888 2022-06-30 19:41:17 +03:00
pavelbannov
f24fc8e19e fix 2022-06-30 17:12:49 +03:00
pavelbannov
74d238bde8 Merge branch 'release/v1.2' into develop 
# Conflicts:
#	common/ASC.Common/Caching/KafkaCache.cs
#	common/ASC.Common/Logging/Log.cs
#	common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
#	common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
#	common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
#	common/ASC.Data.Backup.Core/BackupResource.Designer.cs
#	common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSession.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/ASC.Notify.Textile.csproj
#	common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Compress/CompressToArchive.cs
#	products/ASC.Files/Core/Core/Compress/CompressToTarGz.cs
#	products/ASC.Files/Core/Core/Compress/CompressToZip.cs
#	products/ASC.Files/Core/Core/Compress/ICompress.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/Helpers/Global.cs
#	products/ASC.Files/Core/Resources/FilesJSResource.Designer.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/Utils/EntryManager.cs
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
#	web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
 2022-06-30 16:13:31 +03:00
pavelbannov
630250b439 fix tests 2022-06-30 12:07:30 +03:00
pavelbannov
75be0827d7 Merge branch 'develop' into feature/get-thumbnail-from-thirdparty 
# Conflicts:
#	products/ASC.Files/Service/GlobalUsings.cs
 2022-06-29 20:01:27 +03:00
pavelbannov
35ab5a3531 fix order 2022-06-29 19:43:29 +03:00
Alexey Bannov
d78509993f fixed Bug 53280 2022-06-29 18:40:35 +03:00
pavelbannov
5f6851253f fix bug 57725 2022-06-29 15:10:56 +03:00
pavelbannov
9e05dc641a notify: temp logs 2022-06-28 23:32:33 +03:00
Alexey Bannov
e483177f24 fixed: Bug 57693 2022-06-28 19:42:13 +03:00
SuhorukovAnton
fa815c6254 fix order endpoints 2022-06-28 15:53:06 +03:00
pavelbannov
f9f73f733f fixed log path 2022-06-28 15:50:13 +03:00
SuhorukovAnton
83bb63ff0c remove waste 2022-06-28 15:33:22 +03:00
SuhorukovAnton
d1063df40c Merge branch 'develop' into feature/get-thumbnail-from-thirdparty 2022-06-28 15:32:06 +03:00
pavelbannov
e17f49e344 Merge branch 'develop' into feature/LDAP-new 
# Conflicts:
#	ASC.Web.sln
#	common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Api/GlobalUsings.cs
 2022-06-28 14:30:40 +03:00
pavelbannov
dd52a695e5 fix build 2022-06-27 23:18:23 +03:00
pavelbannov
6d98440200 az resources 2022-06-27 14:00:23 +03:00
pavelbannov
4ad4c34b34 fix 2022-06-24 16:23:56 +03:00
pavelbannov
fef096b0a5 fix generating thumbnails for video 2022-06-24 16:22:52 +03:00
pavelbannov
c9eaeed719 Merge branch 'develop' into feature/get-thumbnail-from-thirdparty 
# Conflicts:
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
 2022-06-23 12:09:13 +03:00
pavelbannov
5bcbae5711 fix 2022-06-23 11:48:31 +03:00
Vashchuk Nikita
470c5a4d41 added migrations for backup 2022-06-23 11:34:53 +03:00
Alexey Bannov
f2da6fc55c
Merge pull request #693 from ONLYOFFICE/feature/docspace 
Feature/docspace
 2022-06-22 11:55:36 +04:00
MaksimChegulov
aad8a92b4c RoomInvite replaced by LinkInvite 2022-06-21 20:33:05 +03:00
MaksimChegulov
5e491a6849 Common: fix 2022-06-21 20:32:29 +03:00
pavelbannov
5aef5524f1 fix Bug 57641 2022-06-21 18:19:55 +03:00
Vashchuk Nikita
37031d9e3f fix backup context 2022-06-21 17:12:00 +03:00
SuhorukovAnton
1aadf26fe2 Merge branch 'develop' into feature/get-thumbnail-from-thirdparty 2022-06-21 17:05:04 +03:00
Alexey Bannov
b78feb8ae9 refactoring 2022-06-21 12:57:20 +03:00
SuhorukovAnton
0a27a98511 Merge branch 'develop' into feature/get-thumbnail-from-thirdparty 2022-06-21 10:52:53 +03:00
Alexey Bannov
03e756277b fixed warnings 2022-06-20 17:01:59 +03:00
MaksimChegulov
e68ac70005 Merge branch 'develop' into feature/docspace 2022-06-20 12:15:08 +03:00
pavelbannov
e2cee2c2fc Merge branch 'release/v1.2' into develop 
# Conflicts:
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
#	common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.FederatedLogin/OAuth20Token.cs
#	common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
#	common/ASC.Resource.Manager/Program.cs
#	common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
#	config/appsettings.json
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Security/ISecurityDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.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/ThumbnailSettings.cs
#	products/ASC.Files/Core/Helpers/Global.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
#	products/ASC.Files/Core/Model/SessionModel.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.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/ThirdPartyApp/Token.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.Files/Core/Utils/FileUploader.cs
#	products/ASC.Files/Core/Utils/SocketManager.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/DocStore
#	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/Worker.cs
#	products/ASC.People/Server/ASC.People.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Core/PublicResources/CustomModeResource.Designer.cs
#	web/ASC.Web.Core/PublicResources/Resource.Designer.cs
#	web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs
#	web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
#	web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
#	web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
 2022-06-19 22:44:48 +03:00
pavelbannov
72b0a81f51 fix 2022-06-17 20:51:01 +03:00
pavelbannov
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
pavelbannov
945e9d8efe moved from ddf515b8 2022-06-17 18:46:16 +03:00
SuhorukovAnton
29d3bb3fee Merge branch 'develop' into feature/get-thumbnail-from-thirdparty 2022-06-17 13:18:03 +03:00
MaksimChegulov
0fbe11ed1c Merge branch 'develop' into feature/docspace 2022-06-17 10:26:51 +03:00
pavelbannov
b62ba1d729 fix tests 2022-06-17 10:17:17 +03:00
MaksimChegulov
dad4b12985 Files: refactor 2022-06-16 18:35:54 +03:00
MaksimChegulov
39e7b28005 Files: refactor 2022-06-16 18:26:53 +03:00
pavelbannov
56ece27e1b moved from ddf515b8 2022-06-16 17:16:46 +03:00
pavelbannov
c9fb0d3dac moved from ddf515b8 2022-06-16 11:13:53 +03:00
Vashchuk Nikita
c1097acbb8 fix static, braces, log 2022-06-15 15:39:37 +03:00
pavelbannov
f3f3ed96ae moved from ddf515b8 2022-06-15 12:46:21 +03:00
pavelbannov
35bebe49f9 moved from ddf515b8 2022-06-14 11:11:41 +03:00
MaksimChegulov
4682001699 People: fix System.NullReferenceException 2022-06-10 22:28:50 +03:00