|
|
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 |
|
|
|
95086e5d94
|
fix kafka settings
|
2022-04-21 14:06:32 +03:00 |
|
|
|
301e70e605
|
Api: added continue, suspend, delete portal methods
|
2022-04-21 12:35:51 +03:00 |
|
Eugene Kozyrev
|
ff7b192dbf
|
Change kafka-zookeeper projects language (#626)
Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
|
2022-04-21 12:06:15 +03:00 |
|
|
|
6c28b6777d
|
added DarkThemeSettings
|
2022-04-20 17:19:06 +03:00 |
|
|
|
3e4e293775
|
Api: downgrade AspNetCore.HealthChecks.Elasticsearch, because we need to use Nest 7.10
|
2022-04-19 13:48:11 +03:00 |
|
|
|
01d7a7c095
|
CustomHealthCheck: try, catch
|
2022-04-19 11:35:00 +03:00 |
|
|
|
586bf23976
|
Files: fixed thirdparty
|
2022-04-15 19:01:06 +03:00 |
|
|
|
1d7087a798
|
Files: fix share
|
2022-04-15 18:53:41 +03:00 |
|
|
|
9f1e7cc3b0
|
IPRestrictionsRepository: fix cache
|
2022-04-15 16:58:41 +03:00 |
|
|
|
9e5a4378ca
|
Merge pull request #598 from ONLYOFFICE/feature/warnings
Feature/warnings
|
2022-04-15 17:47:27 +04: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 |
|
|
|
5613f55ea6
|
fixed warnings
|
2022-04-14 16:52:51 +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 |
|
|
|
af21622987
|
Merge pull request #605 from ONLYOFFICE/feature/cluster-services-backup
Feature/cluster services backup
|
2022-04-14 11:20:42 +04:00 |
|
|
|
86456159b9
|
Backup: fix registration
|
2022-04-13 19:28:58 +03:00 |
|
|
|
b877354203
|
BackupBackgroundTasks: port changed
|
2022-04-13 19:13:37 +03:00 |
|
Eugene Kozyrev
|
3b3f20db29
|
Add MySQL Installer Runner signing (#618)
|
2022-04-13 11:41:45 +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 |
|
|
|
c03f44fd83
|
Merge pull request #602 from ONLYOFFICE/feature/remove-serviceprovider
Feature/remove serviceprovider
|
2022-04-12 21:25:20 +03:00 |
|
|
|
1f4ee372e2
|
FileHandler: fix auth
|
2022-04-12 21:06:30 +03:00 |
|
|
|
900d33b2d1
|
fix copyas
|
2022-04-12 18:31:50 +03:00 |
|
|
|
ee943b4a9a
|
UserManager: fix
|
2022-04-12 17:14:27 +03:00 |
|
|
|
471ffd28c8
|
Files: fix news method
|
2022-04-12 15:07:00 +03:00 |
|
|
|
66cbc3aa48
|
Elastic: fix
|
2022-04-12 15:01:33 +03:00 |
|
|
|
1ea6058232
|
fixed owner method
|
2022-04-12 13:21:39 +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 |
|
|
|
430ac26e48
|
Backup: removed NotifyHelperWorker
|
2022-04-11 14:53:29 +03:00 |
|
|
|
6e2d36bb76
|
Merge pull request #608 from ONLYOFFICE/feature/filter-of-files
filter of files
|
2022-04-11 13:16:26 +03:00 |
|
|
|
187713518b
|
Merge branch 'develop' into feature/filter-of-files
|
2022-04-11 13:15:08 +03:00 |
|
|
|
38cc84ee5c
|
FilesDao: revert
|
2022-04-11 13:09:43 +03:00 |
|
|
|
387119f6f2
|
remove waste
|
2022-04-11 10:58:18 +03:00 |
|
|
|
90cade35e3
|
Merge pull request #609 from ONLYOFFICE/feature/iprestrictions
iprestrictions
|
2022-04-11 10:54:26 +03:00 |
|
|
|
3c013939bc
|
Merge branch 'develop' into feature/iprestrictions
|
2022-04-11 10:38:12 +03:00 |
|
|
|
95959317a2
|
fix
|
2022-04-11 10:38:00 +03:00 |
|
Eugene Kozyrev
|
542df3d847
|
Change project language (#612)
|
2022-04-08 16:04:09 +03:00 |
|
Eugene Kozyrev
|
4012a9b713
|
Add ZooKeeper and Kafka connection check on Windows installation (#610)
* Add zookeeper/kafka connection check
* Edit build script
|
2022-04-08 13:04:51 +03:00 |
|
|
|
16d4e1565a
|
fix
|
2022-04-07 14:53:40 +03:00 |
|
|
|
1b8be6f95c
|
fix
|
2022-04-07 14:41:37 +03:00 |
|
|
|
f9da8e4026
|
iprestrictions
fix Verify
add check enable
add api method
|
2022-04-07 13:19:30 +03:00 |
|
|
|
a502c4ee52
|
IPRestrictionsRepository: fixed saving data
|
2022-04-07 08:41:58 +03:00 |
|
|
|
6dfb0d86d5
|
filter of files
add searchInContent in filesController's methods
|
2022-04-06 14:32:15 +03:00 |
|
Eugene Kozyrev
|
5220e96b7e
|
Add elasticsearch connection check (#606)
|
2022-04-06 11:17:26 +03:00 |
|
|
|
7d1ccbdc15
|
remove distributed_task_cache.proto from projects
|
2022-04-05 13:14:44 +03:00 |
|
|
|
49abfdf84a
|
fix docxf templates
|
2022-04-05 12:07:46 +03:00 |
|
