|
a48dbeaeae
|
fix tfaapp/validate
|
2022-07-14 14:58:49 +03:00 |
|
|
1f01c06185
|
Tfa: added tfaappwithlink
|
2022-07-14 12:57:57 +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 |
|
|
3597114325
|
Api: fix tfaappnewapp
|
2022-07-13 18:41:44 +03:00 |
|
|
c9680ae830
|
fix tfaapp
|
2022-07-12 19:36:39 +03:00 |
|
|
c1be6ecb61
|
Settings: ignore id
|
2022-07-12 15:33:46 +03:00 |
|
|
e9a15cc2a4
|
added [HttpGet("iprestrictions/settings")]
|
2022-07-12 12:20:59 +03:00 |
|
|
fd986320f2
|
Api: fixed maildomainsettings
|
2022-07-12 11:47:05 +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 |
|
|
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 |
|
|
47371fc82d
|
Push: api
|
2022-07-07 16:58:59 +03:00 |
|
|
cac16ace79
|
Push: api
|
2022-07-07 14:46:35 +03:00 |
|
|
a615053d88
|
Fix Bug 58025 - Client.Profile. The languages listed in the profile are not in alphabetical order.
|
2022-07-06 18:26:25 +03:00 |
|
|
aeac8613a8
|
Merge branch 'develop' into features/enum_generator
|
2022-07-05 17:22:43 +03:00 |
|
|
1218d31a42
|
enum generator
|
2022-07-05 16:58:11 +03:00 |
|
|
a289f9594a
|
modified LdapNotifyHelper to BackgroundService
|
2022-07-01 14:49:59 +03:00 |
|
Vashchuk Nikita
|
5a0acc8eaa
|
Renaming folders for contexts and models
|
2022-07-01 14:23:07 +03:00 |
|
|
329ec57aa2
|
Merge branch 'develop' into feature/LDAP-new
|
2022-07-01 13:15:52 +03:00 |
|
|
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 |
|
|
35ab5a3531
|
fix order
|
2022-06-29 19:43:29 +03:00 |
|
|
772b42f636
|
Merge pull request #702 from ONLYOFFICE/feature/settings-docspace-mode
feature/settings-docspace-mode
|
2022-06-28 14:51:57 +03:00 |
|
|
933b0696ef
|
WebApi: added docspace in settings
|
2022-06-28 14:47:28 +03:00 |
|
|
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 |
|
|
2b48707f5c
|
sso: fix
|
2022-06-28 12:36:34 +03:00 |
|
|
6d98440200
|
az resources
|
2022-06-27 14:00:23 +03:00 |
|
|
b58422cfee
|
Merge branch 'develop' into feature/branding
|
2022-06-24 18:51:33 +03:00 |
|
|
45e791a092
|
removed unused code
|
2022-06-23 16:00:24 +03:00 |
|
|
96775f7a0a
|
fix for eb896018d4 2b19ec7997
|
2022-06-23 15:43:22 +03:00 |
|
|
2b19ec7997
|
rebranding
|
2022-06-20 16:59:03 +03:00 |
|
|
eb896018d4
|
whitelabel
|
2022-06-20 14:09:47 +03:00 |
|
|
e68ac70005
|
Merge branch 'develop' into feature/docspace
|
2022-06-20 12:15:08 +03:00 |
|
|
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 |
|
|
c9fb0d3dac
|
moved from ddf515b8
|
2022-06-16 11:13:53 +03:00 |
|
|
f3f3ed96ae
|
moved from ddf515b8
|
2022-06-15 12:46:21 +03:00 |
|
|
35bebe49f9
|
moved from ddf515b8
|
2022-06-14 11:11:41 +03:00 |
|
|
b693779ea1
|
Merge branch 'develop' into feature/docspace-pin
|
2022-06-08 16:38:16 +03:00 |
|
|
832a341306
|
fix Bug 57478
|
2022-06-08 13:48:28 +03:00 |
|
Vashchuk Nikita
|
8410299051
|
modified logging
|
2022-06-08 12:42:49 +03:00 |
|
|
cbd73be90b
|
moved from ddf515b8
|
2022-06-08 12:02:40 +03:00 |
|
|
c1d152becc
|
moved from ddf515b8
|
2022-06-07 21:00:08 +03:00 |
|
|
a861268e4f
|
moved from ddf515b8
|
2022-06-01 17:07:08 +03:00 |
|
|
e4a8c11602
|
Merge branch 'develop' into feature/LDAP-new
|
2022-05-30 14:20:46 +03:00 |
|
|
cf8badeea3
|
Api: refactoring
|
2022-05-27 12:32:58 +03:00 |
|
Nikita
|
54341cb203
|
fixed input and output parameters in Api(LdapController)
|
2022-05-26 17:39:02 +03:00 |
|
|
e7886aff2c
|
Log: refactoring
|
2022-05-26 12:01:54 +03:00 |
|
|
a66c03aa86
|
Merge branch 'develop' into feature/logger-refactoring
# Conflicts:
# common/ASC.Common/Caching/AscCache.cs
# common/ASC.Common/GlobalUsings.cs
# common/ASC.Core.Common/Notify/Telegram/TelegramHelper.cs
# common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
# common/ASC.Data.Storage/GlobalUsings.cs
# common/services/ASC.Data.Backup.BackgroundTasks/GlobalUsings.cs
# common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupDeleteScheldureRequestedIntegrationEventHandler.cs
# common/services/ASC.Data.Backup.BackgroundTasks/Services/BackupSchedulerService.cs
# common/services/ASC.Notify/GlobalUsings.cs
# common/services/ASC.Notify/IntegrationEvents/EventHandling/NotifyInvokeSendMethodRequestedIntegrationEventHandler.cs
# common/services/ASC.Notify/Services/NotifySenderService.cs
# common/services/ASC.TelegramService/GlobalUsings.cs
# common/services/ASC.TelegramService/TelegramHandler.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/GlobalUsings.cs
# products/ASC.Files/Service/Thumbnail/IntegrationEvents/EventHandling/ThumbnailRequestedIntegrationEventHandler.cs
# products/ASC.People/Server/Api/UserController.cs
# web/ASC.Web.Api/Api/Settings/StorageController.cs
|
2022-05-24 23:13:57 +03:00 |
|
|
02570e12cf
|
Merge branch 'develop' into feature/cluster-services
|
2022-05-24 17:24:25 +03:00 |
|
Nikita
|
1d2521c399
|
fix
|
2022-05-24 12:59:04 +03:00 |
|
|
2a673036ff
|
encryption service: migrate from ICacheNotify to RabbitMQ
|
2022-05-23 22:06:22 +03:00 |
|
|
13ad4381f7
|
Api: removed CustomHttpMethodAttribute
added AllowNotPaymentAttribute
|
2022-05-23 18:48:23 +03:00 |
|
Nikita
|
a7b9b77613
|
fix
|
2022-05-23 16:38:05 +03:00 |
|
|
75da995099
|
Merge branch 'develop' into feature/logger-refactoring
|
2022-05-20 17:01:51 +03:00 |
|
Nikita
|
b76b97af89
|
Merge branch 'develop' into feature/LDAP-new
|
2022-05-18 13:38:00 +03:00 |
|
Nikita
|
6451ac6329
|
fix
|
2022-05-18 13:36:35 +03:00 |
|
|
36855d656f
|
remove application/x-www-form-urlencoded
|
2022-05-17 12:29:24 +03:00 |
|
|
2e33540486
|
Merge branch 'feature/docspace' into feature/docspace-links
|
2022-05-17 11:53:37 +03:00 |
|
|
025d13557d
|
added a secure link to invite to the portal
|
2022-05-13 19:25:28 +03:00 |
|
|
941be273c6
|
add logger
|
2022-05-13 16:09:13 +03:00 |
|
|
411e3b7f58
|
Sso: fix
|
2022-05-13 11:52:49 +03:00 |
|
|
e9be6684ae
|
Resources: fixed projects
|
2022-05-12 18:32:39 +03:00 |
|
|
be926bd7a2
|
Api: Resources.
|
2022-05-12 14:25:01 +03:00 |
|
Vashchuk Nikita
|
11ac66a1e0
|
refactoring
|
2022-05-05 16:23:05 +03:00 |
|
Vashchuk Nikita
|
f39a476d06
|
added SsoController, fix
|
2022-04-28 16:56:12 +03:00 |
|
Vashchuk Nikita
|
442a6bb30a
|
Merge branch 'develop' into feature/SSO-new
# Conflicts:
# config/nginx/onlyoffice.conf
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Studio/Startup.cs
|
2022-04-28 15:45:11 +03:00 |
|
|
89059cf32e
|
Structured Logging
|
2022-04-28 12:15:33 +03:00 |
|
Vashchuk Nikita
|
4cab782bc8
|
Merge branch 'develop' into feature/LDAP-new
# Conflicts:
# ASC.Web.sln
# common/ASC.Common/Security/Cryptography/InstanceCrypto.cs
# common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Api/Controllers/AuthenticationController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Program.cs
# web/ASC.Web.Api/Startup.cs
|
2022-04-28 09:41:09 +03:00 |
|
|
13bbce8ea4
|
Custom logger replaced with Microsoft.Extensions.Logging
|
2022-04-26 20:53:48 +03:00 |
|
Vashchuk Nikita
|
a4e9cae742
|
changed work with disturbedTask
|
2022-04-26 17:03:41 +03:00 |
|
|
97b45d3bd5
|
ILog: refactoring
|
2022-04-25 21:02:18 +03:00 |
|
|
9eba173a44
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Model/CreateFileModel.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/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Utils/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2022-04-21 22:36:29 +03:00 |
|
|
fd9dc93fe6
|
Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
# config/kafka.json
|
2022-04-21 18:54:28 +03:00 |
|
|
1dff9e18c4
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/ASC.Api.Core.csproj
# common/ASC.Api.Core/Core/CustomHealthCheck.cs
# common/ASC.Api.Core/Middleware/IpSecurityFilter.cs
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.IPSecurity/IPRestrictionsRepository.cs
# common/ASC.IPSecurity/IPRestrictionsService.cs
# common/ASC.IPSecurity/IPSecurity.cs
# common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.Files/Core/Utils/FileSharing.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
|
2022-04-21 17:51:31 +03:00 |
|
|
92227c45c8
|
refactoring
|
2022-04-21 13:48:22 +03:00 |
|
|
9cd1cdc11b
|
refactoring
|
2022-04-21 13:35:49 +03:00 |
|
|
301e70e605
|
Api: added continue, suspend, delete portal methods
|
2022-04-21 12:35:51 +03:00 |
|
Vashchuk Nikita
|
bb8d0d7566
|
fix
|
2022-04-20 14:29:39 +03:00 |
|
Vashchuk Nikita
|
13fddb0dd2
|
fix
|
2022-04-19 14:02:06 +03:00 |
|
|
e603b26caa
|
refactoring
|
2022-04-15 13:27:48 +03:00 |
|
|
cb2580dd50
|
refactoring
|
2022-04-15 12:08:06 +03:00 |
|
|
6ecc8e7071
|
code cleanup
|
2022-04-14 22:42:15 +03:00 |
|
|
f138ff7c79
|
fixed warnings
|
2022-04-14 22:23:57 +03:00 |
|
|
26947072c6
|
Merge branch 'feature/backend-refactor' into feature/warnings
# Conflicts:
# common/ASC.Common/Threading/DistributedTaskProgress.cs
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Core.Common/Configuration/AmiPublicDnsSyncService.cs
# common/ASC.Core.Common/Notify/Engine/NotifyRequest.cs
# common/ASC.Core.Common/Notify/Model/NotifyClientImpl.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.Data.Reassigns/QueueWorker.cs
# common/ASC.Data.Reassigns/ReassignProgressItem.cs
# common/ASC.Data.Reassigns/RemoveProgressItem.cs
# common/ASC.Data.Storage/StaticUploader.cs
# products/ASC.Files/Core/ApiModels/ResponseDto/FileDto.cs
# products/ASC.Files/Core/ApiModels/ResponseDto/FolderDto.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/Thirdparty/Box/BoxDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoBase.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
# products/ASC.Files/Core/HttpHandlers/docusignhandler.ashx.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/FileOperation.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# web/ASC.Web.Core/CollaboratorSettings.cs
# web/ASC.Web.Core/CustomNavigationSettings.cs
# web/ASC.Web.Core/EmailActivationSettings.cs
# web/ASC.Web.Core/Notify/NotifyConfiguration.cs
# web/ASC.Web.Core/Notify/SpamEmailSettings.cs
# web/ASC.Web.Core/Notify/StudioNotifyHelper.cs
# web/ASC.Web.Core/Notify/StudioNotifyService.cs
# web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
# web/ASC.Web.Core/Notify/StudioPeriodicNotify.cs
# web/ASC.Web.Core/Notify/StudioWhatsNewNotify.cs
# web/ASC.Web.Core/PersonalSettings.cs
# web/ASC.Web.Core/PrivacyRoomSettings.cs
# web/ASC.Web.Core/PromotionsSettings.cs
# web/ASC.Web.Core/QuotaSync.cs
# web/ASC.Web.Core/Sms/SmsSender.cs
# web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
# web/ASC.Web.Core/StudioAdminMessageSettings.cs
# web/ASC.Web.Core/StudioDefaultPageSettings.cs
# web/ASC.Web.Core/StudioTrustedDomainSettings.cs
# web/ASC.Web.Core/TariffSettings.cs
# web/ASC.Web.Core/Tfa/TfaAppAuthSettings.cs
# web/ASC.Web.Core/Tfa/TfaAppUserSettings.cs
# web/ASC.Web.Core/TipsSettings.cs
# web/ASC.Web.Core/Users/CustomNamingPeople.cs
# web/ASC.Web.Core/Users/UserHelpTourSettings.cs
# web/ASC.Web.Core/Users/UserPhotoManager.cs
# web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
# web/ASC.Web.Core/Users/UserPhotoThumbnailSettings.cs
# web/ASC.Web.Core/Utility/ColorThemesSettings.cs
# web/ASC.Web.Core/Utility/PasswordSettings.cs
# web/ASC.Web.Core/Utility/Settings/TenantAccessSettings.cs
# web/ASC.Web.Core/Utility/Settings/WebItemSettings.cs
# web/ASC.Web.Core/Utility/Settings/WizardSettings.cs
# web/ASC.Web.Core/Utility/TenantExtra.cs
# web/ASC.Web.Core/WhiteLabel/AdditionalWhiteLabelSettings.cs
# web/ASC.Web.Core/WhiteLabel/CompanyWhiteLabelSettings.cs
# web/ASC.Web.Core/WhiteLabel/TenantInfoSettings.cs
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
|
2022-04-14 15:21:06 +03:00 |
|
Timofey Boyko
|
792bd7065f
|
Merge branch 'develop' into feature/virtual-rooms-1.2
|
2022-04-13 10:22:20 +03:00 |
|
|
4828678e03
|
merge from feature/backend-refactor
|
2022-04-12 22:04:10 +03:00 |
|
|
f9720af935
|
Settings: EnableAdmMess
|
2022-04-12 21:26:32 +03:00 |
|
|
b31015bddd
|
fix portalrename
|
2022-04-12 09:28:49 +03:00 |
|
|
50655ae61c
|
added portal rename method
|
2022-04-11 18:19:56 +03:00 |
|
|
433c684d09
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2
|
2022-04-11 12:08:50 +03:00 |
|
Vashchuk Nikita
|
df86859903
|
fix
|
2022-04-08 13:44:41 +03:00 |
|
Vashchuk Nikita
|
7f155066cf
|
fix
|
2022-04-08 13:44:18 +03:00 |
|
|
f9da8e4026
|
iprestrictions
fix Verify
add check enable
add api method
|
2022-04-07 13:19:30 +03:00 |
|
|
2370f7bad5
|
refactoring DistributedTask. replace return value from string to dynamic for indexer
|
2022-04-01 10:10:15 +03:00 |
|
|
90623263e9
|
merge from feature/backend-refactor
|
2022-03-29 23:29:03 +03:00 |
|
|
03efcf7f00
|
Notify: remove serviceProvider
|
2022-03-29 13:53:05 +03:00 |
|
|
f55a6cb6b2
|
Merge branch 'feature/backend-refactor' into feature/remove-serviceprovider
# Conflicts:
# common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
# web/ASC.Web.Core/Users/UserPhotoManager.cs
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
|
2022-03-28 17:45:42 +03:00 |
|
|
e7e0f5327a
|
Merge branch 'feature/backend-refactor' into feature/log-refactor
# Conflicts:
# common/ASC.Api.Core/GlobalUsings.cs
|
2022-03-28 14:29:36 +03:00 |
|
|
50a882a2b4
|
merge
|
2022-03-28 12:54:01 +03:00 |
|
|
e5229f12f5
|
Merge branch 'develop' into feature/backend-refactor
# Conflicts:
# common/ASC.Api.Core/Middleware/TenantStatusFilter.cs
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
# common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs
# common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
# common/ASC.Data.Backup.Core/EF/BackupsContext.cs
# common/ASC.Data.Backup.Core/Service/BackupWorker.cs
# common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
# common/ASC.Data.Backup.Core/Tasks/Data/TableInfo.cs
# common/ASC.Data.Storage/Configuration/StorageSettings.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# products/ASC.Files/Core/Core/ResponseStream.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
|
2022-03-28 12:53:15 +03:00 |
|
|
abae61f2db
|
IDE1006
|
2022-03-25 19:26:06 +03:00 |
|
|
cd1d3058ff
|
DistributedTaskQueue refactoring
|
2022-03-25 19:15:28 +03:00 |
|